lightspeeddevelopment / lsx-health-plan

templates/tab-content-plan.php

Spacing +11 added lines, -11 removed lines

@@ -5,11 +5,11 @@ 
  * @package lsx-health-plan
  */
 
-$section_key  = get_query_var( 'section' );
-$endpoint_key = get_query_var( 'endpoint' );
-if ( '' !== $section_key && '' === $endpoint && \lsx_health_plan\functions\plan\has_sections() ) {
-	$section_info = \lsx_health_plan\functions\plan\get_section_info( $section_key );
-	if ( isset( $section_info['description'] ) && '' !== $section_info['description'] ) {
+$section_key  = get_query_var('section');
+$endpoint_key = get_query_var('endpoint');
+if ('' !== $section_key && '' === $endpoint && \lsx_health_plan\functions\plan\has_sections()) {
+	$section_info = \lsx_health_plan\functions\plan\get_section_info($section_key);
+	if (isset($section_info['description']) && '' !== $section_info['description']) {
 		global $shortcode_args;
 		?>
 		<?php lsx_entry_before(); ?>
@@ -25,22 +25,22 @@ 
 			<div class="entry-content">
 				<div class="overview">
 				<?php
-					echo wp_kses_post( apply_filters( 'the_content', $section_info['description'] ) );
+					echo wp_kses_post(apply_filters('the_content', $section_info['description']));
 
-					wp_link_pages( array(
+					wp_link_pages(array(
 						'before'      => '<div class="lsx-postnav-wrapper"><div class="lsx-postnav">',
 						'after'       => '</div></div>',
 						'link_before' => '<span>',
 						'link_after'  => '</span>',
-					) );
+					));
 				?>
 				</div>
 			</div><!-- .entry-content -->
-			<?php if ( null === $shortcode_args ) { ?>
-				<?php if ( post_type_exists( 'tip' ) && lsx_health_plan_has_tips() ) { ?>
+			<?php if (null === $shortcode_args) { ?>
+				<?php if (post_type_exists('tip') && lsx_health_plan_has_tips()) { ?>
 					<div class="tip-row extras-box">
 						<div class="tip-right">
-							<?php echo do_shortcode( '[lsx_health_plan_featured_tips_block]' ); ?>
+							<?php echo do_shortcode('[lsx_health_plan_featured_tips_block]'); ?>
 						</div>
 					</div>
 				<?php } ?>

Indentation +14 added lines, -14 removed lines

@@ -8,10 +8,10 @@ 
 $section_key  = get_query_var( 'section' );
 $endpoint_key = get_query_var( 'endpoint' );
 if ( '' !== $section_key && '' === $endpoint && \lsx_health_plan\functions\plan\has_sections() ) {
-	$section_info = \lsx_health_plan\functions\plan\get_section_info( $section_key );
-	if ( isset( $section_info['description'] ) && '' !== $section_info['description'] ) {
-		global $shortcode_args;
-		?>
+     $section_info = \lsx_health_plan\functions\plan\get_section_info( $section_key );
+     if ( isset( $section_info['description'] ) && '' !== $section_info['description'] ) {
+          global $shortcode_args;
+          ?>
 		<?php lsx_entry_before(); ?>
 
 		<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
@@ -25,15 +25,15 @@ 
 			<div class="entry-content">
 				<div class="overview">
 				<?php
-					echo wp_kses_post( apply_filters( 'the_content', $section_info['description'] ) );
-
-					wp_link_pages( array(
-						'before'      => '<div class="lsx-postnav-wrapper"><div class="lsx-postnav">',
-						'after'       => '</div></div>',
-						'link_before' => '<span>',
-						'link_after'  => '</span>',
-					) );
-				?>
+                         echo wp_kses_post( apply_filters( 'the_content', $section_info['description'] ) );
+
+                         wp_link_pages( array(
+                              'before'      => '<div class="lsx-postnav-wrapper"><div class="lsx-postnav">',
+                              'after'       => '</div></div>',
+                              'link_before' => '<span>',
+                              'link_after'  => '</span>',
+                         ) );
+                    ?>
 				</div>
 			</div><!-- .entry-content -->
 			<?php if ( null === $shortcode_args ) { ?>
@@ -51,6 +51,6 @@ 
 		</article><!-- #post-## -->
 
 		<?php
-	}
+     }
 }
 ?>

templates/content-plan.php

Spacing +5 added lines, -5 removed lines

@@ -24,20 +24,20 @@
 		<?php
 			the_content();
 
-			wp_link_pages( array(
+			wp_link_pages(array(
 				'before'      => '<div class="lsx-postnav-wrapper"><div class="lsx-postnav">',
 				'after'       => '</div></div>',
 				'link_before' => '<span>',
 				'link_after'  => '</span>',
-			) );
+			));
 		?>
 		</div>
 	</div><!-- .entry-content -->
-	<?php if ( null === $shortcode_args ) { ?>
-		<?php if ( post_type_exists( 'tip' ) && lsx_health_plan_has_tips() ) { ?>
+	<?php if (null === $shortcode_args) { ?>
+		<?php if (post_type_exists('tip') && lsx_health_plan_has_tips()) { ?>
 			<div class="tip-row extras-box">
 				<div class="tip-right">
-					<?php echo do_shortcode( '[lsx_health_plan_featured_tips_block' ); ?>
+					<?php echo do_shortcode('[lsx_health_plan_featured_tips_block'); ?>
 				</div>
 			</div>
 		<?php } ?>

Indentation +9 added lines, -9 removed lines

@@ -22,15 +22,15 @@
 	<div class="entry-content">
 		<div class="overview">
 		<?php
-			the_content();
-
-			wp_link_pages( array(
-				'before'      => '<div class="lsx-postnav-wrapper"><div class="lsx-postnav">',
-				'after'       => '</div></div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>',
-			) );
-		?>
+               the_content();
+
+               wp_link_pages( array(
+                    'before'      => '<div class="lsx-postnav-wrapper"><div class="lsx-postnav">',
+                    'after'       => '</div></div>',
+                    'link_before' => '<span>',
+                    'link_after'  => '</span>',
+               ) );
+          ?>
 		</div>
 	</div><!-- .entry-content -->
 	<?php if ( null === $shortcode_args ) { ?>

templates/archive-workout.php

Braces +5 added lines, -2 removed lines

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

Indentation +12 added lines, -12 removed lines

@@ -10,8 +10,8 @@ 
 <?php lsx_content_wrap_before(); ?>
 
 <?php
-	$page_id  = get_the_ID();
-	$redirect = '/content-restricted/?r=' . $page_id . '&wcm_redirect_to=archive&wcm_redirect_id=' . $page_id;
+     $page_id  = get_the_ID();
+     $redirect = '/content-restricted/?r=' . $page_id . '&wcm_redirect_to=archive&wcm_redirect_id=' . $page_id;
 ?>
 
 	<div id="primary" class="content-area <?php echo esc_attr( lsx_main_class() ); ?>">
@@ -20,8 +20,8 @@ 
 
 		<!-- Begining restricted content -->
 		<?php
-		if ( current_user_can( 'administrator', $page_id ) || current_user_can( 'wc_memberships_view_restricted_post_content', $page_id ) ) {
-			?>
+          if ( current_user_can( 'administrator', $page_id ) || current_user_can( 'wc_memberships_view_restricted_post_content', $page_id ) ) {
+               ?>
 			<main id="main" role="main">
 
 				<?php lsx_content_top(); ?>
@@ -30,9 +30,9 @@ 
 					<div class="row">
 						<?php if ( have_posts() ) : ?>
 							<?php
-							while ( have_posts() ) :
-								the_post();
-								?>
+                                   while ( have_posts() ) :
+                                        the_post();
+                                        ?>
 
 								<?php include LSX_HEALTH_PLAN_PATH . '/templates/content-archive-workout.php'; ?>
 
@@ -51,11 +51,11 @@ 
 			</main><!-- #main -->
 
 			<?php
-		} else {
-			wp_redirect( $redirect );
-			exit;
-		}
-		?>
+          } else {
+               wp_redirect( $redirect );
+               exit;
+          }
+          ?>
 
 <?php lsx_content_after(); ?>
 

Spacing +6 added lines, -6 removed lines

@@ -14,13 +14,13 @@ 
 	$redirect = '/content-restricted/?r=' . $page_id . '&wcm_redirect_to=archive&wcm_redirect_id=' . $page_id;
 ?>
 
-	<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(); ?>
 
 		<!-- Begining restricted content -->
 		<?php
-		if ( current_user_can( 'administrator', $page_id ) || current_user_can( 'wc_memberships_view_restricted_post_content', $page_id ) ) {
+		if (current_user_can('administrator', $page_id) || current_user_can('wc_memberships_view_restricted_post_content', $page_id)) {
 			?>
 			<main id="main" role="main">
 
@@ -28,9 +28,9 @@ 
 
 				<div class="post-wrapper workout-archive-plan archive-plan">
 					<div class="row">
-						<?php if ( have_posts() ) : ?>
+						<?php if (have_posts()) : ?>
 							<?php
-							while ( have_posts() ) :
+							while (have_posts()) :
 								the_post();
 								?>
 
@@ -40,7 +40,7 @@ 
 
 						<?php else : ?>
 
-							<?php get_template_part( 'partials/content', 'none' ); ?>
+							<?php get_template_part('partials/content', 'none'); ?>
 
 						<?php endif; ?>
 					</div>
@@ -52,7 +52,7 @@ 
 
 			<?php
 		} else {
-			wp_redirect( $redirect );
+			wp_redirect($redirect);
 			exit;
 		}
 		?>

templates/archive-exercise.php

Braces +5 added lines, -2 removed lines

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

Indentation +12 added lines, -12 removed lines

@@ -10,8 +10,8 @@ 
 <?php lsx_content_wrap_before(); ?>
 
 <?php
-	$page_id  = get_the_ID();
-	$redirect = '/content-restricted/?r=' . $page_id . '&wcm_redirect_to=archive&wcm_redirect_id=' . $page_id;
+     $page_id  = get_the_ID();
+     $redirect = '/content-restricted/?r=' . $page_id . '&wcm_redirect_to=archive&wcm_redirect_id=' . $page_id;
 ?>
 
 	<div id="primary" class="content-area <?php echo esc_attr( lsx_main_class() ); ?>">
@@ -20,8 +20,8 @@ 
 
 		<!-- Begining restricted content -->
 		<?php
-		if ( current_user_can( 'administrator', $page_id ) || current_user_can( 'wc_memberships_view_restricted_post_content', $page_id ) ) {
-			?>
+          if ( current_user_can( 'administrator', $page_id ) || current_user_can( 'wc_memberships_view_restricted_post_content', $page_id ) ) {
+               ?>
 			<main id="main" role="main">
 
 				<?php lsx_content_top(); ?>
@@ -30,9 +30,9 @@ 
 					<div class="row">
 						<?php if ( have_posts() ) : ?>
 							<?php
-							while ( have_posts() ) :
-								the_post();
-								?>
+                                   while ( have_posts() ) :
+                                        the_post();
+                                        ?>
 
 								<?php include LSX_HEALTH_PLAN_PATH . '/templates/content-archive-exercise.php'; ?>
 
@@ -51,11 +51,11 @@ 
 			</main><!-- #main -->
 
 			<?php
-		} else {
-			wp_redirect( $redirect );
-			exit;
-		}
-		?>
+          } else {
+               wp_redirect( $redirect );
+               exit;
+          }
+          ?>
 
 <?php lsx_content_after(); ?>
 

Spacing +6 added lines, -6 removed lines

@@ -14,13 +14,13 @@ 
 	$redirect = '/content-restricted/?r=' . $page_id . '&wcm_redirect_to=archive&wcm_redirect_id=' . $page_id;
 ?>
 
-	<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(); ?>
 
 		<!-- Begining restricted content -->
 		<?php
-		if ( current_user_can( 'administrator', $page_id ) || current_user_can( 'wc_memberships_view_restricted_post_content', $page_id ) ) {
+		if (current_user_can('administrator', $page_id) || current_user_can('wc_memberships_view_restricted_post_content', $page_id)) {
 			?>
 			<main id="main" role="main">
 
@@ -28,9 +28,9 @@ 
 
 				<div class="post-wrapper exercise-archive-plan archive-plan">
 					<div class="row">
-						<?php if ( have_posts() ) : ?>
+						<?php if (have_posts()) : ?>
 							<?php
-							while ( have_posts() ) :
+							while (have_posts()) :
 								the_post();
 								?>
 
@@ -40,7 +40,7 @@ 
 
 						<?php else : ?>
 
-							<?php get_template_part( 'partials/content', 'none' ); ?>
+							<?php get_template_part('partials/content', 'none'); ?>
 
 						<?php endif; ?>
 					</div>
@@ -52,7 +52,7 @@ 
 
 			<?php
 		} else {
-			wp_redirect( $redirect );
+			wp_redirect($redirect);
 			exit;
 		}
 		?>

templates/archive-recipe.php

Braces +5 added lines, -2 removed lines

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

Indentation +12 added lines, -12 removed lines

@@ -10,8 +10,8 @@ 
 <?php lsx_content_wrap_before(); ?>
 
 <?php
-	$page_id  = get_the_ID();
-	$redirect = '/content-restricted/?r=' . $page_id . '&wcm_redirect_to=archive&wcm_redirect_id=' . $page_id;
+     $page_id  = get_the_ID();
+     $redirect = '/content-restricted/?r=' . $page_id . '&wcm_redirect_to=archive&wcm_redirect_id=' . $page_id;
 ?>
 
 	<div id="primary" class="content-area <?php echo esc_attr( lsx_main_class() ); ?>">
@@ -20,8 +20,8 @@ 
 
 		<!-- Begining restricted content -->
 		<?php
-		if ( current_user_can( 'administrator', $page_id ) || current_user_can( 'wc_memberships_view_restricted_post_content', $page_id ) ) {
-			?>
+          if ( current_user_can( 'administrator', $page_id ) || current_user_can( 'wc_memberships_view_restricted_post_content', $page_id ) ) {
+               ?>
 			<main id="main" role="main">
 
 				<?php lsx_content_top(); ?>
@@ -30,9 +30,9 @@ 
 					<div class="row">
 						<?php if ( have_posts() ) : ?>
 							<?php
-							while ( have_posts() ) :
-								the_post();
-								?>
+                                   while ( have_posts() ) :
+                                        the_post();
+                                        ?>
 
 								<?php include LSX_HEALTH_PLAN_PATH . '/templates/content-archive-recipe.php'; ?>
 
@@ -51,11 +51,11 @@ 
 			</main><!-- #main -->
 
 			<?php
-		} else {
-			wp_redirect( $redirect );
-			exit;
-		}
-		?>
+          } else {
+               wp_redirect( $redirect );
+               exit;
+          }
+          ?>
 
 <?php lsx_content_after(); ?>
 

Spacing +6 added lines, -6 removed lines

@@ -14,13 +14,13 @@ 
 	$redirect = '/content-restricted/?r=' . $page_id . '&wcm_redirect_to=archive&wcm_redirect_id=' . $page_id;
 ?>
 
-	<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(); ?>
 
 		<!-- Begining restricted content -->
 		<?php
-		if ( current_user_can( 'administrator', $page_id ) || current_user_can( 'wc_memberships_view_restricted_post_content', $page_id ) ) {
+		if (current_user_can('administrator', $page_id) || current_user_can('wc_memberships_view_restricted_post_content', $page_id)) {
 			?>
 			<main id="main" role="main">
 
@@ -28,9 +28,9 @@ 
 
 				<div class="post-wrapper archive-plan">
 					<div class="row">
-						<?php if ( have_posts() ) : ?>
+						<?php if (have_posts()) : ?>
 							<?php
-							while ( have_posts() ) :
+							while (have_posts()) :
 								the_post();
 								?>
 
@@ -40,7 +40,7 @@ 
 
 						<?php else : ?>
 
-							<?php get_template_part( 'partials/content', 'none' ); ?>
+							<?php get_template_part('partials/content', 'none'); ?>
 
 						<?php endif; ?>
 					</div>
@@ -52,7 +52,7 @@ 
 
 			<?php
 		} else {
-			wp_redirect( $redirect );
+			wp_redirect($redirect);
 			exit;
 		}
 		?>

templates/content-archive-workout.php

Indentation +17 added lines, -17 removed lines

@@ -22,17 +22,17 @@ 
 			<?php } ?>
 			<a href="<?php echo esc_url( get_permalink() ); ?>">
 			<?php
-			$featured_image = get_the_post_thumbnail();
-			if ( ! empty( $featured_image ) && '' !== $featured_image ) {
-				the_post_thumbnail( 'lsx-thumbnail-square', array(
-					'class' => 'aligncenter',
-				) );
-			} else {
-				?>
+               $featured_image = get_the_post_thumbnail();
+               if ( ! empty( $featured_image ) && '' !== $featured_image ) {
+                    the_post_thumbnail( 'lsx-thumbnail-square', array(
+                         'class' => 'aligncenter',
+                    ) );
+               } else {
+                    ?>
 				<img loading="lazy" src="<?php echo esc_attr( plugin_dir_url( __FILE__ ) . '../assets/images/placeholder.jpg' ); ?>">
 				<?php
-			}
-			?>
+               }
+               ?>
 			</a>
 		</div>
 		<div class="content-box workout-content-box white-bg">
@@ -40,14 +40,14 @@ 
 				<?php the_title( '<h3 class="workout-title">', '</h3>' ); ?>
 			</a>
 			<?php
-			if ( ! has_excerpt() ) {
-				$content = wp_trim_words( get_the_content(), 20 );
-				$content = '<p>' . $content . '</p>';
-			} else {
-				$content = apply_filters( 'the_excerpt', get_the_excerpt() );
-			}
-			echo wp_kses_post( $content );
-			?>
+               if ( ! has_excerpt() ) {
+                    $content = wp_trim_words( get_the_content(), 20 );
+                    $content = '<p>' . $content . '</p>';
+               } else {
+                    $content = apply_filters( 'the_excerpt', get_the_excerpt() );
+               }
+               echo wp_kses_post( $content );
+               ?>
 			<a href="<?php echo esc_url( get_permalink() ); ?>" class="btn border-btn"><?php esc_html_e( 'See workout', 'lsx-health-plan' ); ?></a>
 		</div>
 		<?php lsx_entry_bottom(); ?>

Spacing +15 added lines, -15 removed lines

@@ -5,7 +5,7 @@ 
  * @package lsx-health-plan
  */
 
-$featured = get_post_meta( get_the_ID(), 'workout_featured_workout', true );
+$featured = get_post_meta(get_the_ID(), 'workout_featured_workout', true);
 ?>
 
 <?php lsx_entry_before(); ?>
@@ -17,38 +17,38 @@ 
 		<?php lsx_hp_exercise_plan_meta(); ?>
 
 		<div class="workout-feature-img">
-			<?php if ( $featured ) { ?>
-				<span class="featured-workout"><?php lsx_get_svg_icon( 'icon-featured.svg' ); ?></span>
+			<?php if ($featured) { ?>
+				<span class="featured-workout"><?php lsx_get_svg_icon('icon-featured.svg'); ?></span>
 			<?php } ?>
-			<a href="<?php echo esc_url( get_permalink() ); ?>">
+			<a href="<?php echo esc_url(get_permalink()); ?>">
 			<?php
 			$featured_image = get_the_post_thumbnail();
-			if ( ! empty( $featured_image ) && '' !== $featured_image ) {
-				the_post_thumbnail( 'lsx-thumbnail-square', array(
+			if ( ! empty($featured_image) && '' !== $featured_image) {
+				the_post_thumbnail('lsx-thumbnail-square', array(
 					'class' => 'aligncenter',
-				) );
+				));
 			} else {
 				?>
-				<img loading="lazy" src="<?php echo esc_attr( plugin_dir_url( __FILE__ ) . '../assets/images/placeholder.jpg' ); ?>">
+				<img loading="lazy" src="<?php echo esc_attr(plugin_dir_url(__FILE__) . '../assets/images/placeholder.jpg'); ?>">
 				<?php
 			}
 			?>
 			</a>
 		</div>
 		<div class="content-box workout-content-box white-bg">
-			<a href="<?php echo esc_url( get_permalink() ); ?>">
-				<?php the_title( '<h3 class="workout-title">', '</h3>' ); ?>
+			<a href="<?php echo esc_url(get_permalink()); ?>">
+				<?php the_title('<h3 class="workout-title">', '</h3>'); ?>
 			</a>
 			<?php
-			if ( ! has_excerpt() ) {
-				$content = wp_trim_words( get_the_content(), 20 );
+			if ( ! has_excerpt()) {
+				$content = wp_trim_words(get_the_content(), 20);
 				$content = '<p>' . $content . '</p>';
 			} else {
-				$content = apply_filters( 'the_excerpt', get_the_excerpt() );
+				$content = apply_filters('the_excerpt', get_the_excerpt());
 			}
-			echo wp_kses_post( $content );
+			echo wp_kses_post($content);
 			?>
-			<a href="<?php echo esc_url( get_permalink() ); ?>" class="btn border-btn"><?php esc_html_e( 'See workout', 'lsx-health-plan' ); ?></a>
+			<a href="<?php echo esc_url(get_permalink()); ?>" class="btn border-btn"><?php esc_html_e('See workout', 'lsx-health-plan'); ?></a>
 		</div>
 		<?php lsx_entry_bottom(); ?>
 	</article>

classes/class-admin.php

Spacing +118 added lines, -118 removed lines

@@ -53,19 +53,19 @@ 
 	 */
 	public function __construct() {
 		$this->load_classes();
-		add_action( 'admin_menu', array( $this, 'order_menus' ), 200 );
-		add_action( 'admin_enqueue_scripts', array( $this, 'assets' ) );
-		add_filter( 'cmb2_override_meta_save', array( $this, 'save_previous_values' ), 20, 4 );
-		add_filter( 'cmb2_override_meta_remove', array( $this, 'save_previous_values' ), 20, 4 );
-		add_action( 'cmb2_save_field', array( $this, 'post_relations' ), 20, 4 );
-		add_action( 'cmb2_save_field', array( $this, 'create_query_fields' ), 20, 4 );
-		add_action( 'before_delete_post', array( $this, 'delete_post_meta_connections' ), 20, 1 );
-		add_action( 'cmb2_save_post_fields', array( $this, 'extract_plan_fields' ), 10, 4 );
+		add_action('admin_menu', array($this, 'order_menus'), 200);
+		add_action('admin_enqueue_scripts', array($this, 'assets'));
+		add_filter('cmb2_override_meta_save', array($this, 'save_previous_values'), 20, 4);
+		add_filter('cmb2_override_meta_remove', array($this, 'save_previous_values'), 20, 4);
+		add_action('cmb2_save_field', array($this, 'post_relations'), 20, 4);
+		add_action('cmb2_save_field', array($this, 'create_query_fields'), 20, 4);
+		add_action('before_delete_post', array($this, 'delete_post_meta_connections'), 20, 1);
+		add_action('cmb2_save_post_fields', array($this, 'extract_plan_fields'), 10, 4);
 
 		//add_action( 'cmb2_save_post_fields', array( $this, 'debugger_for_cmb2' ), 10, 4 );
 
 		// Customizer.
-		add_filter( 'lsx_customizer_colour_selectors_body', array( $this, 'customizer_body_colours_handler' ), 15, 2 );
+		add_filter('lsx_customizer_colour_selectors_body', array($this, 'customizer_body_colours_handler'), 15, 2);
 	}
 
 	/**
@@ -75,7 +75,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;
@@ -102,57 +102,57 @@ 
 	 */
 	public function order_menus() {
 		global $menu, $submenu;
-		if ( ! empty( $submenu ) ) {
+		if ( ! empty($submenu)) {
 			$parent_check = array(
 				'edit.php?post_type=plan',
 				'edit.php?post_type=workout',
 				'edit.php?post_type=meal',
 			);
-			foreach ( $submenu as $menu_id => $menu_values ) {
-				if ( in_array( $menu_id, $parent_check ) ) {
-					foreach ( $menu_values as $sub_menu_key => $sub_menu_values ) {
-						switch ( $sub_menu_values[0] ) {
+			foreach ($submenu as $menu_id => $menu_values) {
+				if (in_array($menu_id, $parent_check)) {
+					foreach ($menu_values as $sub_menu_key => $sub_menu_values) {
+						switch ($sub_menu_values[0]) {
 
-							case __( 'Add New', 'lsx-health-plan' ):
-								unset( $submenu[ $menu_id ][ $sub_menu_key ] );
+							case __('Add New', 'lsx-health-plan'):
+								unset($submenu[$menu_id][$sub_menu_key]);
 								break;
 
-							case __( 'All', 'lsx-health-plan' ):
+							case __('All', 'lsx-health-plan'):
 								$title = $sub_menu_values[0];
 								// Check and change the label.
-								switch ( $sub_menu_values[2] ) {
+								switch ($sub_menu_values[2]) {
 									case 'edit.php?post_type=meal':
-										$title = esc_attr__( 'Meals', 'lsx-health-plan' );
+										$title = esc_attr__('Meals', 'lsx-health-plan');
 										break;
 
 									case 'edit.php?post_type=recipe':
-										$title = esc_attr__( 'Recipes', 'lsx-health-plan' );
+										$title = esc_attr__('Recipes', 'lsx-health-plan');
 										break;
 
 									case 'edit.php?post_type=workout':
-										$title = esc_attr__( 'Workouts', 'lsx-health-plan' );
+										$title = esc_attr__('Workouts', 'lsx-health-plan');
 										break;
 
 									case 'edit.php?post_type=plan':
-										$title = esc_attr__( 'Plans', 'lsx-health-plan' );
+										$title = esc_attr__('Plans', 'lsx-health-plan');
 										break;
 
 									case 'edit.php?post_type=video':
-										$title = esc_attr__( 'Videos', 'lsx-health-plan' );
+										$title = esc_attr__('Videos', 'lsx-health-plan');
 										break;
 
 									case 'edit.php?post_type=exercise':
-										$title = esc_attr__( 'Exercises', 'lsx-health-plan' );
+										$title = esc_attr__('Exercises', 'lsx-health-plan');
 										break;
 
 									case 'edit.php?post_type=tip':
-										$title = esc_attr__( 'Tips', 'lsx-health-plan' );
+										$title = esc_attr__('Tips', 'lsx-health-plan');
 										break;
 
 									default:
 										break;
 								}
-								$submenu[ $menu_id ][ $sub_menu_key ][0] = $title; // @codingStandardsIgnoreLine
+								$submenu[$menu_id][$sub_menu_key][0] = $title; // @codingStandardsIgnoreLine
 								break;
 
 							default:
@@ -170,12 +170,12 @@ 
 	 * @return void
 	 */
 	public function assets() {
-		wp_enqueue_script( 'media-upload' );
-		wp_enqueue_script( 'thickbox' );
-		wp_enqueue_style( 'thickbox' );
+		wp_enqueue_script('media-upload');
+		wp_enqueue_script('thickbox');
+		wp_enqueue_style('thickbox');
 
-		wp_enqueue_script( 'lsx-health-plan-admin', LSX_HEALTH_PLAN_URL . 'assets/js/lsx-health-plan-admin.min.js', array( 'jquery' ), LSX_HEALTH_PLAN_VER, true );
-		wp_enqueue_style( 'lsx-health-plan-admin', LSX_HEALTH_PLAN_URL . 'assets/css/lsx-health-plan-admin.css', array(), LSX_HEALTH_PLAN_VER );
+		wp_enqueue_script('lsx-health-plan-admin', LSX_HEALTH_PLAN_URL . 'assets/js/lsx-health-plan-admin.min.js', array('jquery'), LSX_HEALTH_PLAN_VER, true);
+		wp_enqueue_style('lsx-health-plan-admin', LSX_HEALTH_PLAN_URL . 'assets/css/lsx-health-plan-admin.css', array(), LSX_HEALTH_PLAN_VER);
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 * @return void
 	 */
 	public function get_connections() {
-		return apply_filters( 'lsx_health_plan_connections', $this->connections );
+		return apply_filters('lsx_health_plan_connections', $this->connections);
 	}
 
 	/**
@@ -196,13 +196,13 @@ 
 	 * @param [type] $cmb2
 	 * @return void
 	 */
-	public function save_previous_values( $value_to_save, $a, $args, $cmb2 ) {
-		if ( isset( $cmb2->data_to_save['ID'] ) ) {
+	public function save_previous_values($value_to_save, $a, $args, $cmb2) {
+		if (isset($cmb2->data_to_save['ID'])) {
 			$connections = $this->get_connections();
-			$post_type   = get_post_type( $cmb2->data_to_save['ID'] );
-			if ( isset( $connections[ $post_type ] ) && array_key_exists( $a['field_id'], $connections[ $post_type ] ) ) {
+			$post_type   = get_post_type($cmb2->data_to_save['ID']);
+			if (isset($connections[$post_type]) && array_key_exists($a['field_id'], $connections[$post_type])) {
 				// Get the previous values if the field, so we can run through them and remove the current ID from them later.
-				$this->previous_values = get_post_meta( $a['id'], $a['field_id'], true );
+				$this->previous_values = get_post_meta($a['id'], $a['field_id'], true);
 			}
 		}
 		return $value_to_save;
@@ -213,30 +213,30 @@ 
 	 *
 	 * @return    void
 	 */
-	public function post_relations( $field_id, $updated, $action, $cmb2 ) {
+	public function post_relations($field_id, $updated, $action, $cmb2) {
 		// If the connections are empty then skip this function.
 		$connections = $this->get_connections();
-		if ( empty( $connections ) ) {
+		if (empty($connections)) {
 			return;
 		}
 
 		// If the field has been updated.
-		if ( isset( $cmb2->data_to_save['ID'] ) ) {
-			$post_type = get_post_type( $cmb2->data_to_save['ID'] );
-			if ( isset( $connections[ $post_type ] ) && array_key_exists( $field_id, $connections[ $post_type ] ) ) {
-				$saved_values = get_post_meta( $cmb2->data_to_save['ID'], $field_id, true );
+		if (isset($cmb2->data_to_save['ID'])) {
+			$post_type = get_post_type($cmb2->data_to_save['ID']);
+			if (isset($connections[$post_type]) && array_key_exists($field_id, $connections[$post_type])) {
+				$saved_values = get_post_meta($cmb2->data_to_save['ID'], $field_id, true);
 
-				if ( 'updated' === $action ) {
-					$this->add_connected_posts( $saved_values, $cmb2->data_to_save['ID'], $connections[ $post_type ][ $field_id ] );
+				if ('updated' === $action) {
+					$this->add_connected_posts($saved_values, $cmb2->data_to_save['ID'], $connections[$post_type][$field_id]);
 					// Check if any posts have been removed.
-					if ( count( $this->previous_values ) > count( $saved_values ) ) {
-						$posts_to_remove = array_diff( $this->previous_values, $saved_values );
-						if ( ! empty( $posts_to_remove ) ) {
-							$this->remove_connected_posts( $posts_to_remove, $cmb2->data_to_save['ID'], $connections[ $post_type ][ $field_id ] );
+					if (count($this->previous_values) > count($saved_values)) {
+						$posts_to_remove = array_diff($this->previous_values, $saved_values);
+						if ( ! empty($posts_to_remove)) {
+							$this->remove_connected_posts($posts_to_remove, $cmb2->data_to_save['ID'], $connections[$post_type][$field_id]);
 						}
 					}
-				} else if ( 'removed' === $action && ! empty( $this->previous_values ) ) {
-					$this->remove_connected_posts( $this->previous_values, $cmb2->data_to_save['ID'], $connections[ $post_type ][ $field_id ] );
+				} else if ('removed' === $action && ! empty($this->previous_values)) {
+					$this->remove_connected_posts($this->previous_values, $cmb2->data_to_save['ID'], $connections[$post_type][$field_id]);
 				}
 			}
 		}
@@ -250,26 +250,26 @@ 
 	 * @param [type] $connected_key
 	 * @return void
 	 */
-	public function add_connected_posts( $values, $current_id, $connected_key ) {
-		foreach ( $values as $value ) {
-			$current_post_array = get_post_meta( $value, $connected_key, true );
+	public function add_connected_posts($values, $current_id, $connected_key) {
+		foreach ($values as $value) {
+			$current_post_array = get_post_meta($value, $connected_key, true);
 			$previous_values    = $current_post_array;
 
-			if ( ! empty( $current_post_array ) ) {
-				$current_post_array = array_map( 'strval', $current_post_array );
-				array_unique( $current_post_array );
+			if ( ! empty($current_post_array)) {
+				$current_post_array = array_map('strval', $current_post_array);
+				array_unique($current_post_array);
 			}
 
 			// If the current connected post has no saved connections then we create it.
-			if ( false === $current_post_array || empty( $current_post_array ) ) {
-				$current_post_array = array( $current_id );
-			} elseif ( ! in_array( (string) $current_id, $current_post_array, true ) ) {
+			if (false === $current_post_array || empty($current_post_array)) {
+				$current_post_array = array($current_id);
+			} elseif ( ! in_array((string) $current_id, $current_post_array, true)) {
 				$current_post_array[] = $current_id;
 			}
 
 			// Check if the values are empty, if not update them.
-			if ( ! empty( $current_post_array ) ) {
-				update_post_meta( $value, $connected_key, $current_post_array, $previous_values );
+			if ( ! empty($current_post_array)) {
+				update_post_meta($value, $connected_key, $current_post_array, $previous_values);
 			}
 		}
 	}
@@ -282,25 +282,25 @@ 
 	 * @param [type] $connected_key
 	 * @return void
 	 */
-	public function remove_connected_posts( $values, $current_ID, $connected_key ) {
-		foreach ( $values as $value ) {
-			$current_post_array = get_post_meta( $value, $connected_key, true );
+	public function remove_connected_posts($values, $current_ID, $connected_key) {
+		foreach ($values as $value) {
+			$current_post_array = get_post_meta($value, $connected_key, true);
 			$new_array          = array();
 			// Loop through only if the current ID has been saved against the post.
-			if ( in_array( $current_ID, $current_post_array, false ) ) {
+			if (in_array($current_ID, $current_post_array, false)) {
 
 				// Loop through all the connected saved IDS.
-				foreach ( $current_post_array as $cpa ) {
-					if ( (int) $cpa !== (int) $current_ID ) {
+				foreach ($current_post_array as $cpa) {
+					if ((int) $cpa !== (int) $current_ID) {
 						$new_array[] = $cpa;
 					}
 				}
-				if ( ! empty( $new_array ) ) {
-					$new_array = array_unique( $new_array );
-					delete_post_meta( $value, $connected_key );
-					add_post_meta( $value, $connected_key, $new_array, true );
+				if ( ! empty($new_array)) {
+					$new_array = array_unique($new_array);
+					delete_post_meta($value, $connected_key);
+					add_post_meta($value, $connected_key, $new_array, true);
 				} else {
-					delete_post_meta( $value, $connected_key );
+					delete_post_meta($value, $connected_key);
 				}
 			}
 		}
@@ -312,13 +312,13 @@ 
 	 * @param string $item_id
 	 * @return void
 	 */
-	public function delete_post_meta_connections( $item_id = '' ) {
-		if ( '' !== $item_id ) {
-			$post_type   = get_post_type( $item_id );
+	public function delete_post_meta_connections($item_id = '') {
+		if ('' !== $item_id) {
+			$post_type   = get_post_type($item_id);
 			$connections = $this->get_connections();
-			if ( isset( $connections[ $post_type ] ) && ! empty( $connections[ $post_type ] ) && is_array( $connections[ $post_type ] ) ) {
-				foreach ( $connections[ $post_type ] as $this_key => $connected_key ) {
-					$this->delete_connected_items( $item_id, $this_key, $connected_key );
+			if (isset($connections[$post_type]) && ! empty($connections[$post_type]) && is_array($connections[$post_type])) {
+				foreach ($connections[$post_type] as $this_key => $connected_key) {
+					$this->delete_connected_items($item_id, $this_key, $connected_key);
 				}
 			}
 		}
@@ -332,23 +332,23 @@ 
 	 * @param string $connected_key
 	 * @return void
 	 */
-	public function delete_connected_items( $item_id = '', $this_key, $connected_key ) {
-		if ( '' !== $item_id ) {
-			$connected_items = get_post_meta( $item_id, $this_key, true );
-			if ( ! empty( $connected_items ) ) {
-				foreach ( $connected_items as $con_id ) {
+	public function delete_connected_items($item_id = '', $this_key, $connected_key) {
+		if ('' !== $item_id) {
+			$connected_items = get_post_meta($item_id, $this_key, true);
+			if ( ! empty($connected_items)) {
+				foreach ($connected_items as $con_id) {
 					// Get the connected item array from the connected item.
-					$their_connections = get_post_meta( $con_id, $connected_key, true );
-					if ( ! empty( $their_connections ) ) {
+					$their_connections = get_post_meta($con_id, $connected_key, true);
+					if ( ! empty($their_connections)) {
 						$new_connections = $their_connections;
 						// Run through the array and remove the post to be deleteds ID.
-						foreach ( $their_connections as $ckey => $cvalue ) {
-							if ( (int) $item_id === (int) $cvalue ) {
-								unset( $new_connections[ $ckey ] );
+						foreach ($their_connections as $ckey => $cvalue) {
+							if ((int) $item_id === (int) $cvalue) {
+								unset($new_connections[$ckey]);
 							}
 						}
 						// Now we save the field.
-						update_post_meta( $con_id, $connected_key, $new_connections, $their_connections );
+						update_post_meta($con_id, $connected_key, $new_connections, $their_connections);
 					}
 				}
 			}
@@ -360,20 +360,20 @@ 
 	 *
 	 * @return    void
 	 */
-	public function create_query_fields( $field_id, $updated, $action, $cmb2 ) {
+	public function create_query_fields($field_id, $updated, $action, $cmb2) {
 		// If the connections are empty then skip this function.
 		$search_fields = array(
 			'plan_product',
 		);
-		if ( ! in_array( $field_id, $search_fields ) ) {
+		if ( ! in_array($field_id, $search_fields)) {
 			return;
 		}
 
 		// If the field has been updated.
-		if ( isset( $cmb2->data_to_save['ID'] ) && isset( $cmb2->data_to_save[ $field_id . '_results' ] ) && ! empty( $cmb2->data_to_save[ $field_id . '_results' ] ) ) {
-			delete_post_meta( $cmb2->data_to_save['ID'], '_' . $field_id . '_id' );
-			foreach ( $cmb2->data_to_save[ $field_id . '_results' ] as $temp ) {
-				add_post_meta( $cmb2->data_to_save['ID'], '_' . $field_id . '_id', $temp, false );
+		if (isset($cmb2->data_to_save['ID']) && isset($cmb2->data_to_save[$field_id . '_results']) && ! empty($cmb2->data_to_save[$field_id . '_results'])) {
+			delete_post_meta($cmb2->data_to_save['ID'], '_' . $field_id . '_id');
+			foreach ($cmb2->data_to_save[$field_id . '_results'] as $temp) {
+				add_post_meta($cmb2->data_to_save['ID'], '_' . $field_id . '_id', $temp, false);
 			}
 		}
 	}
@@ -387,26 +387,26 @@ 
 	 * @param [type] $cmb2
 	 * @return void
 	 */
-	public function extract_plan_fields( $object_id, $cmb_id, $updated, $cmb2 ) {
-		if ( 'plan_sections_metabox' === $cmb_id ) {
+	public function extract_plan_fields($object_id, $cmb_id, $updated, $cmb2) {
+		if ('plan_sections_metabox' === $cmb_id) {
 			// Check if our fields are available, and cycle through them.
-			if ( isset( $cmb2->data_to_save['plan_sections'] ) && ! empty( $cmb2->data_to_save['plan_sections'] ) ) {
+			if (isset($cmb2->data_to_save['plan_sections']) && ! empty($cmb2->data_to_save['plan_sections'])) {
 				$fields_to_save = array();
 				// Run through each row of fields.
-				foreach ( $cmb2->data_to_save['plan_sections'] as $field_index => $fields ) {
+				foreach ($cmb2->data_to_save['plan_sections'] as $field_index => $fields) {
 					// Run through each field in that section.
-					foreach ( $fields as $field_key => $field_value ) {
+					foreach ($fields as $field_key => $field_value) {
 						$stored_values_key = 'plan_sections_' . $field_index . '_' . $field_key . '_store';
-						if ( isset( $cmb2->data_to_save[ $stored_values_key ] ) && ! empty( $cmb2->data_to_save[ $stored_values_key ] ) ) {
-							$stored_values = $cmb2->data_to_save[ $stored_values_key ];
-							$stored_values = explode( ',', $stored_values );
-							foreach ( $stored_values as $id_to_save ) {
-								$fields_to_save[ $field_key ][] = $id_to_save;
+						if (isset($cmb2->data_to_save[$stored_values_key]) && ! empty($cmb2->data_to_save[$stored_values_key])) {
+							$stored_values = $cmb2->data_to_save[$stored_values_key];
+							$stored_values = explode(',', $stored_values);
+							foreach ($stored_values as $id_to_save) {
+								$fields_to_save[$field_key][] = $id_to_save;
 							}
 						}
 					}
 				}
-				$this->save_field_array( $object_id, $fields_to_save );
+				$this->save_field_array($object_id, $fields_to_save);
 			}
 		}
 	}
@@ -418,23 +418,23 @@ 
 	 * @param array   $fields_to_save
 	 * @return void
 	 */
-	public function save_field_array( $object_id = 0, $fields_to_save = array() ) {
+	public function save_field_array($object_id = 0, $fields_to_save = array()) {
 
 		// Run through the fields and save the meta items.
-		if ( ! empty( $fields_to_save ) ) {
-			foreach ( $fields_to_save as $field_key => $field_values ) {
-				delete_post_meta( $object_id, $field_key );
+		if ( ! empty($fields_to_save)) {
+			foreach ($fields_to_save as $field_key => $field_values) {
+				delete_post_meta($object_id, $field_key);
 
-				$field_values = array_unique( $field_values );
-				foreach ( $field_values as $field_value ) {
-					add_post_meta( $object_id, $field_key, $field_value, false );
+				$field_values = array_unique($field_values);
+				foreach ($field_values as $field_value) {
+					add_post_meta($object_id, $field_key, $field_value, false);
 				}
 			}
 		}
 	}
 
-	public function debugger_for_cmb2( $object_id, $cmb_id, $updated, $cmb2 ) {
-		if ( 'workout_section_6_metabox' === $cmb_id ) {
+	public function debugger_for_cmb2($object_id, $cmb_id, $updated, $cmb2) {
+		if ('workout_section_6_metabox' === $cmb_id) {
 			die();
 		}
 	}
@@ -442,7 +442,7 @@ 
 	/**
 	 * Handle body colours that might be change by LSX Customizer.
 	 */
-	public function customizer_body_colours_handler( $css, $colors ) {
+	public function customizer_body_colours_handler($css, $colors) {
 		$css .= '
 			@import "' . LSX_HEALTH_PLAN_PATH . '/assets/css/scss/partials/customizer-health-plan-body-colours";
 

Indentation +438 added lines, -438 removed lines

@@ -8,442 +8,442 @@ 
  */
 class Admin {
 
-	/**
-	 * Holds class instance
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var      object \lsx_health_plan\classes\Admin()
-	 */
-	protected static $instance = null;
-
-	/**
-	 * The post relation fields
-	 *
-	 * @var array
-	 */
-	public $connections = array();
-
-	/**
-	 * Stores the previous values needed to remove the post relations
-	 *
-	 * @var array
-	 */
-	public $previous_values = array();
-
-	/**
-	 * @var object \lsx_health_plan\classes\admin\Settings();
-	 */
-	public $settings;
-
-	/**
-	 * @var object \lsx_health_plan\classes\admin\Help_Page();
-	 */
-	public $help;
-
-	/**
-	 * Holds the settings page theme functions
-	 *
-	 * @var object \lsx_health_plan\classes\admin\Settings_Theme();
-	 */
-	public $settings_theme;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->load_classes();
-		add_action( 'admin_menu', array( $this, 'order_menus' ), 200 );
-		add_action( 'admin_enqueue_scripts', array( $this, 'assets' ) );
-		add_filter( 'cmb2_override_meta_save', array( $this, 'save_previous_values' ), 20, 4 );
-		add_filter( 'cmb2_override_meta_remove', array( $this, 'save_previous_values' ), 20, 4 );
-		add_action( 'cmb2_save_field', array( $this, 'post_relations' ), 20, 4 );
-		add_action( 'cmb2_save_field', array( $this, 'create_query_fields' ), 20, 4 );
-		add_action( 'before_delete_post', array( $this, 'delete_post_meta_connections' ), 20, 1 );
-		add_action( 'cmb2_save_post_fields', array( $this, 'extract_plan_fields' ), 10, 4 );
-
-		//add_action( 'cmb2_save_post_fields', array( $this, 'debugger_for_cmb2' ), 10, 4 );
-
-		// Customizer.
-		add_filter( 'lsx_customizer_colour_selectors_body', array( $this, 'customizer_body_colours_handler' ), 15, 2 );
-	}
-
-	/**
-	 * Return an instance of this class.
-	 *
-	 * @return object \lsx\member_directory\classes\Admin()    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 admin subclasses
-	 */
-	private function load_classes() {
-		require_once LSX_HEALTH_PLAN_PATH . 'classes/admin/class-settings.php';
-		$this->settings = admin\Settings::get_instance();
-
-		require_once LSX_HEALTH_PLAN_PATH . 'classes/admin/class-help-page.php';
-		$this->help = admin\Help_Page::get_instance();
-
-		require_once LSX_HEALTH_PLAN_PATH . 'classes/admin/class-settings-theme.php';
-		$this->settings_theme = admin\Settings_Theme::get_instance();
-	}
-
-	/**
-	 * Orders the HP menu Items
-	 *
-	 * @return void
-	 */
-	public function order_menus() {
-		global $menu, $submenu;
-		if ( ! empty( $submenu ) ) {
-			$parent_check = array(
-				'edit.php?post_type=plan',
-				'edit.php?post_type=workout',
-				'edit.php?post_type=meal',
-			);
-			foreach ( $submenu as $menu_id => $menu_values ) {
-				if ( in_array( $menu_id, $parent_check ) ) {
-					foreach ( $menu_values as $sub_menu_key => $sub_menu_values ) {
-						switch ( $sub_menu_values[0] ) {
-
-							case __( 'Add New', 'lsx-health-plan' ):
-								unset( $submenu[ $menu_id ][ $sub_menu_key ] );
-								break;
-
-							case __( 'All', 'lsx-health-plan' ):
-								$title = $sub_menu_values[0];
-								// Check and change the label.
-								switch ( $sub_menu_values[2] ) {
-									case 'edit.php?post_type=meal':
-										$title = esc_attr__( 'Meals', 'lsx-health-plan' );
-										break;
-
-									case 'edit.php?post_type=recipe':
-										$title = esc_attr__( 'Recipes', 'lsx-health-plan' );
-										break;
-
-									case 'edit.php?post_type=workout':
-										$title = esc_attr__( 'Workouts', 'lsx-health-plan' );
-										break;
-
-									case 'edit.php?post_type=plan':
-										$title = esc_attr__( 'Plans', 'lsx-health-plan' );
-										break;
-
-									case 'edit.php?post_type=video':
-										$title = esc_attr__( 'Videos', 'lsx-health-plan' );
-										break;
-
-									case 'edit.php?post_type=exercise':
-										$title = esc_attr__( 'Exercises', 'lsx-health-plan' );
-										break;
-
-									case 'edit.php?post_type=tip':
-										$title = esc_attr__( 'Tips', 'lsx-health-plan' );
-										break;
-
-									default:
-										break;
-								}
-								$submenu[ $menu_id ][ $sub_menu_key ][0] = $title; // @codingStandardsIgnoreLine
-								break;
-
-							default:
-								break;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Undocumented function
-	 *
-	 * @return void
-	 */
-	public function assets() {
-		wp_enqueue_script( 'media-upload' );
-		wp_enqueue_script( 'thickbox' );
-		wp_enqueue_style( 'thickbox' );
-
-		wp_enqueue_script( 'lsx-health-plan-admin', LSX_HEALTH_PLAN_URL . 'assets/js/lsx-health-plan-admin.min.js', array( 'jquery' ), LSX_HEALTH_PLAN_VER, true );
-		wp_enqueue_style( 'lsx-health-plan-admin', LSX_HEALTH_PLAN_URL . 'assets/css/lsx-health-plan-admin.css', array(), LSX_HEALTH_PLAN_VER );
-	}
-
-	/**
-	 * Returns the registered connections.
-	 *
-	 * @return void
-	 */
-	public function get_connections() {
-		return apply_filters( 'lsx_health_plan_connections', $this->connections );
-	}
-
-	/**
-	 * Saves the previous values before they are overwritten by the new ones.
-	 *
-	 * @param [type] $value_to_save
-	 * @param [type] $a
-	 * @param [type] $args
-	 * @param [type] $cmb2
-	 * @return void
-	 */
-	public function save_previous_values( $value_to_save, $a, $args, $cmb2 ) {
-		if ( isset( $cmb2->data_to_save['ID'] ) ) {
-			$connections = $this->get_connections();
-			$post_type   = get_post_type( $cmb2->data_to_save['ID'] );
-			if ( isset( $connections[ $post_type ] ) && array_key_exists( $a['field_id'], $connections[ $post_type ] ) ) {
-				// Get the previous values if the field, so we can run through them and remove the current ID from them later.
-				$this->previous_values = get_post_meta( $a['id'], $a['field_id'], true );
-			}
-		}
-		return $value_to_save;
-	}
-
-	/**
-	 * Sets up the "post relations"
-	 *
-	 * @return    void
-	 */
-	public function post_relations( $field_id, $updated, $action, $cmb2 ) {
-		// If the connections are empty then skip this function.
-		$connections = $this->get_connections();
-		if ( empty( $connections ) ) {
-			return;
-		}
-
-		// If the field has been updated.
-		if ( isset( $cmb2->data_to_save['ID'] ) ) {
-			$post_type = get_post_type( $cmb2->data_to_save['ID'] );
-			if ( isset( $connections[ $post_type ] ) && array_key_exists( $field_id, $connections[ $post_type ] ) ) {
-				$saved_values = get_post_meta( $cmb2->data_to_save['ID'], $field_id, true );
-
-				if ( 'updated' === $action ) {
-					$this->add_connected_posts( $saved_values, $cmb2->data_to_save['ID'], $connections[ $post_type ][ $field_id ] );
-					// Check if any posts have been removed.
-					if ( count( $this->previous_values ) > count( $saved_values ) ) {
-						$posts_to_remove = array_diff( $this->previous_values, $saved_values );
-						if ( ! empty( $posts_to_remove ) ) {
-							$this->remove_connected_posts( $posts_to_remove, $cmb2->data_to_save['ID'], $connections[ $post_type ][ $field_id ] );
-						}
-					}
-				} else if ( 'removed' === $action && ! empty( $this->previous_values ) ) {
-					$this->remove_connected_posts( $this->previous_values, $cmb2->data_to_save['ID'], $connections[ $post_type ][ $field_id ] );
-				}
-			}
-		}
-	}
-
-	/**
-	 * Updates the connected posts witht he current post ID
-	 *
-	 * @param [type] $values
-	 * @param [type] $current_id
-	 * @param [type] $connected_key
-	 * @return void
-	 */
-	public function add_connected_posts( $values, $current_id, $connected_key ) {
-		foreach ( $values as $value ) {
-			$current_post_array = get_post_meta( $value, $connected_key, true );
-			$previous_values    = $current_post_array;
-
-			if ( ! empty( $current_post_array ) ) {
-				$current_post_array = array_map( 'strval', $current_post_array );
-				array_unique( $current_post_array );
-			}
-
-			// If the current connected post has no saved connections then we create it.
-			if ( false === $current_post_array || empty( $current_post_array ) ) {
-				$current_post_array = array( $current_id );
-			} elseif ( ! in_array( (string) $current_id, $current_post_array, true ) ) {
-				$current_post_array[] = $current_id;
-			}
-
-			// Check if the values are empty, if not update them.
-			if ( ! empty( $current_post_array ) ) {
-				update_post_meta( $value, $connected_key, $current_post_array, $previous_values );
-			}
-		}
-	}
-
-	/**
-	 * Removes the post ID from the connected posts.
-	 *
-	 * @param [type] $values
-	 * @param [type] $current_ID
-	 * @param [type] $connected_key
-	 * @return void
-	 */
-	public function remove_connected_posts( $values, $current_ID, $connected_key ) {
-		foreach ( $values as $value ) {
-			$current_post_array = get_post_meta( $value, $connected_key, true );
-			$new_array          = array();
-			// Loop through only if the current ID has been saved against the post.
-			if ( in_array( $current_ID, $current_post_array, false ) ) {
-
-				// Loop through all the connected saved IDS.
-				foreach ( $current_post_array as $cpa ) {
-					if ( (int) $cpa !== (int) $current_ID ) {
-						$new_array[] = $cpa;
-					}
-				}
-				if ( ! empty( $new_array ) ) {
-					$new_array = array_unique( $new_array );
-					delete_post_meta( $value, $connected_key );
-					add_post_meta( $value, $connected_key, $new_array, true );
-				} else {
-					delete_post_meta( $value, $connected_key );
-				}
-			}
-		}
-	}
-
-	/**
-	 * Runs on 'before_delete_post' to run through and remove this post ID from its connected values.
-	 *
-	 * @param string $item_id
-	 * @return void
-	 */
-	public function delete_post_meta_connections( $item_id = '' ) {
-		if ( '' !== $item_id ) {
-			$post_type   = get_post_type( $item_id );
-			$connections = $this->get_connections();
-			if ( isset( $connections[ $post_type ] ) && ! empty( $connections[ $post_type ] ) && is_array( $connections[ $post_type ] ) ) {
-				foreach ( $connections[ $post_type ] as $this_key => $connected_key ) {
-					$this->delete_connected_items( $item_id, $this_key, $connected_key );
-				}
-			}
-		}
-	}
-
-	/**
-	 * This function will remvoe the post id fomr its connected posts.
-	 *
-	 * @param string $item_id
-	 * @param string $this_key
-	 * @param string $connected_key
-	 * @return void
-	 */
-	public function delete_connected_items( $item_id = '', $this_key, $connected_key ) {
-		if ( '' !== $item_id ) {
-			$connected_items = get_post_meta( $item_id, $this_key, true );
-			if ( ! empty( $connected_items ) ) {
-				foreach ( $connected_items as $con_id ) {
-					// Get the connected item array from the connected item.
-					$their_connections = get_post_meta( $con_id, $connected_key, true );
-					if ( ! empty( $their_connections ) ) {
-						$new_connections = $their_connections;
-						// Run through the array and remove the post to be deleteds ID.
-						foreach ( $their_connections as $ckey => $cvalue ) {
-							if ( (int) $item_id === (int) $cvalue ) {
-								unset( $new_connections[ $ckey ] );
-							}
-						}
-						// Now we save the field.
-						update_post_meta( $con_id, $connected_key, $new_connections, $their_connections );
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Saves the serialized post ids in singular custom fields so they are easily queried using WP_Query
-	 *
-	 * @return    void
-	 */
-	public function create_query_fields( $field_id, $updated, $action, $cmb2 ) {
-		// If the connections are empty then skip this function.
-		$search_fields = array(
-			'plan_product',
-		);
-		if ( ! in_array( $field_id, $search_fields ) ) {
-			return;
-		}
-
-		// If the field has been updated.
-		if ( isset( $cmb2->data_to_save['ID'] ) && isset( $cmb2->data_to_save[ $field_id . '_results' ] ) && ! empty( $cmb2->data_to_save[ $field_id . '_results' ] ) ) {
-			delete_post_meta( $cmb2->data_to_save['ID'], '_' . $field_id . '_id' );
-			foreach ( $cmb2->data_to_save[ $field_id . '_results' ] as $temp ) {
-				add_post_meta( $cmb2->data_to_save['ID'], '_' . $field_id . '_id', $temp, false );
-			}
-		}
-	}
-
-	/**
-	 * Extract the plan fields so they save to an indexable array.
-	 *
-	 * @param [type] $object_id
-	 * @param [type] $cmb_id
-	 * @param [type] $updated
-	 * @param [type] $cmb2
-	 * @return void
-	 */
-	public function extract_plan_fields( $object_id, $cmb_id, $updated, $cmb2 ) {
-		if ( 'plan_sections_metabox' === $cmb_id ) {
-			// Check if our fields are available, and cycle through them.
-			if ( isset( $cmb2->data_to_save['plan_sections'] ) && ! empty( $cmb2->data_to_save['plan_sections'] ) ) {
-				$fields_to_save = array();
-				// Run through each row of fields.
-				foreach ( $cmb2->data_to_save['plan_sections'] as $field_index => $fields ) {
-					// Run through each field in that section.
-					foreach ( $fields as $field_key => $field_value ) {
-						$stored_values_key = 'plan_sections_' . $field_index . '_' . $field_key . '_store';
-						if ( isset( $cmb2->data_to_save[ $stored_values_key ] ) && ! empty( $cmb2->data_to_save[ $stored_values_key ] ) ) {
-							$stored_values = $cmb2->data_to_save[ $stored_values_key ];
-							$stored_values = explode( ',', $stored_values );
-							foreach ( $stored_values as $id_to_save ) {
-								$fields_to_save[ $field_key ][] = $id_to_save;
-							}
-						}
-					}
-				}
-				$this->save_field_array( $object_id, $fields_to_save );
-			}
-		}
-	}
-
-	/**
-	 * Runs through the supplied array and saved the fields to the current Object.
-	 *
-	 * @param integer $object_id
-	 * @param array   $fields_to_save
-	 * @return void
-	 */
-	public function save_field_array( $object_id = 0, $fields_to_save = array() ) {
-
-		// Run through the fields and save the meta items.
-		if ( ! empty( $fields_to_save ) ) {
-			foreach ( $fields_to_save as $field_key => $field_values ) {
-				delete_post_meta( $object_id, $field_key );
-
-				$field_values = array_unique( $field_values );
-				foreach ( $field_values as $field_value ) {
-					add_post_meta( $object_id, $field_key, $field_value, false );
-				}
-			}
-		}
-	}
-
-	public function debugger_for_cmb2( $object_id, $cmb_id, $updated, $cmb2 ) {
-		if ( 'workout_section_6_metabox' === $cmb_id ) {
-			die();
-		}
-	}
-
-	/**
-	 * Handle body colours that might be change by LSX Customizer.
-	 */
-	public function customizer_body_colours_handler( $css, $colors ) {
-		$css .= '
+     /**
+      * Holds class instance
+      *
+      * @since 1.0.0
+      *
+      * @var      object \lsx_health_plan\classes\Admin()
+      */
+     protected static $instance = null;
+
+     /**
+      * The post relation fields
+      *
+      * @var array
+      */
+     public $connections = array();
+
+     /**
+      * Stores the previous values needed to remove the post relations
+      *
+      * @var array
+      */
+     public $previous_values = array();
+
+     /**
+      * @var object \lsx_health_plan\classes\admin\Settings();
+      */
+     public $settings;
+
+     /**
+      * @var object \lsx_health_plan\classes\admin\Help_Page();
+      */
+     public $help;
+
+     /**
+      * Holds the settings page theme functions
+      *
+      * @var object \lsx_health_plan\classes\admin\Settings_Theme();
+      */
+     public $settings_theme;
+
+     /**
+      * Constructor
+      */
+     public function __construct() {
+          $this->load_classes();
+          add_action( 'admin_menu', array( $this, 'order_menus' ), 200 );
+          add_action( 'admin_enqueue_scripts', array( $this, 'assets' ) );
+          add_filter( 'cmb2_override_meta_save', array( $this, 'save_previous_values' ), 20, 4 );
+          add_filter( 'cmb2_override_meta_remove', array( $this, 'save_previous_values' ), 20, 4 );
+          add_action( 'cmb2_save_field', array( $this, 'post_relations' ), 20, 4 );
+          add_action( 'cmb2_save_field', array( $this, 'create_query_fields' ), 20, 4 );
+          add_action( 'before_delete_post', array( $this, 'delete_post_meta_connections' ), 20, 1 );
+          add_action( 'cmb2_save_post_fields', array( $this, 'extract_plan_fields' ), 10, 4 );
+
+          //add_action( 'cmb2_save_post_fields', array( $this, 'debugger_for_cmb2' ), 10, 4 );
+
+          // Customizer.
+          add_filter( 'lsx_customizer_colour_selectors_body', array( $this, 'customizer_body_colours_handler' ), 15, 2 );
+     }
+
+     /**
+      * Return an instance of this class.
+      *
+      * @return object \lsx\member_directory\classes\Admin()    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 admin subclasses
+      */
+     private function load_classes() {
+          require_once LSX_HEALTH_PLAN_PATH . 'classes/admin/class-settings.php';
+          $this->settings = admin\Settings::get_instance();
+
+          require_once LSX_HEALTH_PLAN_PATH . 'classes/admin/class-help-page.php';
+          $this->help = admin\Help_Page::get_instance();
+
+          require_once LSX_HEALTH_PLAN_PATH . 'classes/admin/class-settings-theme.php';
+          $this->settings_theme = admin\Settings_Theme::get_instance();
+     }
+
+     /**
+      * Orders the HP menu Items
+      *
+      * @return void
+      */
+     public function order_menus() {
+          global $menu, $submenu;
+          if ( ! empty( $submenu ) ) {
+               $parent_check = array(
+                    'edit.php?post_type=plan',
+                    'edit.php?post_type=workout',
+                    'edit.php?post_type=meal',
+               );
+               foreach ( $submenu as $menu_id => $menu_values ) {
+                    if ( in_array( $menu_id, $parent_check ) ) {
+                         foreach ( $menu_values as $sub_menu_key => $sub_menu_values ) {
+                              switch ( $sub_menu_values[0] ) {
+
+                                   case __( 'Add New', 'lsx-health-plan' ):
+                                        unset( $submenu[ $menu_id ][ $sub_menu_key ] );
+                                        break;
+
+                                   case __( 'All', 'lsx-health-plan' ):
+                                        $title = $sub_menu_values[0];
+                                        // Check and change the label.
+                                        switch ( $sub_menu_values[2] ) {
+                                             case 'edit.php?post_type=meal':
+                                                  $title = esc_attr__( 'Meals', 'lsx-health-plan' );
+                                                  break;
+
+                                             case 'edit.php?post_type=recipe':
+                                                  $title = esc_attr__( 'Recipes', 'lsx-health-plan' );
+                                                  break;
+
+                                             case 'edit.php?post_type=workout':
+                                                  $title = esc_attr__( 'Workouts', 'lsx-health-plan' );
+                                                  break;
+
+                                             case 'edit.php?post_type=plan':
+                                                  $title = esc_attr__( 'Plans', 'lsx-health-plan' );
+                                                  break;
+
+                                             case 'edit.php?post_type=video':
+                                                  $title = esc_attr__( 'Videos', 'lsx-health-plan' );
+                                                  break;
+
+                                             case 'edit.php?post_type=exercise':
+                                                  $title = esc_attr__( 'Exercises', 'lsx-health-plan' );
+                                                  break;
+
+                                             case 'edit.php?post_type=tip':
+                                                  $title = esc_attr__( 'Tips', 'lsx-health-plan' );
+                                                  break;
+
+                                             default:
+                                                  break;
+                                        }
+                                        $submenu[ $menu_id ][ $sub_menu_key ][0] = $title; // @codingStandardsIgnoreLine
+                                        break;
+
+                                   default:
+                                        break;
+                              }
+                         }
+                    }
+               }
+          }
+     }
+
+     /**
+      * Undocumented function
+      *
+      * @return void
+      */
+     public function assets() {
+          wp_enqueue_script( 'media-upload' );
+          wp_enqueue_script( 'thickbox' );
+          wp_enqueue_style( 'thickbox' );
+
+          wp_enqueue_script( 'lsx-health-plan-admin', LSX_HEALTH_PLAN_URL . 'assets/js/lsx-health-plan-admin.min.js', array( 'jquery' ), LSX_HEALTH_PLAN_VER, true );
+          wp_enqueue_style( 'lsx-health-plan-admin', LSX_HEALTH_PLAN_URL . 'assets/css/lsx-health-plan-admin.css', array(), LSX_HEALTH_PLAN_VER );
+     }
+
+     /**
+      * Returns the registered connections.
+      *
+      * @return void
+      */
+     public function get_connections() {
+          return apply_filters( 'lsx_health_plan_connections', $this->connections );
+     }
+
+     /**
+      * Saves the previous values before they are overwritten by the new ones.
+      *
+      * @param [type] $value_to_save
+      * @param [type] $a
+      * @param [type] $args
+      * @param [type] $cmb2
+      * @return void
+      */
+     public function save_previous_values( $value_to_save, $a, $args, $cmb2 ) {
+          if ( isset( $cmb2->data_to_save['ID'] ) ) {
+               $connections = $this->get_connections();
+               $post_type   = get_post_type( $cmb2->data_to_save['ID'] );
+               if ( isset( $connections[ $post_type ] ) && array_key_exists( $a['field_id'], $connections[ $post_type ] ) ) {
+                    // Get the previous values if the field, so we can run through them and remove the current ID from them later.
+                    $this->previous_values = get_post_meta( $a['id'], $a['field_id'], true );
+               }
+          }
+          return $value_to_save;
+     }
+
+     /**
+      * Sets up the "post relations"
+      *
+      * @return    void
+      */
+     public function post_relations( $field_id, $updated, $action, $cmb2 ) {
+          // If the connections are empty then skip this function.
+          $connections = $this->get_connections();
+          if ( empty( $connections ) ) {
+               return;
+          }
+
+          // If the field has been updated.
+          if ( isset( $cmb2->data_to_save['ID'] ) ) {
+               $post_type = get_post_type( $cmb2->data_to_save['ID'] );
+               if ( isset( $connections[ $post_type ] ) && array_key_exists( $field_id, $connections[ $post_type ] ) ) {
+                    $saved_values = get_post_meta( $cmb2->data_to_save['ID'], $field_id, true );
+
+                    if ( 'updated' === $action ) {
+                         $this->add_connected_posts( $saved_values, $cmb2->data_to_save['ID'], $connections[ $post_type ][ $field_id ] );
+                         // Check if any posts have been removed.
+                         if ( count( $this->previous_values ) > count( $saved_values ) ) {
+                              $posts_to_remove = array_diff( $this->previous_values, $saved_values );
+                              if ( ! empty( $posts_to_remove ) ) {
+                                   $this->remove_connected_posts( $posts_to_remove, $cmb2->data_to_save['ID'], $connections[ $post_type ][ $field_id ] );
+                              }
+                         }
+                    } else if ( 'removed' === $action && ! empty( $this->previous_values ) ) {
+                         $this->remove_connected_posts( $this->previous_values, $cmb2->data_to_save['ID'], $connections[ $post_type ][ $field_id ] );
+                    }
+               }
+          }
+     }
+
+     /**
+      * Updates the connected posts witht he current post ID
+      *
+      * @param [type] $values
+      * @param [type] $current_id
+      * @param [type] $connected_key
+      * @return void
+      */
+     public function add_connected_posts( $values, $current_id, $connected_key ) {
+          foreach ( $values as $value ) {
+               $current_post_array = get_post_meta( $value, $connected_key, true );
+               $previous_values    = $current_post_array;
+
+               if ( ! empty( $current_post_array ) ) {
+                    $current_post_array = array_map( 'strval', $current_post_array );
+                    array_unique( $current_post_array );
+               }
+
+               // If the current connected post has no saved connections then we create it.
+               if ( false === $current_post_array || empty( $current_post_array ) ) {
+                    $current_post_array = array( $current_id );
+               } elseif ( ! in_array( (string) $current_id, $current_post_array, true ) ) {
+                    $current_post_array[] = $current_id;
+               }
+
+               // Check if the values are empty, if not update them.
+               if ( ! empty( $current_post_array ) ) {
+                    update_post_meta( $value, $connected_key, $current_post_array, $previous_values );
+               }
+          }
+     }
+
+     /**
+      * Removes the post ID from the connected posts.
+      *
+      * @param [type] $values
+      * @param [type] $current_ID
+      * @param [type] $connected_key
+      * @return void
+      */
+     public function remove_connected_posts( $values, $current_ID, $connected_key ) {
+          foreach ( $values as $value ) {
+               $current_post_array = get_post_meta( $value, $connected_key, true );
+               $new_array          = array();
+               // Loop through only if the current ID has been saved against the post.
+               if ( in_array( $current_ID, $current_post_array, false ) ) {
+
+                    // Loop through all the connected saved IDS.
+                    foreach ( $current_post_array as $cpa ) {
+                         if ( (int) $cpa !== (int) $current_ID ) {
+                              $new_array[] = $cpa;
+                         }
+                    }
+                    if ( ! empty( $new_array ) ) {
+                         $new_array = array_unique( $new_array );
+                         delete_post_meta( $value, $connected_key );
+                         add_post_meta( $value, $connected_key, $new_array, true );
+                    } else {
+                         delete_post_meta( $value, $connected_key );
+                    }
+               }
+          }
+     }
+
+     /**
+      * Runs on 'before_delete_post' to run through and remove this post ID from its connected values.
+      *
+      * @param string $item_id
+      * @return void
+      */
+     public function delete_post_meta_connections( $item_id = '' ) {
+          if ( '' !== $item_id ) {
+               $post_type   = get_post_type( $item_id );
+               $connections = $this->get_connections();
+               if ( isset( $connections[ $post_type ] ) && ! empty( $connections[ $post_type ] ) && is_array( $connections[ $post_type ] ) ) {
+                    foreach ( $connections[ $post_type ] as $this_key => $connected_key ) {
+                         $this->delete_connected_items( $item_id, $this_key, $connected_key );
+                    }
+               }
+          }
+     }
+
+     /**
+      * This function will remvoe the post id fomr its connected posts.
+      *
+      * @param string $item_id
+      * @param string $this_key
+      * @param string $connected_key
+      * @return void
+      */
+     public function delete_connected_items( $item_id = '', $this_key, $connected_key ) {
+          if ( '' !== $item_id ) {
+               $connected_items = get_post_meta( $item_id, $this_key, true );
+               if ( ! empty( $connected_items ) ) {
+                    foreach ( $connected_items as $con_id ) {
+                         // Get the connected item array from the connected item.
+                         $their_connections = get_post_meta( $con_id, $connected_key, true );
+                         if ( ! empty( $their_connections ) ) {
+                              $new_connections = $their_connections;
+                              // Run through the array and remove the post to be deleteds ID.
+                              foreach ( $their_connections as $ckey => $cvalue ) {
+                                   if ( (int) $item_id === (int) $cvalue ) {
+                                        unset( $new_connections[ $ckey ] );
+                                   }
+                              }
+                              // Now we save the field.
+                              update_post_meta( $con_id, $connected_key, $new_connections, $their_connections );
+                         }
+                    }
+               }
+          }
+     }
+
+     /**
+      * Saves the serialized post ids in singular custom fields so they are easily queried using WP_Query
+      *
+      * @return    void
+      */
+     public function create_query_fields( $field_id, $updated, $action, $cmb2 ) {
+          // If the connections are empty then skip this function.
+          $search_fields = array(
+               'plan_product',
+          );
+          if ( ! in_array( $field_id, $search_fields ) ) {
+               return;
+          }
+
+          // If the field has been updated.
+          if ( isset( $cmb2->data_to_save['ID'] ) && isset( $cmb2->data_to_save[ $field_id . '_results' ] ) && ! empty( $cmb2->data_to_save[ $field_id . '_results' ] ) ) {
+               delete_post_meta( $cmb2->data_to_save['ID'], '_' . $field_id . '_id' );
+               foreach ( $cmb2->data_to_save[ $field_id . '_results' ] as $temp ) {
+                    add_post_meta( $cmb2->data_to_save['ID'], '_' . $field_id . '_id', $temp, false );
+               }
+          }
+     }
+
+     /**
+      * Extract the plan fields so they save to an indexable array.
+      *
+      * @param [type] $object_id
+      * @param [type] $cmb_id
+      * @param [type] $updated
+      * @param [type] $cmb2
+      * @return void
+      */
+     public function extract_plan_fields( $object_id, $cmb_id, $updated, $cmb2 ) {
+          if ( 'plan_sections_metabox' === $cmb_id ) {
+               // Check if our fields are available, and cycle through them.
+               if ( isset( $cmb2->data_to_save['plan_sections'] ) && ! empty( $cmb2->data_to_save['plan_sections'] ) ) {
+                    $fields_to_save = array();
+                    // Run through each row of fields.
+                    foreach ( $cmb2->data_to_save['plan_sections'] as $field_index => $fields ) {
+                         // Run through each field in that section.
+                         foreach ( $fields as $field_key => $field_value ) {
+                              $stored_values_key = 'plan_sections_' . $field_index . '_' . $field_key . '_store';
+                              if ( isset( $cmb2->data_to_save[ $stored_values_key ] ) && ! empty( $cmb2->data_to_save[ $stored_values_key ] ) ) {
+                                   $stored_values = $cmb2->data_to_save[ $stored_values_key ];
+                                   $stored_values = explode( ',', $stored_values );
+                                   foreach ( $stored_values as $id_to_save ) {
+                                        $fields_to_save[ $field_key ][] = $id_to_save;
+                                   }
+                              }
+                         }
+                    }
+                    $this->save_field_array( $object_id, $fields_to_save );
+               }
+          }
+     }
+
+     /**
+      * Runs through the supplied array and saved the fields to the current Object.
+      *
+      * @param integer $object_id
+      * @param array   $fields_to_save
+      * @return void
+      */
+     public function save_field_array( $object_id = 0, $fields_to_save = array() ) {
+
+          // Run through the fields and save the meta items.
+          if ( ! empty( $fields_to_save ) ) {
+               foreach ( $fields_to_save as $field_key => $field_values ) {
+                    delete_post_meta( $object_id, $field_key );
+
+                    $field_values = array_unique( $field_values );
+                    foreach ( $field_values as $field_value ) {
+                         add_post_meta( $object_id, $field_key, $field_value, false );
+                    }
+               }
+          }
+     }
+
+     public function debugger_for_cmb2( $object_id, $cmb_id, $updated, $cmb2 ) {
+          if ( 'workout_section_6_metabox' === $cmb_id ) {
+               die();
+          }
+     }
+
+     /**
+      * Handle body colours that might be change by LSX Customizer.
+      */
+     public function customizer_body_colours_handler( $css, $colors ) {
+          $css .= '
 			@import "' . LSX_HEALTH_PLAN_PATH . '/assets/css/scss/partials/customizer-health-plan-body-colours";
 
 			/**
@@ -459,6 +459,6 @@ 
 			);
 		';
 
-		return $css;
-	}
+          return $css;
+     }
 }

includes/functions/plan.php

Indentation +61 added lines, -61 removed lines

@@ -14,14 +14,14 @@ 
  * @return boolean
  */
 function is_search_enabled() {
-	$enabled = false;
-	if ( function_exists( 'lsx_search' ) ) {
-		$search_instance = \LSX_Search::get_instance();
-		if ( null !== $search_instance ) {
-			$enabled = $search_instance->frontend->is_search_enabled();
-		}
-	}
-	return $enabled;
+     $enabled = false;
+     if ( function_exists( 'lsx_search' ) ) {
+          $search_instance = \LSX_Search::get_instance();
+          if ( null !== $search_instance ) {
+               $enabled = $search_instance->frontend->is_search_enabled();
+          }
+     }
+     return $enabled;
 }
 
 /**
@@ -31,13 +31,13 @@ 
  * @return boolean
  */
 function has_sections( $plan_id = 0 ) {
-	$sections = false;
-	if ( 0 === $plan_id ) {
-		$plan_id = get_the_ID();
-	}
-	$lsx_hp   = lsx_health_plan();
-	$sections = $lsx_hp->frontend->plan_query->query_sections( $plan_id );
-	return $sections;
+     $sections = false;
+     if ( 0 === $plan_id ) {
+          $plan_id = get_the_ID();
+     }
+     $lsx_hp   = lsx_health_plan();
+     $sections = $lsx_hp->frontend->plan_query->query_sections( $plan_id );
+     return $sections;
 }
 
 /**
@@ -48,9 +48,9 @@ 
  * @return array
  */
 function get_sections( $group_sections = false ) {
-	$lsx_hp   = lsx_health_plan();
-	$sections = $lsx_hp->frontend->plan_query->get_sections( $group_sections );
-	return $sections;
+     $lsx_hp   = lsx_health_plan();
+     $sections = $lsx_hp->frontend->plan_query->get_sections( $group_sections );
+     return $sections;
 }
 
 /**
@@ -60,18 +60,18 @@ 
  * @return array
  */
 function get_section_info( $section_key = '' ) {
-	$section_info = array();
+     $section_info = array();
 
-	$sections = get_sections();
-	if ( ! empty( $sections ) ) {
-		foreach ( $sections as $key => $values ) {
-			$current_key = sanitize_title( $values['title'] );
-			if ( $current_key === $section_key ) {
-				return $values;
-			}
-		}
-	}
-	return $section_info;
+     $sections = get_sections();
+     if ( ! empty( $sections ) ) {
+          foreach ( $sections as $key => $values ) {
+               $current_key = sanitize_title( $values['title'] );
+               if ( $current_key === $section_key ) {
+                    return $values;
+               }
+          }
+     }
+     return $section_info;
 }
 
 /**
@@ -81,14 +81,14 @@ 
  * @return array
  */
 function get_group_title( $sections = array() ) {
-	$group_title = apply_filters( 'lsx_hp_default_plan_group', __( 'Daily Plan', 'lsx-health-plan' ) );
-	if ( ! empty( $sections ) ) {
-		$first_section = reset( $sections );
-		if ( isset( $first_section['group'] ) && '' !== $first_section['group'] ) {
-			$group_title = $first_section['group'];
-		}
-	}
-	return $group_title;
+     $group_title = apply_filters( 'lsx_hp_default_plan_group', __( 'Daily Plan', 'lsx-health-plan' ) );
+     if ( ! empty( $sections ) ) {
+          $first_section = reset( $sections );
+          if ( isset( $first_section['group'] ) && '' !== $first_section['group'] ) {
+               $group_title = $first_section['group'];
+          }
+     }
+     return $group_title;
 }
 
 /**
@@ -99,14 +99,14 @@ 
  * @return array
  */
 function get_permalink( $plan_id = 0, $title = '' ) {
-	if ( 0 === $plan_id ) {
-		$plan_id = get_the_ID();
-	}
-	$url = \get_permalink( $plan_id );
-	if ( '' !== $title ) {
-		$url .= sanitize_title( $title ) . '/';
-	}
-	return $url;
+     if ( 0 === $plan_id ) {
+          $plan_id = get_the_ID();
+     }
+     $url = \get_permalink( $plan_id );
+     if ( '' !== $title ) {
+          $url .= sanitize_title( $title ) . '/';
+     }
+     return $url;
 }
 
 /**
@@ -115,11 +115,11 @@ 
  * @return boolean
  */
 function is_filters_disabled( $disabled = false ) {
-	$is_disabled = \lsx_health_plan\functions\get_option( 'plan_filters_disabled', false );
-	if ( false !== $is_disabled ) {
-		$disabled = true;
-	}
-	return $disabled;
+     $is_disabled = \lsx_health_plan\functions\get_option( 'plan_filters_disabled', false );
+     if ( false !== $is_disabled ) {
+          $disabled = true;
+     }
+     return $disabled;
 }
 
 /**
@@ -130,17 +130,17 @@ 
  * @return string
  */
 function generate_section_id( $section_key = '' ) {
-	$key          = get_the_ID();
-	if ( '' === $section_key ) {
-		$section_key  = get_query_var( 'section' );
-	}
+     $key          = get_the_ID();
+     if ( '' === $section_key ) {
+          $section_key  = get_query_var( 'section' );
+     }
 
-	$section_key = sanitize_title( $section_key );
+     $section_key = sanitize_title( $section_key );
 	
-	if ( '' !== $section_key && \lsx_health_plan\functions\plan\has_sections() ) {
-		$group_title  = apply_filters( 'lsx_hp_default_plan_group', __( 'Daily Plan', 'lsx-health-plan' ) );
-		$section_info = \lsx_health_plan\functions\plan\get_section_info( $section_key );
-		$key         .= '_' . sanitize_key( $group_title ) . '_' . sanitize_key( $section_info['title'] );
-	}
-	return $key;
+     if ( '' !== $section_key && \lsx_health_plan\functions\plan\has_sections() ) {
+          $group_title  = apply_filters( 'lsx_hp_default_plan_group', __( 'Daily Plan', 'lsx-health-plan' ) );
+          $section_info = \lsx_health_plan\functions\plan\get_section_info( $section_key );
+          $key         .= '_' . sanitize_key( $group_title ) . '_' . sanitize_key( $section_info['title'] );
+     }
+     return $key;
 }

Spacing +34 added lines, -34 removed lines

@@ -15,9 +15,9 @@ 
  */
 function is_search_enabled() {
 	$enabled = false;
-	if ( function_exists( 'lsx_search' ) ) {
+	if (function_exists('lsx_search')) {
 		$search_instance = \LSX_Search::get_instance();
-		if ( null !== $search_instance ) {
+		if (null !== $search_instance) {
 			$enabled = $search_instance->frontend->is_search_enabled();
 		}
 	}
@@ -30,13 +30,13 @@ 
  * @param  integer $plan_id
  * @return boolean
  */
-function has_sections( $plan_id = 0 ) {
+function has_sections($plan_id = 0) {
 	$sections = false;
-	if ( 0 === $plan_id ) {
+	if (0 === $plan_id) {
 		$plan_id = get_the_ID();
 	}
 	$lsx_hp   = lsx_health_plan();
-	$sections = $lsx_hp->frontend->plan_query->query_sections( $plan_id );
+	$sections = $lsx_hp->frontend->plan_query->query_sections($plan_id);
 	return $sections;
 }
 
@@ -47,9 +47,9 @@ 
  * @param  boolean $group_sections
  * @return array
  */
-function get_sections( $group_sections = false ) {
+function get_sections($group_sections = false) {
 	$lsx_hp   = lsx_health_plan();
-	$sections = $lsx_hp->frontend->plan_query->get_sections( $group_sections );
+	$sections = $lsx_hp->frontend->plan_query->get_sections($group_sections);
 	return $sections;
 }
 
@@ -59,14 +59,14 @@ 
  * @param  string $section_key
  * @return array
  */
-function get_section_info( $section_key = '' ) {
+function get_section_info($section_key = '') {
 	$section_info = array();
 
 	$sections = get_sections();
-	if ( ! empty( $sections ) ) {
-		foreach ( $sections as $key => $values ) {
-			$current_key = sanitize_title( $values['title'] );
-			if ( $current_key === $section_key ) {
+	if ( ! empty($sections)) {
+		foreach ($sections as $key => $values) {
+			$current_key = sanitize_title($values['title']);
+			if ($current_key === $section_key) {
 				return $values;
 			}
 		}
@@ -80,11 +80,11 @@ 
  * @param  array $sections
  * @return array
  */
-function get_group_title( $sections = array() ) {
-	$group_title = apply_filters( 'lsx_hp_default_plan_group', __( 'Daily Plan', 'lsx-health-plan' ) );
-	if ( ! empty( $sections ) ) {
-		$first_section = reset( $sections );
-		if ( isset( $first_section['group'] ) && '' !== $first_section['group'] ) {
+function get_group_title($sections = array()) {
+	$group_title = apply_filters('lsx_hp_default_plan_group', __('Daily Plan', 'lsx-health-plan'));
+	if ( ! empty($sections)) {
+		$first_section = reset($sections);
+		if (isset($first_section['group']) && '' !== $first_section['group']) {
 			$group_title = $first_section['group'];
 		}
 	}
@@ -98,13 +98,13 @@ 
  * @param  string  $title
  * @return array
  */
-function get_permalink( $plan_id = 0, $title = '' ) {
-	if ( 0 === $plan_id ) {
+function get_permalink($plan_id = 0, $title = '') {
+	if (0 === $plan_id) {
 		$plan_id = get_the_ID();
 	}
-	$url = \get_permalink( $plan_id );
-	if ( '' !== $title ) {
-		$url .= sanitize_title( $title ) . '/';
+	$url = \get_permalink($plan_id);
+	if ('' !== $title) {
+		$url .= sanitize_title($title) . '/';
 	}
 	return $url;
 }
@@ -114,9 +114,9 @@ 
  *
  * @return boolean
  */
-function is_filters_disabled( $disabled = false ) {
-	$is_disabled = \lsx_health_plan\functions\get_option( 'plan_filters_disabled', false );
-	if ( false !== $is_disabled ) {
+function is_filters_disabled($disabled = false) {
+	$is_disabled = \lsx_health_plan\functions\get_option('plan_filters_disabled', false);
+	if (false !== $is_disabled) {
 		$disabled = true;
 	}
 	return $disabled;
@@ -129,18 +129,18 @@ 
  * @param  string  $section_key
  * @return string
  */
-function generate_section_id( $section_key = '' ) {
-	$key          = get_the_ID();
-	if ( '' === $section_key ) {
-		$section_key  = get_query_var( 'section' );
+function generate_section_id($section_key = '') {
+	$key = get_the_ID();
+	if ('' === $section_key) {
+		$section_key = get_query_var('section');
 	}
 
-	$section_key = sanitize_title( $section_key );
+	$section_key = sanitize_title($section_key);
 	
-	if ( '' !== $section_key && \lsx_health_plan\functions\plan\has_sections() ) {
-		$group_title  = apply_filters( 'lsx_hp_default_plan_group', __( 'Daily Plan', 'lsx-health-plan' ) );
-		$section_info = \lsx_health_plan\functions\plan\get_section_info( $section_key );
-		$key         .= '_' . sanitize_key( $group_title ) . '_' . sanitize_key( $section_info['title'] );
+	if ('' !== $section_key && \lsx_health_plan\functions\plan\has_sections()) {
+		$group_title  = apply_filters('lsx_hp_default_plan_group', __('Daily Plan', 'lsx-health-plan'));
+		$section_info = \lsx_health_plan\functions\plan\get_section_info($section_key);
+		$key         .= '_' . sanitize_key($group_title) . '_' . sanitize_key($section_info['title']);
 	}
 	return $key;
 }

classes/frontend/class-plan-query.php

Spacing +16 added lines, -16 removed lines

@@ -46,7 +46,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;
@@ -57,29 +57,29 @@ 
 	 *
 	 * @return void
 	 */
-	public function query_sections( $plan_id = '' ) {
-		if ( '' === $plan_id ) {
+	public function query_sections($plan_id = '') {
+		if ('' === $plan_id) {
 			$plan_id = get_the_ID();
 		}
 
-		$section_array = get_post_meta( $plan_id, 'plan_sections', true );
-		if ( ! empty( $section_array ) ) {
+		$section_array = get_post_meta($plan_id, 'plan_sections', true);
+		if ( ! empty($section_array)) {
 			$this->has_sections = true;
 			$this->sections     = $section_array;
 		}
 		return $this->has_sections;
 	}
 
-	public function get_sections( $group = false ) {
+	public function get_sections($group = false) {
 		$sections = $this->sections;
-		if ( false !== $group ) {
-			$sections = $this->group_sections( $sections );
+		if (false !== $group) {
+			$sections = $this->group_sections($sections);
 		}
 		return $sections;
 	}
 
 	public function get_section_count() {
-		return count( $this->sections );
+		return count($this->sections);
 	}
 
 	/**
@@ -88,16 +88,16 @@ 
 	 * @param  array $sections
 	 * @return array
 	 */
-	public function group_sections( $sections = array() ) {
+	public function group_sections($sections = array()) {
 		$groups = array();
-		if ( ! empty( $sections ) ) {
-			foreach ( $sections as $section_key => $section_values ) {
-				$group_key = apply_filters( 'lsx_hp_default_plan_group', __( 'Daily Plan', 'lsx-health-plan' ) );
-				if ( isset( $section_values['group'] ) && '' !== $section_values['group'] ) {
+		if ( ! empty($sections)) {
+			foreach ($sections as $section_key => $section_values) {
+				$group_key = apply_filters('lsx_hp_default_plan_group', __('Daily Plan', 'lsx-health-plan'));
+				if (isset($section_values['group']) && '' !== $section_values['group']) {
 					$group_key = $section_values['group'];
 				}
-				$group_key                            = sanitize_title( $group_key );
-				$groups[ $group_key ][ $section_key ] = $section_values;
+				$group_key                            = sanitize_title($group_key);
+				$groups[$group_key][$section_key] = $section_values;
 			}
 		}
 		return $groups;

Indentation +85 added lines, -85 removed lines

@@ -8,98 +8,98 @@
  */
 class Plan_Query {
 
-	/**
-	 * Holds class instance
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var      object \lsx_health_plan\classes\frontend\Plan_Query()
-	 */
-	protected static $instance = null;
+     /**
+      * Holds class instance
+      *
+      * @since 1.0.0
+      *
+      * @var      object \lsx_health_plan\classes\frontend\Plan_Query()
+      */
+     protected static $instance = null;
 
-	/**
-	 * Holds the sections for the current plan.
-	 *
-	 * @var array
-	 */
-	public $sections = array();
+     /**
+      * Holds the sections for the current plan.
+      *
+      * @var array
+      */
+     public $sections = array();
 
-	/**
-	 * Holds the variable true/false if the current plan has sections or not.
-	 *
-	 * @var array
-	 */
-	public $has_sections = false;
+     /**
+      * Holds the variable true/false if the current plan has sections or not.
+      *
+      * @var array
+      */
+     public $has_sections = false;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-	}
+     /**
+      * Constructor
+      */
+     public function __construct() {
+     }
 
-	/**
-	 * Return an instance of this class.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return    object \lsx_health_plan\classes\frontend\Plan_Query()    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\frontend\Plan_Query()    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;
+     }
 
-	/**
-	 * Undocumented function
-	 *
-	 * @return void
-	 */
-	public function query_sections( $plan_id = '' ) {
-		if ( '' === $plan_id ) {
-			$plan_id = get_the_ID();
-		}
+     /**
+      * Undocumented function
+      *
+      * @return void
+      */
+     public function query_sections( $plan_id = '' ) {
+          if ( '' === $plan_id ) {
+               $plan_id = get_the_ID();
+          }
 
-		$section_array = get_post_meta( $plan_id, 'plan_sections', true );
-		if ( ! empty( $section_array ) ) {
-			$this->has_sections = true;
-			$this->sections     = $section_array;
-		}
-		return $this->has_sections;
-	}
+          $section_array = get_post_meta( $plan_id, 'plan_sections', true );
+          if ( ! empty( $section_array ) ) {
+               $this->has_sections = true;
+               $this->sections     = $section_array;
+          }
+          return $this->has_sections;
+     }
 
-	public function get_sections( $group = false ) {
-		$sections = $this->sections;
-		if ( false !== $group ) {
-			$sections = $this->group_sections( $sections );
-		}
-		return $sections;
-	}
+     public function get_sections( $group = false ) {
+          $sections = $this->sections;
+          if ( false !== $group ) {
+               $sections = $this->group_sections( $sections );
+          }
+          return $sections;
+     }
 
-	public function get_section_count() {
-		return count( $this->sections );
-	}
+     public function get_section_count() {
+          return count( $this->sections );
+     }
 
-	/**
-	 * This will group the sections by their "Group" field.
-	 *
-	 * @param  array $sections
-	 * @return array
-	 */
-	public function group_sections( $sections = array() ) {
-		$groups = array();
-		if ( ! empty( $sections ) ) {
-			foreach ( $sections as $section_key => $section_values ) {
-				$group_key = apply_filters( 'lsx_hp_default_plan_group', __( 'Daily Plan', 'lsx-health-plan' ) );
-				if ( isset( $section_values['group'] ) && '' !== $section_values['group'] ) {
-					$group_key = $section_values['group'];
-				}
-				$group_key                            = sanitize_title( $group_key );
-				$groups[ $group_key ][ $section_key ] = $section_values;
-			}
-		}
-		return $groups;
-	}
+     /**
+      * This will group the sections by their "Group" field.
+      *
+      * @param  array $sections
+      * @return array
+      */
+     public function group_sections( $sections = array() ) {
+          $groups = array();
+          if ( ! empty( $sections ) ) {
+               foreach ( $sections as $section_key => $section_values ) {
+                    $group_key = apply_filters( 'lsx_hp_default_plan_group', __( 'Daily Plan', 'lsx-health-plan' ) );
+                    if ( isset( $section_values['group'] ) && '' !== $section_values['group'] ) {
+                         $group_key = $section_values['group'];
+                    }
+                    $group_key                            = sanitize_title( $group_key );
+                    $groups[ $group_key ][ $section_key ] = $section_values;
+               }
+          }
+          return $groups;
+     }
 }