lightspeeddevelopment / lsx-projects

templates/content-single-projects.php

Indentation +261 added lines, -261 removed lines

@@ -5,230 +5,230 @@ 
 ?>
 
 <?php
-	$client = get_post_meta( get_the_ID(), 'lsx_project_client', true );
-	$client_logo = get_post_meta( get_the_ID(), 'lsx_project_client_logo', true );
-	$url = get_post_meta( get_the_ID(), 'lsx_project_url', true );
-
-	global $lsx_projects;
-
-	$button_label = '';
-	$button_cf_id = '';
-
-	if ( ! empty( projects_get_option( 'projects_modal_enable' ) ) ) {
-		if ( ! empty( projects_get_option( 'projects_modal_cta_label' ) ) && ! empty( projects_get_option( 'projects_modal_form_id' ) ) ) {
-			$button_label = projects_get_option( 'projects_modal_cta_label' );
-			$button_cf_id = projects_get_option( 'projects_modal_form_id' );
-		}
-	}
-
-	if ( ! empty( $client_logo ) ) {
-		$client_logo = '<img src="' . $client_logo . '">';
-	}
-
-	$groups = '';
-	$terms  = get_the_terms( get_the_ID(), 'project-group' );
-
-	if ( $terms && ! is_wp_error( $terms ) ) {
-		$groups = array();
-
-		foreach ( $terms as $term ) {
-			$groups[] = '<a href="' . get_term_link( $term ) . '">' . $term->name . '</a>';
-		}
-
-		$groups = join( ', ', $groups );
-	}
-
-	$product_groups = '';
-	$product_terms = get_post_meta( get_the_ID(), 'lsx_project__alt_products', false );
-
-	if ( $product_terms && ! is_wp_error( $product_terms ) ) {
-		$product_groups = array();
-		foreach ( $product_terms[0] as $product_term ) {
-			$product_groups[] = '<a href="' . $product_term['lsx_project_alt_product_link'] . '">' . $product_term['lsx_project_alt_product_title'] . '</a>';
-		}
-
-		$product_groups = join( ', ', $product_groups );
-	}
-
-
-	// Connections
-
-	$connections = array();
-
-	// Connection Projects
-
-	if ( $terms && ! is_wp_error( $terms ) ) {
-		$groups_ = array();
-
-		foreach ( $terms as $term ) {
-			$groups_[] = $term->term_id;
-		}
-
-		if ( count( $groups_ ) > 0 ) {
-			$connection_project['post_type'] = 'project';
-			$connection_project['title'] = esc_html__( 'Related Projects', 'lsx-projects' );
-			//$connection_project['posts'] = get_post_meta( get_the_ID(), 'project_to_project', false );
-			$connection_project['posts'] = array();
-
-			$args = array(
-				'post_type'              => 'project',
-				'post__not_in'           => array( get_the_ID() ),
-				'no_found_rows'          => true,
-				'ignore_sticky_posts'    => 1,
-				'update_post_meta_cache' => false,
-				'tax_query' => array(
-					array(
-						'taxonomy' => 'project-group',
-						'terms'    => $groups_,
-					),
-				),
-			);
-
-			$projects_ = new \WP_Query( $args );
-
-			if ( $projects_->have_posts() ) {
-				while ( $projects_->have_posts() ) {
-					$projects_->the_post();
-					$connection_project['posts'][] = get_the_ID();
-					wp_reset_postdata();
-				}
-			}
-
-			if ( ! empty( $connection_project['posts'] ) ) {
-				$post_ids = join( ',', $connection_project['posts'] );
-				$connection_project['shortcode'] = '[lsx_projects columns="3" include="' . $post_ids . '"]';
-				$connections[] = $connection_project;
-			}
-		}
-	}
-
-	// Connection Products
-
-	if ( class_exists( 'WooCommerce' ) ) {
-		$connection_product['post_type'] = 'product';
-		$connection_product['title'] = esc_html__( 'Related Products', 'lsx-projects' ) . ' <small>' . esc_html__( 'Products used to build this project', 'lsx-projects' ) . '</small>';
-		$connection_product['posts'] = get_post_meta( get_the_ID(), 'product_to_project', false );
-
-		if ( ! empty( $connection_product['posts'] ) ) {
-			$connection_product['small_list_html'] = '';
-
-			$args = array(
-				'post_type'              => 'product',
-				'post__in'               => $connection_product['posts'][0],
-				'orderby'                => 'post__in',
-				'no_found_rows'          => true,
-				'ignore_sticky_posts'    => 1,
-				'update_post_term_cache' => false,
-				'update_post_meta_cache' => false,
-			);
-
-			$connection_product['posts_obj'] = new \WP_Query( $args );
-
-			if ( $connection_product['posts_obj']->have_posts() ) {
-				$connection_product['small_list_html'] = array();
-
-				while ( $connection_product['posts_obj']->have_posts() ) {
-					$connection_product['posts_obj']->the_post();
-					$connection_product['small_list_html'][] = '<a href="' . get_permalink() . '">' . the_title( '', '', false ) . '</a>';
-					wp_reset_postdata();
-				}
-
-				$connection_product['posts_obj']->rewind_posts();
-				$connection_product['small_list_html'] = join( ', ', $connection_product['small_list_html'] );
-			}
-
-			$connections[] = $connection_product;
-		}
-	}
-
-	// Connection Services
-
-	$connection_service['post_type'] = 'page';
-	// $connection_service['title'] = esc_html__( 'Services', 'lsx-projects' );
-	$connection_service['pages'] = get_post_meta( get_the_ID(), 'page_to_project', false );
-
-	if ( ! empty( $connection_service['pages'] ) ) {
-		$post_ids = join( ',', $connection_service['pages'] );
-		//$connection_service['shortcode'] = '[lsx_services columns="3" include="' . $post_ids . '"]';
-		$connection_service['small_list_html'] = '';
-
-		$args = array(
-			'post_type'              => 'page',
-			'post__in'               => $connection_service['pages'],
-			'orderby'                => 'post__in',
-			'no_found_rows'          => true,
-			'ignore_sticky_posts'    => 1,
-			'update_post_term_cache' => false,
-			'update_post_meta_cache' => false,
-		);
-
-		$services_ = new \WP_Query( $args );
-
-		if ( $services_->have_posts() ) {
-			$connection_service['small_list_html'] = array();
-
-			while ( $services_->have_posts() ) {
-				$services_->the_post();
-				$connection_service['small_list_html'][] = '<a href="' . get_permalink() . '">' . the_title( '', '', false ) . '</a>';
-				wp_reset_postdata();
-			}
-
-			$connection_service['small_list_html'] = join( ', ', $connection_service['small_list_html'] );
-		}
-
-		$connections[] = $connection_service;
-	}
-
-	// Connection Testimonials
-
-	$connection_testimonial['post_type'] = 'testimonial';
-	// $connection_testimonial['title'] = esc_html__( 'Testimonials', 'lsx-projects' );
-	$connection_testimonial['posts'] = get_post_meta( get_the_ID(), 'testimonial_to_project', false );
-
-	if ( ! empty( $connection_testimonial['posts'] ) ) {
-		$post_ids = join( ',', $connection_testimonial['posts'][0] );
-		$connection_testimonial['shortcode'] = '[lsx_testimonials columns="1" include="' . $post_ids . '" orderby="date" order="DESC"]';
-		$connections[] = $connection_testimonial;
-	}
-
-	// Connection Team
-
-	$connection_team['post_type'] = 'team';
-	// $connection_team['title'] = esc_html__( 'Team', 'lsx-projects' );
-	$connection_team['posts'] = get_post_meta( get_the_ID(), 'team_to_project', false );
-
-	if ( ! empty( $connection_team['posts'] ) ) {
-		$post_ids = join( ',', $connection_team['posts'][0] );
-		$connection_team['shortcode'] = '[lsx_team columns="4" include="' . $post_ids . '" show_social="false" show_desc="false" show_link="true"]';
-		$connection_team['small_list_html'] = '';
-
-		$args = array(
-			'post_type'              => 'team',
-			'post__in'               => $connection_team['posts'][0],
-			'orderby'                => 'post__in',
-			'no_found_rows'          => true,
-			'ignore_sticky_posts'    => 1,
-			'update_post_term_cache' => false,
-			'update_post_meta_cache' => false,
-		);
-
-		$team_ = new \WP_Query( $args );
-
-		if ( $team_->have_posts() ) {
-			global $lsx_team;
-			$connection_team['small_list_html'] = array();
-
-			while ( $team_->have_posts() ) {
-				$team_->the_post();
-				$connection_team['small_list_html'][] = '<a href="' . get_permalink() . '">' . $lsx_team->get_thumbnail( get_the_ID(), 'lsx-team-archive' ) . '</a>';
-				wp_reset_postdata();
-			}
-
-			$connection_team['small_list_html'] = join( ' ', $connection_team['small_list_html'] );
-		}
-
-		$connections[] = $connection_team;
-	}
+     $client = get_post_meta( get_the_ID(), 'lsx_project_client', true );
+     $client_logo = get_post_meta( get_the_ID(), 'lsx_project_client_logo', true );
+     $url = get_post_meta( get_the_ID(), 'lsx_project_url', true );
+
+     global $lsx_projects;
+
+     $button_label = '';
+     $button_cf_id = '';
+
+     if ( ! empty( projects_get_option( 'projects_modal_enable' ) ) ) {
+          if ( ! empty( projects_get_option( 'projects_modal_cta_label' ) ) && ! empty( projects_get_option( 'projects_modal_form_id' ) ) ) {
+               $button_label = projects_get_option( 'projects_modal_cta_label' );
+               $button_cf_id = projects_get_option( 'projects_modal_form_id' );
+          }
+     }
+
+     if ( ! empty( $client_logo ) ) {
+          $client_logo = '<img src="' . $client_logo . '">';
+     }
+
+     $groups = '';
+     $terms  = get_the_terms( get_the_ID(), 'project-group' );
+
+     if ( $terms && ! is_wp_error( $terms ) ) {
+          $groups = array();
+
+          foreach ( $terms as $term ) {
+               $groups[] = '<a href="' . get_term_link( $term ) . '">' . $term->name . '</a>';
+          }
+
+          $groups = join( ', ', $groups );
+     }
+
+     $product_groups = '';
+     $product_terms = get_post_meta( get_the_ID(), 'lsx_project__alt_products', false );
+
+     if ( $product_terms && ! is_wp_error( $product_terms ) ) {
+          $product_groups = array();
+          foreach ( $product_terms[0] as $product_term ) {
+               $product_groups[] = '<a href="' . $product_term['lsx_project_alt_product_link'] . '">' . $product_term['lsx_project_alt_product_title'] . '</a>';
+          }
+
+          $product_groups = join( ', ', $product_groups );
+     }
+
+
+     // Connections
+
+     $connections = array();
+
+     // Connection Projects
+
+     if ( $terms && ! is_wp_error( $terms ) ) {
+          $groups_ = array();
+
+          foreach ( $terms as $term ) {
+               $groups_[] = $term->term_id;
+          }
+
+          if ( count( $groups_ ) > 0 ) {
+               $connection_project['post_type'] = 'project';
+               $connection_project['title'] = esc_html__( 'Related Projects', 'lsx-projects' );
+               //$connection_project['posts'] = get_post_meta( get_the_ID(), 'project_to_project', false );
+               $connection_project['posts'] = array();
+
+               $args = array(
+                    'post_type'              => 'project',
+                    'post__not_in'           => array( get_the_ID() ),
+                    'no_found_rows'          => true,
+                    'ignore_sticky_posts'    => 1,
+                    'update_post_meta_cache' => false,
+                    'tax_query' => array(
+                         array(
+                              'taxonomy' => 'project-group',
+                              'terms'    => $groups_,
+                         ),
+                    ),
+               );
+
+               $projects_ = new \WP_Query( $args );
+
+               if ( $projects_->have_posts() ) {
+                    while ( $projects_->have_posts() ) {
+                         $projects_->the_post();
+                         $connection_project['posts'][] = get_the_ID();
+                         wp_reset_postdata();
+                    }
+               }
+
+               if ( ! empty( $connection_project['posts'] ) ) {
+                    $post_ids = join( ',', $connection_project['posts'] );
+                    $connection_project['shortcode'] = '[lsx_projects columns="3" include="' . $post_ids . '"]';
+                    $connections[] = $connection_project;
+               }
+          }
+     }
+
+     // Connection Products
+
+     if ( class_exists( 'WooCommerce' ) ) {
+          $connection_product['post_type'] = 'product';
+          $connection_product['title'] = esc_html__( 'Related Products', 'lsx-projects' ) . ' <small>' . esc_html__( 'Products used to build this project', 'lsx-projects' ) . '</small>';
+          $connection_product['posts'] = get_post_meta( get_the_ID(), 'product_to_project', false );
+
+          if ( ! empty( $connection_product['posts'] ) ) {
+               $connection_product['small_list_html'] = '';
+
+               $args = array(
+                    'post_type'              => 'product',
+                    'post__in'               => $connection_product['posts'][0],
+                    'orderby'                => 'post__in',
+                    'no_found_rows'          => true,
+                    'ignore_sticky_posts'    => 1,
+                    'update_post_term_cache' => false,
+                    'update_post_meta_cache' => false,
+               );
+
+               $connection_product['posts_obj'] = new \WP_Query( $args );
+
+               if ( $connection_product['posts_obj']->have_posts() ) {
+                    $connection_product['small_list_html'] = array();
+
+                    while ( $connection_product['posts_obj']->have_posts() ) {
+                         $connection_product['posts_obj']->the_post();
+                         $connection_product['small_list_html'][] = '<a href="' . get_permalink() . '">' . the_title( '', '', false ) . '</a>';
+                         wp_reset_postdata();
+                    }
+
+                    $connection_product['posts_obj']->rewind_posts();
+                    $connection_product['small_list_html'] = join( ', ', $connection_product['small_list_html'] );
+               }
+
+               $connections[] = $connection_product;
+          }
+     }
+
+     // Connection Services
+
+     $connection_service['post_type'] = 'page';
+     // $connection_service['title'] = esc_html__( 'Services', 'lsx-projects' );
+     $connection_service['pages'] = get_post_meta( get_the_ID(), 'page_to_project', false );
+
+     if ( ! empty( $connection_service['pages'] ) ) {
+          $post_ids = join( ',', $connection_service['pages'] );
+          //$connection_service['shortcode'] = '[lsx_services columns="3" include="' . $post_ids . '"]';
+          $connection_service['small_list_html'] = '';
+
+          $args = array(
+               'post_type'              => 'page',
+               'post__in'               => $connection_service['pages'],
+               'orderby'                => 'post__in',
+               'no_found_rows'          => true,
+               'ignore_sticky_posts'    => 1,
+               'update_post_term_cache' => false,
+               'update_post_meta_cache' => false,
+          );
+
+          $services_ = new \WP_Query( $args );
+
+          if ( $services_->have_posts() ) {
+               $connection_service['small_list_html'] = array();
+
+               while ( $services_->have_posts() ) {
+                    $services_->the_post();
+                    $connection_service['small_list_html'][] = '<a href="' . get_permalink() . '">' . the_title( '', '', false ) . '</a>';
+                    wp_reset_postdata();
+               }
+
+               $connection_service['small_list_html'] = join( ', ', $connection_service['small_list_html'] );
+          }
+
+          $connections[] = $connection_service;
+     }
+
+     // Connection Testimonials
+
+     $connection_testimonial['post_type'] = 'testimonial';
+     // $connection_testimonial['title'] = esc_html__( 'Testimonials', 'lsx-projects' );
+     $connection_testimonial['posts'] = get_post_meta( get_the_ID(), 'testimonial_to_project', false );
+
+     if ( ! empty( $connection_testimonial['posts'] ) ) {
+          $post_ids = join( ',', $connection_testimonial['posts'][0] );
+          $connection_testimonial['shortcode'] = '[lsx_testimonials columns="1" include="' . $post_ids . '" orderby="date" order="DESC"]';
+          $connections[] = $connection_testimonial;
+     }
+
+     // Connection Team
+
+     $connection_team['post_type'] = 'team';
+     // $connection_team['title'] = esc_html__( 'Team', 'lsx-projects' );
+     $connection_team['posts'] = get_post_meta( get_the_ID(), 'team_to_project', false );
+
+     if ( ! empty( $connection_team['posts'] ) ) {
+          $post_ids = join( ',', $connection_team['posts'][0] );
+          $connection_team['shortcode'] = '[lsx_team columns="4" include="' . $post_ids . '" show_social="false" show_desc="false" show_link="true"]';
+          $connection_team['small_list_html'] = '';
+
+          $args = array(
+               'post_type'              => 'team',
+               'post__in'               => $connection_team['posts'][0],
+               'orderby'                => 'post__in',
+               'no_found_rows'          => true,
+               'ignore_sticky_posts'    => 1,
+               'update_post_term_cache' => false,
+               'update_post_meta_cache' => false,
+          );
+
+          $team_ = new \WP_Query( $args );
+
+          if ( $team_->have_posts() ) {
+               global $lsx_team;
+               $connection_team['small_list_html'] = array();
+
+               while ( $team_->have_posts() ) {
+                    $team_->the_post();
+                    $connection_team['small_list_html'][] = '<a href="' . get_permalink() . '">' . $lsx_team->get_thumbnail( get_the_ID(), 'lsx-team-archive' ) . '</a>';
+                    wp_reset_postdata();
+               }
+
+               $connection_team['small_list_html'] = join( ' ', $connection_team['small_list_html'] );
+          }
+
+          $connections[] = $connection_team;
+     }
 ?>
 
 <?php lsx_entry_before(); ?>
@@ -244,12 +244,12 @@ 
 			<?php if ( count( $connections ) > 0 ) : ?>
 				<?php foreach ( $connections as $i => $connection ) : ?>
 					<?php
-						if ( 'testimonial' === $connection['post_type'] ) {
-							echo '<div class="tab-pane-fake">';
-							echo do_shortcode( $connection['shortcode'] );
-							echo '</div>';
-						}
-					?>
+                              if ( 'testimonial' === $connection['post_type'] ) {
+                                   echo '<div class="tab-pane-fake">';
+                                   echo do_shortcode( $connection['shortcode'] );
+                                   echo '</div>';
+                              }
+                         ?>
 				<?php endforeach; ?>
 			<?php endif; ?>
 		</div>
@@ -305,13 +305,13 @@ 
 	<?php if ( count( $connections ) > 0 ) : ?>
 		<?php foreach ( $connections as $i => $connection ) : ?>
 			<?php
-				// Team is now visible on detail box
-				// Services is now visible on detail box
-				// Testimonials is now visible below the content
-				if ( in_array( $connection['post_type'], array( 'team', 'testimonial', 'service' ) ) ) {
-					continue;
-				}
-			?>
+                    // Team is now visible on detail box
+                    // Services is now visible on detail box
+                    // Testimonials is now visible below the content
+                    if ( in_array( $connection['post_type'], array( 'team', 'testimonial', 'service' ) ) ) {
+                         continue;
+                    }
+               ?>
 			<?php if ( 'page' !== $connection['post_type'] ) { ?>
 				<div class="lsx-projects-section lsx-full-width">
 					<div class="row">
@@ -319,34 +319,34 @@ 
 							<h3 class="lsx-title"><?php echo wp_kses_post( $connection['title'] ); ?></h3>
 
 							<?php
-								if ( 'product' === $connection['post_type'] ) {
-
-									if ( $connection_product['posts_obj']->have_posts() ) {
-										// @codingStandardsIgnoreLine
-										echo apply_filters( 'woocommerce_before_widget_product_list', '<ul class="product_list_widget">' );
-
-										while ( $connection_product['posts_obj']->have_posts() ) {
-											$connection_product['posts_obj']->the_post();
-											wc_get_template( 'content-widget-product.php', array(
-												'show_rating' => false,
-											) );
-
-											wp_reset_postdata();
-										}
-
-										// @codingStandardsIgnoreLine
-										echo apply_filters( 'woocommerce_after_widget_product_list', '</ul>' );
-									}
-								} else {
-									echo do_shortcode( $connection['shortcode'] );
-								}
-							?>
+                                        if ( 'product' === $connection['post_type'] ) {
+
+                                             if ( $connection_product['posts_obj']->have_posts() ) {
+                                                  // @codingStandardsIgnoreLine
+                                                  echo apply_filters( 'woocommerce_before_widget_product_list', '<ul class="product_list_widget">' );
+
+                                                  while ( $connection_product['posts_obj']->have_posts() ) {
+                                                       $connection_product['posts_obj']->the_post();
+                                                       wc_get_template( 'content-widget-product.php', array(
+                                                            'show_rating' => false,
+                                                       ) );
+
+                                                       wp_reset_postdata();
+                                                  }
+
+                                                  // @codingStandardsIgnoreLine
+                                                  echo apply_filters( 'woocommerce_after_widget_product_list', '</ul>' );
+                                             }
+                                        } else {
+                                             echo do_shortcode( $connection['shortcode'] );
+                                        }
+                                   ?>
 						</div>
 					</div>
 				</div>
 			<?php
-			}
-		?>
+               }
+          ?>
 		<?php endforeach; ?>
 	<?php endif; ?>
 

Spacing +95 added lines, -95 removed lines

@@ -5,49 +5,49 @@ 
 ?>
 
 <?php
-	$client = get_post_meta( get_the_ID(), 'lsx_project_client', true );
-	$client_logo = get_post_meta( get_the_ID(), 'lsx_project_client_logo', true );
-	$url = get_post_meta( get_the_ID(), 'lsx_project_url', true );
+	$client = get_post_meta(get_the_ID(), 'lsx_project_client', true);
+	$client_logo = get_post_meta(get_the_ID(), 'lsx_project_client_logo', true);
+	$url = get_post_meta(get_the_ID(), 'lsx_project_url', true);
 
 	global $lsx_projects;
 
 	$button_label = '';
 	$button_cf_id = '';
 
-	if ( ! empty( projects_get_option( 'projects_modal_enable' ) ) ) {
-		if ( ! empty( projects_get_option( 'projects_modal_cta_label' ) ) && ! empty( projects_get_option( 'projects_modal_form_id' ) ) ) {
-			$button_label = projects_get_option( 'projects_modal_cta_label' );
-			$button_cf_id = projects_get_option( 'projects_modal_form_id' );
+	if ( ! empty(projects_get_option('projects_modal_enable'))) {
+		if ( ! empty(projects_get_option('projects_modal_cta_label')) && ! empty(projects_get_option('projects_modal_form_id'))) {
+			$button_label = projects_get_option('projects_modal_cta_label');
+			$button_cf_id = projects_get_option('projects_modal_form_id');
 		}
 	}
 
-	if ( ! empty( $client_logo ) ) {
+	if ( ! empty($client_logo)) {
 		$client_logo = '<img src="' . $client_logo . '">';
 	}
 
 	$groups = '';
-	$terms  = get_the_terms( get_the_ID(), 'project-group' );
+	$terms  = get_the_terms(get_the_ID(), 'project-group');
 
-	if ( $terms && ! is_wp_error( $terms ) ) {
+	if ($terms && ! is_wp_error($terms)) {
 		$groups = array();
 
-		foreach ( $terms as $term ) {
-			$groups[] = '<a href="' . get_term_link( $term ) . '">' . $term->name . '</a>';
+		foreach ($terms as $term) {
+			$groups[] = '<a href="' . get_term_link($term) . '">' . $term->name . '</a>';
 		}
 
-		$groups = join( ', ', $groups );
+		$groups = join(', ', $groups);
 	}
 
 	$product_groups = '';
-	$product_terms = get_post_meta( get_the_ID(), 'lsx_project__alt_products', false );
+	$product_terms = get_post_meta(get_the_ID(), 'lsx_project__alt_products', false);
 
-	if ( $product_terms && ! is_wp_error( $product_terms ) ) {
+	if ($product_terms && ! is_wp_error($product_terms)) {
 		$product_groups = array();
-		foreach ( $product_terms[0] as $product_term ) {
+		foreach ($product_terms[0] as $product_term) {
 			$product_groups[] = '<a href="' . $product_term['lsx_project_alt_product_link'] . '">' . $product_term['lsx_project_alt_product_title'] . '</a>';
 		}
 
-		$product_groups = join( ', ', $product_groups );
+		$product_groups = join(', ', $product_groups);
 	}
 
 
@@ -57,22 +57,22 @@ 
 
 	// Connection Projects
 
-	if ( $terms && ! is_wp_error( $terms ) ) {
+	if ($terms && ! is_wp_error($terms)) {
 		$groups_ = array();
 
-		foreach ( $terms as $term ) {
+		foreach ($terms as $term) {
 			$groups_[] = $term->term_id;
 		}
 
-		if ( count( $groups_ ) > 0 ) {
+		if (count($groups_) > 0) {
 			$connection_project['post_type'] = 'project';
-			$connection_project['title'] = esc_html__( 'Related Projects', 'lsx-projects' );
+			$connection_project['title'] = esc_html__('Related Projects', 'lsx-projects');
 			//$connection_project['posts'] = get_post_meta( get_the_ID(), 'project_to_project', false );
 			$connection_project['posts'] = array();
 
 			$args = array(
 				'post_type'              => 'project',
-				'post__not_in'           => array( get_the_ID() ),
+				'post__not_in'           => array(get_the_ID()),
 				'no_found_rows'          => true,
 				'ignore_sticky_posts'    => 1,
 				'update_post_meta_cache' => false,
@@ -84,18 +84,18 @@ 
 				),
 			);
 
-			$projects_ = new \WP_Query( $args );
+			$projects_ = new \WP_Query($args);
 
-			if ( $projects_->have_posts() ) {
-				while ( $projects_->have_posts() ) {
+			if ($projects_->have_posts()) {
+				while ($projects_->have_posts()) {
 					$projects_->the_post();
 					$connection_project['posts'][] = get_the_ID();
 					wp_reset_postdata();
 				}
 			}
 
-			if ( ! empty( $connection_project['posts'] ) ) {
-				$post_ids = join( ',', $connection_project['posts'] );
+			if ( ! empty($connection_project['posts'])) {
+				$post_ids = join(',', $connection_project['posts']);
 				$connection_project['shortcode'] = '[lsx_projects columns="3" include="' . $post_ids . '"]';
 				$connections[] = $connection_project;
 			}
@@ -104,12 +104,12 @@ 
 
 	// Connection Products
 
-	if ( class_exists( 'WooCommerce' ) ) {
+	if (class_exists('WooCommerce')) {
 		$connection_product['post_type'] = 'product';
-		$connection_product['title'] = esc_html__( 'Related Products', 'lsx-projects' ) . ' <small>' . esc_html__( 'Products used to build this project', 'lsx-projects' ) . '</small>';
-		$connection_product['posts'] = get_post_meta( get_the_ID(), 'product_to_project', false );
+		$connection_product['title'] = esc_html__('Related Products', 'lsx-projects') . ' <small>' . esc_html__('Products used to build this project', 'lsx-projects') . '</small>';
+		$connection_product['posts'] = get_post_meta(get_the_ID(), 'product_to_project', false);
 
-		if ( ! empty( $connection_product['posts'] ) ) {
+		if ( ! empty($connection_product['posts'])) {
 			$connection_product['small_list_html'] = '';
 
 			$args = array(
@@ -122,19 +122,19 @@ 
 				'update_post_meta_cache' => false,
 			);
 
-			$connection_product['posts_obj'] = new \WP_Query( $args );
+			$connection_product['posts_obj'] = new \WP_Query($args);
 
-			if ( $connection_product['posts_obj']->have_posts() ) {
+			if ($connection_product['posts_obj']->have_posts()) {
 				$connection_product['small_list_html'] = array();
 
-				while ( $connection_product['posts_obj']->have_posts() ) {
+				while ($connection_product['posts_obj']->have_posts()) {
 					$connection_product['posts_obj']->the_post();
-					$connection_product['small_list_html'][] = '<a href="' . get_permalink() . '">' . the_title( '', '', false ) . '</a>';
+					$connection_product['small_list_html'][] = '<a href="' . get_permalink() . '">' . the_title('', '', false) . '</a>';
 					wp_reset_postdata();
 				}
 
 				$connection_product['posts_obj']->rewind_posts();
-				$connection_product['small_list_html'] = join( ', ', $connection_product['small_list_html'] );
+				$connection_product['small_list_html'] = join(', ', $connection_product['small_list_html']);
 			}
 
 			$connections[] = $connection_product;
@@ -145,10 +145,10 @@ 
 
 	$connection_service['post_type'] = 'page';
 	// $connection_service['title'] = esc_html__( 'Services', 'lsx-projects' );
-	$connection_service['pages'] = get_post_meta( get_the_ID(), 'page_to_project', false );
+	$connection_service['pages'] = get_post_meta(get_the_ID(), 'page_to_project', false);
 
-	if ( ! empty( $connection_service['pages'] ) ) {
-		$post_ids = join( ',', $connection_service['pages'] );
+	if ( ! empty($connection_service['pages'])) {
+		$post_ids = join(',', $connection_service['pages']);
 		//$connection_service['shortcode'] = '[lsx_services columns="3" include="' . $post_ids . '"]';
 		$connection_service['small_list_html'] = '';
 
@@ -162,18 +162,18 @@ 
 			'update_post_meta_cache' => false,
 		);
 
-		$services_ = new \WP_Query( $args );
+		$services_ = new \WP_Query($args);
 
-		if ( $services_->have_posts() ) {
+		if ($services_->have_posts()) {
 			$connection_service['small_list_html'] = array();
 
-			while ( $services_->have_posts() ) {
+			while ($services_->have_posts()) {
 				$services_->the_post();
-				$connection_service['small_list_html'][] = '<a href="' . get_permalink() . '">' . the_title( '', '', false ) . '</a>';
+				$connection_service['small_list_html'][] = '<a href="' . get_permalink() . '">' . the_title('', '', false) . '</a>';
 				wp_reset_postdata();
 			}
 
-			$connection_service['small_list_html'] = join( ', ', $connection_service['small_list_html'] );
+			$connection_service['small_list_html'] = join(', ', $connection_service['small_list_html']);
 		}
 
 		$connections[] = $connection_service;
@@ -183,10 +183,10 @@ 
 
 	$connection_testimonial['post_type'] = 'testimonial';
 	// $connection_testimonial['title'] = esc_html__( 'Testimonials', 'lsx-projects' );
-	$connection_testimonial['posts'] = get_post_meta( get_the_ID(), 'testimonial_to_project', false );
+	$connection_testimonial['posts'] = get_post_meta(get_the_ID(), 'testimonial_to_project', false);
 
-	if ( ! empty( $connection_testimonial['posts'] ) ) {
-		$post_ids = join( ',', $connection_testimonial['posts'][0] );
+	if ( ! empty($connection_testimonial['posts'])) {
+		$post_ids = join(',', $connection_testimonial['posts'][0]);
 		$connection_testimonial['shortcode'] = '[lsx_testimonials columns="1" include="' . $post_ids . '" orderby="date" order="DESC"]';
 		$connections[] = $connection_testimonial;
 	}
@@ -195,10 +195,10 @@ 
 
 	$connection_team['post_type'] = 'team';
 	// $connection_team['title'] = esc_html__( 'Team', 'lsx-projects' );
-	$connection_team['posts'] = get_post_meta( get_the_ID(), 'team_to_project', false );
+	$connection_team['posts'] = get_post_meta(get_the_ID(), 'team_to_project', false);
 
-	if ( ! empty( $connection_team['posts'] ) ) {
-		$post_ids = join( ',', $connection_team['posts'][0] );
+	if ( ! empty($connection_team['posts'])) {
+		$post_ids = join(',', $connection_team['posts'][0]);
 		$connection_team['shortcode'] = '[lsx_team columns="4" include="' . $post_ids . '" show_social="false" show_desc="false" show_link="true"]';
 		$connection_team['small_list_html'] = '';
 
@@ -212,19 +212,19 @@ 
 			'update_post_meta_cache' => false,
 		);
 
-		$team_ = new \WP_Query( $args );
+		$team_ = new \WP_Query($args);
 
-		if ( $team_->have_posts() ) {
+		if ($team_->have_posts()) {
 			global $lsx_team;
 			$connection_team['small_list_html'] = array();
 
-			while ( $team_->have_posts() ) {
+			while ($team_->have_posts()) {
 				$team_->the_post();
-				$connection_team['small_list_html'][] = '<a href="' . get_permalink() . '">' . $lsx_team->get_thumbnail( get_the_ID(), 'lsx-team-archive' ) . '</a>';
+				$connection_team['small_list_html'][] = '<a href="' . get_permalink() . '">' . $lsx_team->get_thumbnail(get_the_ID(), 'lsx-team-archive') . '</a>';
 				wp_reset_postdata();
 			}
 
-			$connection_team['small_list_html'] = join( ' ', $connection_team['small_list_html'] );
+			$connection_team['small_list_html'] = join(' ', $connection_team['small_list_html']);
 		}
 
 		$connections[] = $connection_team;
@@ -241,12 +241,12 @@ 
 		<div class="col-xs-12 col-sm-7 col-md-8">
 			<div class="entry-content"><?php the_content(); ?></div>
 
-			<?php if ( count( $connections ) > 0 ) : ?>
-				<?php foreach ( $connections as $i => $connection ) : ?>
+			<?php if (count($connections) > 0) : ?>
+				<?php foreach ($connections as $i => $connection) : ?>
 					<?php
-						if ( 'testimonial' === $connection['post_type'] ) {
+						if ('testimonial' === $connection['post_type']) {
 							echo '<div class="tab-pane-fake">';
-							echo do_shortcode( $connection['shortcode'] );
+							echo do_shortcode($connection['shortcode']);
 							echo '</div>';
 						}
 					?>
@@ -257,88 +257,88 @@ 
 		<div class="col-xs-12 col-sm-5 col-md-4">
 			<div class="entry-fixed-sidebar-wrapper">
 				<div class="entry-fixed-sidebar">
-					<?php if ( ! empty( $client_logo ) ) : ?>
-						<div class="entry-meta-single"><?php echo wp_kses_post( $client_logo ); ?></div>
-					<?php elseif ( ! empty( $client ) ) : ?>
-						<div class="entry-meta-single"><?php echo esc_html( $client ); ?></div>
+					<?php if ( ! empty($client_logo)) : ?>
+						<div class="entry-meta-single"><?php echo wp_kses_post($client_logo); ?></div>
+					<?php elseif ( ! empty($client)) : ?>
+						<div class="entry-meta-single"><?php echo esc_html($client); ?></div>
 					<?php endif; ?>
 
-					<?php if ( ! empty( $groups ) ) : ?>
-						<div class="entry-meta-key"><?php esc_html_e( 'Industry:', 'lsx-projects' ); ?></div>
-						<div class="entry-meta-value"><?php echo wp_kses_post( $groups ); ?></div>
+					<?php if ( ! empty($groups)) : ?>
+						<div class="entry-meta-key"><?php esc_html_e('Industry:', 'lsx-projects'); ?></div>
+						<div class="entry-meta-value"><?php echo wp_kses_post($groups); ?></div>
 					<?php endif; ?>
 
-					<?php if ( ! empty( $product_groups ) ) : ?>
-						<div class="entry-meta-key"><?php esc_html_e( 'Products:', 'lsx-projects' ); ?></div>
-						<div class="entry-meta-value"><?php echo wp_kses_post( $product_groups ); ?></div>
+					<?php if ( ! empty($product_groups)) : ?>
+						<div class="entry-meta-key"><?php esc_html_e('Products:', 'lsx-projects'); ?></div>
+						<div class="entry-meta-value"><?php echo wp_kses_post($product_groups); ?></div>
 					<?php endif; ?>
 
-					<?php if ( ! empty( $connection_service['small_list_html'] ) ) : ?>
-						<div class="entry-meta-key"><?php esc_html_e( 'Services:', 'lsx-projects' ); ?></div>
-						<div class="entry-meta-value"><?php echo wp_kses_post( $connection_service['small_list_html'] ); ?></div>
+					<?php if ( ! empty($connection_service['small_list_html'])) : ?>
+						<div class="entry-meta-key"><?php esc_html_e('Services:', 'lsx-projects'); ?></div>
+						<div class="entry-meta-value"><?php echo wp_kses_post($connection_service['small_list_html']); ?></div>
 					<?php endif; ?>
 
-					<?php if ( ! empty( $connection_product['small_list_html'] ) ) : ?>
+					<?php if ( ! empty($connection_product['small_list_html'])) : ?>
 						<!--
-						<div class="entry-meta-key"><?php esc_html_e( 'Products used:', 'lsx-projects' ); ?></div>
-						<div class="entry-meta-value"><?php echo wp_kses_post( $connection_product['small_list_html'] ); ?></div>
+						<div class="entry-meta-key"><?php esc_html_e('Products used:', 'lsx-projects'); ?></div>
+						<div class="entry-meta-value"><?php echo wp_kses_post($connection_product['small_list_html']); ?></div>
 						-->
 					<?php endif; ?>
 
-					<?php if ( ! empty( $connection_team['small_list_html'] ) ) : ?>
-						<div class="entry-meta-key"><?php esc_html_e( 'Team members involved:', 'lsx-projects' ); ?></div>
-						<div class="entry-meta-value entry-meta-value-team"><?php echo wp_kses_post( $connection_team['small_list_html'] ); ?></div>
+					<?php if ( ! empty($connection_team['small_list_html'])) : ?>
+						<div class="entry-meta-key"><?php esc_html_e('Team members involved:', 'lsx-projects'); ?></div>
+						<div class="entry-meta-value entry-meta-value-team"><?php echo wp_kses_post($connection_team['small_list_html']); ?></div>
 					<?php endif; ?>
 
-					<?php if ( ! empty( $url ) ) : ?>
-						<div class="entry-meta-single"><a href="<?php echo esc_url( $url ); ?>" target="_blank" rel="nofollow" class="btn btn-block secondary-btn"><?php esc_html_e( 'See website', 'lsx-projects' ); ?> <i class="fa fa-angle-right" aria-hidden="true"></i></a></div>
+					<?php if ( ! empty($url)) : ?>
+						<div class="entry-meta-single"><a href="<?php echo esc_url($url); ?>" target="_blank" rel="nofollow" class="btn btn-block secondary-btn"><?php esc_html_e('See website', 'lsx-projects'); ?> <i class="fa fa-angle-right" aria-hidden="true"></i></a></div>
 					<?php endif; ?>
 
-					<?php if ( ! empty( $button_label ) ) : ?>
-						<div class="entry-meta-single"><a href="#lsx-project-contact" data-toggle="modal" class="btn btn-block cta-btn"><?php echo esc_html( $button_label ); ?> <i class="fa fa-angle-right" aria-hidden="true"></i></a></div>
+					<?php if ( ! empty($button_label)) : ?>
+						<div class="entry-meta-single"><a href="#lsx-project-contact" data-toggle="modal" class="btn btn-block cta-btn"><?php echo esc_html($button_label); ?> <i class="fa fa-angle-right" aria-hidden="true"></i></a></div>
 					<?php endif; ?>
 				</div>
 			</div>
 		</div>
 	</div>
 
-	<?php if ( count( $connections ) > 0 ) : ?>
-		<?php foreach ( $connections as $i => $connection ) : ?>
+	<?php if (count($connections) > 0) : ?>
+		<?php foreach ($connections as $i => $connection) : ?>
 			<?php
 				// Team is now visible on detail box
 				// Services is now visible on detail box
 				// Testimonials is now visible below the content
-				if ( in_array( $connection['post_type'], array( 'team', 'testimonial', 'service' ) ) ) {
+				if (in_array($connection['post_type'], array('team', 'testimonial', 'service'))) {
 					continue;
 				}
 			?>
-			<?php if ( 'page' !== $connection['post_type'] ) { ?>
+			<?php if ('page' !== $connection['post_type']) { ?>
 				<div class="lsx-projects-section lsx-full-width">
 					<div class="row">
 						<div class="col-xs-12">
-							<h3 class="lsx-title"><?php echo wp_kses_post( $connection['title'] ); ?></h3>
+							<h3 class="lsx-title"><?php echo wp_kses_post($connection['title']); ?></h3>
 
 							<?php
-								if ( 'product' === $connection['post_type'] ) {
+								if ('product' === $connection['post_type']) {
 
-									if ( $connection_product['posts_obj']->have_posts() ) {
+									if ($connection_product['posts_obj']->have_posts()) {
 										// @codingStandardsIgnoreLine
-										echo apply_filters( 'woocommerce_before_widget_product_list', '<ul class="product_list_widget">' );
+										echo apply_filters('woocommerce_before_widget_product_list', '<ul class="product_list_widget">');
 
-										while ( $connection_product['posts_obj']->have_posts() ) {
+										while ($connection_product['posts_obj']->have_posts()) {
 											$connection_product['posts_obj']->the_post();
-											wc_get_template( 'content-widget-product.php', array(
+											wc_get_template('content-widget-product.php', array(
 												'show_rating' => false,
-											) );
+											));
 
 											wp_reset_postdata();
 										}
 
 										// @codingStandardsIgnoreLine
-										echo apply_filters( 'woocommerce_after_widget_product_list', '</ul>' );
+										echo apply_filters('woocommerce_after_widget_product_list', '</ul>');
 									}
 								} else {
-									echo do_shortcode( $connection['shortcode'] );
+									echo do_shortcode($connection['shortcode']);
 								}
 							?>
 						</div>

classes/class-lsx-projects-admin.php

Indentation +524 added lines, -524 removed lines

@@ -10,530 +10,530 @@
  */
 class LSX_Projects_Admin {
 
-	public function __construct() {
-		$this->load_classes();
-
-		add_action( 'init', array( $this, 'post_type_setup' ) );
-		add_action( 'init', array( $this, 'taxonomy_setup' ) );
-		add_action( 'init', array( $this, 'taxonomy_project_type_setup' ) );
-		add_action( 'init', array( $this, 'taxonomy_project_tag_setup' ) );
-		add_filter( 'cmb2_admin_init', array( $this, 'field_setup' ) );
-		add_filter( 'cmb2_admin_init', array( $this, 'projects_services_metaboxes' ) );
-		add_filter( 'cmb2_admin_init', array( $this, 'projects_testimonials_metaboxes' ) );
-		add_filter( 'cmb2_admin_init', array( $this, 'projects_team_metaboxes' ) );
-		add_filter( 'cmb2_admin_init', array( $this, 'projects_woocommerce_metaboxes' ) );
-		add_filter( 'cmb2_admin_init', array( $this, 'project_field_setup_product' ) );
-		add_action( 'cmb_save_custom', array( $this, 'post_relations' ), 3, 20 );
-		add_action( 'admin_enqueue_scripts', array( $this, 'assets' ) );
-
-		add_filter( 'type_url_form_media', array( $this, 'change_attachment_field_button' ), 20, 1 );
-		add_filter( 'enter_title_here', array( $this, 'change_title_text' ) );
-	}
-
-	/**
-	 * Loads the admin subclasses
-	 */
-	private function load_classes() {
-		require_once LSX_PROJECTS_PATH . 'classes/admin/class-settings.php';
-		$this->settings = \lsx\projects\classes\admin\Settings::get_instance();
-
-		require_once LSX_PROJECTS_PATH . 'classes/admin/class-settings-theme.php';
-		$this->settings_theme = \lsx\projects\classes\admin\Settings_Theme::get_instance();
-	}
-
-	/**
-	 * Register the Project and Product Tag post type
-	 */
-	public function post_type_setup() {
-		$labels = array(
-			'name'               => esc_html_x( 'Projects', 'post type general name', 'lsx-projects' ),
-			'singular_name'      => esc_html_x( 'Project', 'post type singular name', 'lsx-projects' ),
-			'add_new'            => esc_html_x( 'Add New', 'post type general name', 'lsx-projects' ),
-			'add_new_item'       => esc_html__( 'Add New Project', 'lsx-projects' ),
-			'edit_item'          => esc_html__( 'Edit Project', 'lsx-projects' ),
-			'new_item'           => esc_html__( 'New Project', 'lsx-projects' ),
-			'all_items'          => esc_html__( 'All Projects', 'lsx-projects' ),
-			'view_item'          => esc_html__( 'View Project', 'lsx-projects' ),
-			'search_items'       => esc_html__( 'Search Projects', 'lsx-projects' ),
-			'not_found'          => esc_html__( 'No projects found', 'lsx-projects' ),
-			'not_found_in_trash' => esc_html__( 'No projects found in Trash', 'lsx-projects' ),
-			'parent_item_colon'  => '',
-			'menu_name'          => esc_html_x( 'Projects', 'admin menu', 'lsx-projects' ),
-		);
-
-		$args = array(
-			'labels'             => $labels,
-			'public'             => true,
-			'publicly_queryable' => true,
-			'show_ui'            => true,
-			'show_in_menu'       => true,
-			'menu_icon'          => 'dashicons-portfolio',
-			'query_var'          => true,
-			'rewrite'            => array(
-				'slug' => 'portfolio',
-			),
-			'capability_type'    => 'post',
-			'has_archive'        => 'portfolio',
-			'hierarchical'       => false,
-			'menu_position'      => null,
-			'supports'           => array(
-				'title',
-				'editor',
-				'thumbnail',
-				'excerpt',
-			),
-			'show_in_rest'       => true,
-			'supports'           => array( 'editor', 'title', 'excerpt', 'thumbnail' ),
-		);
-
-		register_post_type( 'project', $args );
-	}
-
-	/**
-	 * Register the Group taxonomy
-	 */
-	public function taxonomy_setup() {
-		$labels = array(
-			'name'              => esc_html_x( 'Project Groups', 'taxonomy general name', 'lsx-projects' ),
-			'singular_name'     => esc_html_x( 'Group', 'taxonomy singular name', 'lsx-projects' ),
-			'search_items'      => esc_html__( 'Search Groups', 'lsx-projects' ),
-			'all_items'         => esc_html__( 'All Groups', 'lsx-projects' ),
-			'parent_item'       => esc_html__( 'Parent Group', 'lsx-projects' ),
-			'parent_item_colon' => esc_html__( 'Parent Group:', 'lsx-projects' ),
-			'edit_item'         => esc_html__( 'Edit Group', 'lsx-projects' ),
-			'update_item'       => esc_html__( 'Update Group', 'lsx-projects' ),
-			'add_new_item'      => esc_html__( 'Add New Group', 'lsx-projects' ),
-			'new_item_name'     => esc_html__( 'New Group Name', 'lsx-projects' ),
-			'menu_name'         => esc_html__( 'Groups', 'lsx-projects' ),
-		);
-
-		$args = array(
-			'hierarchical'      => true,
-			'labels'            => $labels,
-			'show_ui'           => true,
-			'show_admin_column' => true,
-			'query_var'         => true,
-			'rewrite'           => array(
-				'slug' => 'portfolio-group',
-			),
-		);
-
-		register_taxonomy( 'project-group', array( 'project' ), $args );
-	}
-
-	/**
-	 * Register the Type taxonomy
-	 */
-	public function taxonomy_project_type_setup() {
-		$labels = array(
-			'name'              => esc_html_x( 'Project Types', 'taxonomy general name', 'lsx-projects' ),
-			'singular_name'     => esc_html_x( 'Type', 'taxonomy singular name', 'lsx-projects' ),
-			'search_items'      => esc_html__( 'Search Types', 'lsx-projects' ),
-			'all_items'         => esc_html__( 'All Types', 'lsx-projects' ),
-			'parent_item'       => esc_html__( 'Parent Type', 'lsx-projects' ),
-			'parent_item_colon' => esc_html__( 'Parent Type:', 'lsx-projects' ),
-			'edit_item'         => esc_html__( 'Edit Type', 'lsx-projects' ),
-			'update_item'       => esc_html__( 'Update Type', 'lsx-projects' ),
-			'add_new_item'      => esc_html__( 'Add New Type', 'lsx-projects' ),
-			'new_item_name'     => esc_html__( 'New Type Name', 'lsx-projects' ),
-			'menu_name'         => esc_html__( 'Types', 'lsx-projects' ),
-		);
-
-		$args = array(
-			'hierarchical'      => true,
-			'labels'            => $labels,
-			'show_ui'           => true,
-			'show_admin_column' => true,
-			'query_var'         => true,
-			'rewrite'           => array(
-				'slug' => 'project-type',
-			),
-			'show_in_rest'      => true,
-		);
-
-		register_taxonomy( 'project-type', array( 'project' ), $args );
-	}
-
-	/**
-	 * Register the Tag taxonomy
-	 */
-	public function taxonomy_project_tag_setup() {
-		$labels = array(
-			'name'              => esc_html_x( 'Project Tags', 'taxonomy general name', 'lsx-projects' ),
-			'singular_name'     => esc_html_x( 'Tag', 'taxonomy singular name', 'lsx-projects' ),
-			'search_items'      => esc_html__( 'Search Tags', 'lsx-projects' ),
-			'all_items'         => esc_html__( 'All Tags', 'lsx-projects' ),
-			'parent_item'       => esc_html__( 'Parent Tag', 'lsx-projects' ),
-			'parent_item_colon' => esc_html__( 'Parent Tag:', 'lsx-projects' ),
-			'edit_item'         => esc_html__( 'Edit Tag', 'lsx-projects' ),
-			'update_item'       => esc_html__( 'Update Tag', 'lsx-projects' ),
-			'add_new_item'      => esc_html__( 'Add New Tag', 'lsx-projects' ),
-			'new_item_name'     => esc_html__( 'New Tag Name', 'lsx-projects' ),
-			'menu_name'         => esc_html__( 'Tags', 'lsx-projects' ),
-		);
-
-		$args = array(
-			'hierarchical'      => true,
-			'labels'            => $labels,
-			'show_ui'           => true,
-			'show_admin_column' => true,
-			'query_var'         => true,
-			'rewrite'           => array(
-				'slug' => 'project-tag',
-			),
-			'show_in_rest'      => true,
-		);
-
-		register_taxonomy( 'project-tag', array( 'project' ), $args );
-	}
-
-	/**
-	 * Add metabox with custom fields to the Project post type
-	 */
-	public function field_setup() {
-		$prefix = 'lsx_project_';
-
-		$cmb = new_cmb2_box(
-			array(
-				'id'           => $prefix . '_project',
-				'title'        => __( 'General', 'lsx-projects' ),
-				'object_types' => 'project',
-				'context'      => 'normal',
-				'priority'     => 'low',
-				'show_names'   => true,
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'name'         => esc_html__( 'Featured:', 'lsx-projects' ),
-				'id'           => $prefix . 'featured',
-				'type'         => 'checkbox',
-				'value'        => 1,
-				'default'      => 0,
-				'show_in_rest' => true,
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'name'         => esc_html__( 'Client:', 'lsx-projects' ),
-				'id'           => $prefix . 'client',
-				'type'         => 'text',
-				'show_in_rest' => true,
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'name'         => esc_html__( 'Client logo:', 'lsx-projects' ),
-				'id'           => $prefix . 'client_logo',
-				'type'         => 'file',
-				'desc'         => esc_html__( 'Recommended image size: 320 x 50~60', 'lsx-projects' ),
-				'options'      => array(
-					'url' => false, // Hide the text input for the url.
-				),
-				'text'         => array(
-					'add_upload_file_text' => 'Choose Image',
-				),
-				'show_in_rest' => true,
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'name'         => esc_html__( 'URL for the finished project:', 'lsx-projects' ),
-				'id'           => $prefix . 'url',
-				'type'         => 'text',
-				'show_in_rest' => true,
-			)
-		);
-	}
-
-	/**
-	 * Project Services Metaboxes.
-	 */
-	public function projects_services_metaboxes() {
-		$prefix = 'lsx_project_';
-
-		$cmb = new_cmb2_box(
-			array(
-				'id'           => $prefix . '_project',
-				'object_types' => 'projects',
-				'context'      => 'normal',
-				'priority'     => 'low',
-				'show_names'   => true,
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'name'         => esc_html__( 'Services related to this project:', 'lsx-projects' ),
-				'id'           => 'page_to_project',
-				'type'         => 'post_search_ajax',
-				'show_in_rest' => true,
-				'limit'        => 15,
-				'sortable'     => true,
-				'query_args'   => array(
-					'post_type'      => array( 'project' ),
-					'post_status'    => array( 'publish' ),
-					'nopagin'        => true,
-					'posts_per_page' => '50',
-					'orderby'        => 'title',
-					'order'          => 'ASC',
-				),
-			)
-		);
-	}
-
-	/**
-	 * Project Testimonials Metaboxes.
-	 */
-	public function projects_testimonials_metaboxes() {
-		$prefix = 'lsx_project_';
-
-		$cmb = new_cmb2_box(
-			array(
-				'id'           => $prefix . '_project',
-				'object_types' => 'projects',
-				'context'      => 'normal',
-				'priority'     => 'low',
-				'show_names'   => true,
-			)
-		);
-
-		if ( class_exists( 'LSX_Testimonials' ) ) {
-			$cmb->add_field(
-				array(
-					'name'         => esc_html__( 'Testimonials related to this project:', 'lsx-projects' ),
-					'id'           => 'testimonial_to_project',
-					'type'         => 'post_search_ajax',
-					'show_in_rest' => true,
-					'limit'        => 15,
-					'sortable'     => true,
-					'query_args'   => array(
-						'post_type'      => array( 'testimonial' ),
-						'post_status'    => array( 'publish' ),
-						'nopagin'        => true,
-						'posts_per_page' => '50',
-						'orderby'        => 'title',
-						'order'          => 'ASC',
-					),
-				)
-			);
-		}
-	}
-
-	/**
-	 * Project Team Metaboxes.
-	 */
-	public function projects_team_metaboxes() {
-		$prefix = 'lsx_project_';
-
-		$cmb = new_cmb2_box(
-			array(
-				'id'           => $prefix . '_project',
-				'object_types' => 'project',
-				'context'      => 'normal',
-				'priority'     => 'low',
-				'show_names'   => true,
-			)
-		);
-
-		if ( class_exists( 'LSX_Team' ) ) {
-			$cmb->add_field(
-				array(
-					'name'         => esc_html__( 'Team members involved with this project:', 'lsx-projects' ),
-					'id'           => 'team_to_project',
-					'type'         => 'post_search_ajax',
-					'show_in_rest' => true,
-					'limit'        => 15,
-					'sortable'     => true,
-					'query_args'   => array(
-						'post_type'      => array( 'team' ),
-						'post_status'    => array( 'publish' ),
-						'nopagin'        => true,
-						'posts_per_page' => '50',
-						'orderby'        => 'title',
-						'order'          => 'ASC',
-					),
-				)
-			);
-		}
-	}
-
-	/**
-	 * Project Woocommerce Metaboxes.
-	 */
-	public function projects_woocommerce_metaboxes() {
-		$prefix = 'lsx_project_';
-
-		$cmb = new_cmb2_box(
-			array(
-				'id'           => $prefix . '_project',
-				'object_types' => 'projects',
-				'context'      => 'normal',
-				'priority'     => 'low',
-				'show_names'   => true,
-			)
-		);
-
-		if ( class_exists( 'woocommerce' ) ) {
-			$cmb->add_field(
-				array(
-					'name'         => esc_html__( 'Products used for this project:', 'lsx-projects' ),
-					'id'           => 'product_to_project',
-					'type'         => 'post_search_ajax',
-					'show_in_rest' => true,
-					'limit'        => 15,
-					'sortable'     => true,
-					'query_args'   => array(
-						'post_type'      => array( 'product' ),
-						'post_status'    => array( 'publish' ),
-						'nopagin'        => true,
-						'posts_per_page' => '50',
-						'orderby'        => 'title',
-						'order'          => 'ASC',
-					),
-				)
-			);
-		}
-	}
-
-	/**
-	 * Add Alt Product metabox with custom fields to the Project post type
-	 */
-	public function project_field_setup_product() {
-		$prefix = 'lsx_project_';
-
-		$cmb = new_cmb2_box(
-			array(
-				'id'           => $prefix . '_project',
-				'title'        => __( 'General', 'lsx-projects' ),
-				'object_types' => 'project',
-				'context'      => 'normal',
-				'priority'     => 'low',
-				'show_names'   => true,
-			)
-		);
-
-		$tip_group = $cmb->add_field(
-			array(
-				'id'      => $prefix . '_alt_products',
-				'type'    => 'group',
-				'options' => array(
-					'group_title'   => __( 'Alternative Products', 'lsx-projects' ),
-					'add_button'    => __( 'Add Product', 'lsx-projects' ),
-					'remove_button' => __( 'Remove Product', 'lsx-projects' ),
-					'sortable'      => true,
-				),
-				'classes' => 'lsx-admin-row',
-			)
-		);
-
-		$cmb->add_group_field(
-			$tip_group,
-			array(
-				'name'         => esc_html__( 'Alt Product Name:', 'lsx-projects' ),
-				'id'           => $prefix . 'alt_product_title',
-				'type'         => 'text',
-				'show_in_rest' => true,
-			)
-		);
-
-		$cmb->add_group_field(
-			$tip_group,
-			array(
-				'name'         => esc_html__( 'Alt Product Link:', 'lsx-projects' ),
-				'id'           => $prefix . 'alt_product_link',
-				'type'         => 'text',
-				'show_in_rest' => true,
-			)
-		);
-
-	}
-
-	/**
-	 * Sets up the "post relations".
-	 */
-	public function post_relations( $post_id, $field, $value ) {
-		$connections = array(
-			// 'project_to_project',
-
-			'page_to_project',
-			'project_to_page',
-
-			'project_to_service',
-			'service_to_project',
-
-			'project_to_testimonial',
-			'testimonial_to_project',
-
-			'project_to_team',
-			'team_to_project',
-		);
-
-		if ( in_array( $field['id'], $connections ) ) {
-			$this->save_related_post( $connections, $post_id, $field, $value );
-		}
-	}
-
-	/**
-	 * Save the reverse post relation.
-	 */
-	public function save_related_post( $connections, $post_id, $field, $value ) {
-		$ids = explode( '_to_', $field['id'] );
-		$relation = $ids[1] . '_to_' . $ids[0];
-
-		if ( in_array( $relation, $connections ) ) {
-			$previous_values = get_post_meta( $post_id, $field['id'], false );
-
-			if ( ! empty( $previous_values ) ) {
-				foreach ( $previous_values as $v ) {
-					delete_post_meta( $v, $relation, $post_id );
-				}
-			}
-
-			if ( is_array( $value ) ) {
-				foreach ( $value as $v ) {
-					if ( ! empty( $v ) ) {
-						add_post_meta( $v, $relation, $post_id );
-					}
-				}
-			}
-		}
-	}
-
-	public function assets() {
-		//wp_enqueue_media();
-		wp_enqueue_script( 'media-upload' );
-		wp_enqueue_script( 'thickbox' );
-		wp_enqueue_style( 'thickbox' );
-
-		wp_enqueue_script( 'lsx-projects-admin', LSX_PROJECTS_URL . 'assets/js/lsx-projects-admin.min.js', array( 'jquery' ), LSX_PROJECTS_VER, true );
-		wp_enqueue_style( 'lsx-projects-admin', LSX_PROJECTS_URL . 'assets/css/lsx-projects-admin.css', array(), LSX_PROJECTS_VER );
-	}
-
-	/**
-	 * Change the "Insert into Post" button text when media modal is used for feature images
-	 */
-	public function change_attachment_field_button( $html ) {
-		if ( isset( $_GET['feature_image_text_button'] ) ) {
-			$html = str_replace( 'value="Insert into Post"', sprintf( 'value="%s"', esc_html__( 'Select featured image', 'lsx-projects' ) ), $html );
-		}
-
-		return $html;
-	}
-
-	public function change_title_text( $title ) {
-		$screen = get_current_screen();
-
-		if ( 'project' === $screen->post_type ) {
-			$title = esc_attr__( 'Enter project title', 'lsx-projects' );
-		}
-
-		return $title;
-	}
+     public function __construct() {
+          $this->load_classes();
+
+          add_action( 'init', array( $this, 'post_type_setup' ) );
+          add_action( 'init', array( $this, 'taxonomy_setup' ) );
+          add_action( 'init', array( $this, 'taxonomy_project_type_setup' ) );
+          add_action( 'init', array( $this, 'taxonomy_project_tag_setup' ) );
+          add_filter( 'cmb2_admin_init', array( $this, 'field_setup' ) );
+          add_filter( 'cmb2_admin_init', array( $this, 'projects_services_metaboxes' ) );
+          add_filter( 'cmb2_admin_init', array( $this, 'projects_testimonials_metaboxes' ) );
+          add_filter( 'cmb2_admin_init', array( $this, 'projects_team_metaboxes' ) );
+          add_filter( 'cmb2_admin_init', array( $this, 'projects_woocommerce_metaboxes' ) );
+          add_filter( 'cmb2_admin_init', array( $this, 'project_field_setup_product' ) );
+          add_action( 'cmb_save_custom', array( $this, 'post_relations' ), 3, 20 );
+          add_action( 'admin_enqueue_scripts', array( $this, 'assets' ) );
+
+          add_filter( 'type_url_form_media', array( $this, 'change_attachment_field_button' ), 20, 1 );
+          add_filter( 'enter_title_here', array( $this, 'change_title_text' ) );
+     }
+
+     /**
+      * Loads the admin subclasses
+      */
+     private function load_classes() {
+          require_once LSX_PROJECTS_PATH . 'classes/admin/class-settings.php';
+          $this->settings = \lsx\projects\classes\admin\Settings::get_instance();
+
+          require_once LSX_PROJECTS_PATH . 'classes/admin/class-settings-theme.php';
+          $this->settings_theme = \lsx\projects\classes\admin\Settings_Theme::get_instance();
+     }
+
+     /**
+      * Register the Project and Product Tag post type
+      */
+     public function post_type_setup() {
+          $labels = array(
+               'name'               => esc_html_x( 'Projects', 'post type general name', 'lsx-projects' ),
+               'singular_name'      => esc_html_x( 'Project', 'post type singular name', 'lsx-projects' ),
+               'add_new'            => esc_html_x( 'Add New', 'post type general name', 'lsx-projects' ),
+               'add_new_item'       => esc_html__( 'Add New Project', 'lsx-projects' ),
+               'edit_item'          => esc_html__( 'Edit Project', 'lsx-projects' ),
+               'new_item'           => esc_html__( 'New Project', 'lsx-projects' ),
+               'all_items'          => esc_html__( 'All Projects', 'lsx-projects' ),
+               'view_item'          => esc_html__( 'View Project', 'lsx-projects' ),
+               'search_items'       => esc_html__( 'Search Projects', 'lsx-projects' ),
+               'not_found'          => esc_html__( 'No projects found', 'lsx-projects' ),
+               'not_found_in_trash' => esc_html__( 'No projects found in Trash', 'lsx-projects' ),
+               'parent_item_colon'  => '',
+               'menu_name'          => esc_html_x( 'Projects', 'admin menu', 'lsx-projects' ),
+          );
+
+          $args = array(
+               'labels'             => $labels,
+               'public'             => true,
+               'publicly_queryable' => true,
+               'show_ui'            => true,
+               'show_in_menu'       => true,
+               'menu_icon'          => 'dashicons-portfolio',
+               'query_var'          => true,
+               'rewrite'            => array(
+                    'slug' => 'portfolio',
+               ),
+               'capability_type'    => 'post',
+               'has_archive'        => 'portfolio',
+               'hierarchical'       => false,
+               'menu_position'      => null,
+               'supports'           => array(
+                    'title',
+                    'editor',
+                    'thumbnail',
+                    'excerpt',
+               ),
+               'show_in_rest'       => true,
+               'supports'           => array( 'editor', 'title', 'excerpt', 'thumbnail' ),
+          );
+
+          register_post_type( 'project', $args );
+     }
+
+     /**
+      * Register the Group taxonomy
+      */
+     public function taxonomy_setup() {
+          $labels = array(
+               'name'              => esc_html_x( 'Project Groups', 'taxonomy general name', 'lsx-projects' ),
+               'singular_name'     => esc_html_x( 'Group', 'taxonomy singular name', 'lsx-projects' ),
+               'search_items'      => esc_html__( 'Search Groups', 'lsx-projects' ),
+               'all_items'         => esc_html__( 'All Groups', 'lsx-projects' ),
+               'parent_item'       => esc_html__( 'Parent Group', 'lsx-projects' ),
+               'parent_item_colon' => esc_html__( 'Parent Group:', 'lsx-projects' ),
+               'edit_item'         => esc_html__( 'Edit Group', 'lsx-projects' ),
+               'update_item'       => esc_html__( 'Update Group', 'lsx-projects' ),
+               'add_new_item'      => esc_html__( 'Add New Group', 'lsx-projects' ),
+               'new_item_name'     => esc_html__( 'New Group Name', 'lsx-projects' ),
+               'menu_name'         => esc_html__( 'Groups', 'lsx-projects' ),
+          );
+
+          $args = array(
+               'hierarchical'      => true,
+               'labels'            => $labels,
+               'show_ui'           => true,
+               'show_admin_column' => true,
+               'query_var'         => true,
+               'rewrite'           => array(
+                    'slug' => 'portfolio-group',
+               ),
+          );
+
+          register_taxonomy( 'project-group', array( 'project' ), $args );
+     }
+
+     /**
+      * Register the Type taxonomy
+      */
+     public function taxonomy_project_type_setup() {
+          $labels = array(
+               'name'              => esc_html_x( 'Project Types', 'taxonomy general name', 'lsx-projects' ),
+               'singular_name'     => esc_html_x( 'Type', 'taxonomy singular name', 'lsx-projects' ),
+               'search_items'      => esc_html__( 'Search Types', 'lsx-projects' ),
+               'all_items'         => esc_html__( 'All Types', 'lsx-projects' ),
+               'parent_item'       => esc_html__( 'Parent Type', 'lsx-projects' ),
+               'parent_item_colon' => esc_html__( 'Parent Type:', 'lsx-projects' ),
+               'edit_item'         => esc_html__( 'Edit Type', 'lsx-projects' ),
+               'update_item'       => esc_html__( 'Update Type', 'lsx-projects' ),
+               'add_new_item'      => esc_html__( 'Add New Type', 'lsx-projects' ),
+               'new_item_name'     => esc_html__( 'New Type Name', 'lsx-projects' ),
+               'menu_name'         => esc_html__( 'Types', 'lsx-projects' ),
+          );
+
+          $args = array(
+               'hierarchical'      => true,
+               'labels'            => $labels,
+               'show_ui'           => true,
+               'show_admin_column' => true,
+               'query_var'         => true,
+               'rewrite'           => array(
+                    'slug' => 'project-type',
+               ),
+               'show_in_rest'      => true,
+          );
+
+          register_taxonomy( 'project-type', array( 'project' ), $args );
+     }
+
+     /**
+      * Register the Tag taxonomy
+      */
+     public function taxonomy_project_tag_setup() {
+          $labels = array(
+               'name'              => esc_html_x( 'Project Tags', 'taxonomy general name', 'lsx-projects' ),
+               'singular_name'     => esc_html_x( 'Tag', 'taxonomy singular name', 'lsx-projects' ),
+               'search_items'      => esc_html__( 'Search Tags', 'lsx-projects' ),
+               'all_items'         => esc_html__( 'All Tags', 'lsx-projects' ),
+               'parent_item'       => esc_html__( 'Parent Tag', 'lsx-projects' ),
+               'parent_item_colon' => esc_html__( 'Parent Tag:', 'lsx-projects' ),
+               'edit_item'         => esc_html__( 'Edit Tag', 'lsx-projects' ),
+               'update_item'       => esc_html__( 'Update Tag', 'lsx-projects' ),
+               'add_new_item'      => esc_html__( 'Add New Tag', 'lsx-projects' ),
+               'new_item_name'     => esc_html__( 'New Tag Name', 'lsx-projects' ),
+               'menu_name'         => esc_html__( 'Tags', 'lsx-projects' ),
+          );
+
+          $args = array(
+               'hierarchical'      => true,
+               'labels'            => $labels,
+               'show_ui'           => true,
+               'show_admin_column' => true,
+               'query_var'         => true,
+               'rewrite'           => array(
+                    'slug' => 'project-tag',
+               ),
+               'show_in_rest'      => true,
+          );
+
+          register_taxonomy( 'project-tag', array( 'project' ), $args );
+     }
+
+     /**
+      * Add metabox with custom fields to the Project post type
+      */
+     public function field_setup() {
+          $prefix = 'lsx_project_';
+
+          $cmb = new_cmb2_box(
+               array(
+                    'id'           => $prefix . '_project',
+                    'title'        => __( 'General', 'lsx-projects' ),
+                    'object_types' => 'project',
+                    'context'      => 'normal',
+                    'priority'     => 'low',
+                    'show_names'   => true,
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'name'         => esc_html__( 'Featured:', 'lsx-projects' ),
+                    'id'           => $prefix . 'featured',
+                    'type'         => 'checkbox',
+                    'value'        => 1,
+                    'default'      => 0,
+                    'show_in_rest' => true,
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'name'         => esc_html__( 'Client:', 'lsx-projects' ),
+                    'id'           => $prefix . 'client',
+                    'type'         => 'text',
+                    'show_in_rest' => true,
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'name'         => esc_html__( 'Client logo:', 'lsx-projects' ),
+                    'id'           => $prefix . 'client_logo',
+                    'type'         => 'file',
+                    'desc'         => esc_html__( 'Recommended image size: 320 x 50~60', 'lsx-projects' ),
+                    'options'      => array(
+                         'url' => false, // Hide the text input for the url.
+                    ),
+                    'text'         => array(
+                         'add_upload_file_text' => 'Choose Image',
+                    ),
+                    'show_in_rest' => true,
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'name'         => esc_html__( 'URL for the finished project:', 'lsx-projects' ),
+                    'id'           => $prefix . 'url',
+                    'type'         => 'text',
+                    'show_in_rest' => true,
+               )
+          );
+     }
+
+     /**
+      * Project Services Metaboxes.
+      */
+     public function projects_services_metaboxes() {
+          $prefix = 'lsx_project_';
+
+          $cmb = new_cmb2_box(
+               array(
+                    'id'           => $prefix . '_project',
+                    'object_types' => 'projects',
+                    'context'      => 'normal',
+                    'priority'     => 'low',
+                    'show_names'   => true,
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'name'         => esc_html__( 'Services related to this project:', 'lsx-projects' ),
+                    'id'           => 'page_to_project',
+                    'type'         => 'post_search_ajax',
+                    'show_in_rest' => true,
+                    'limit'        => 15,
+                    'sortable'     => true,
+                    'query_args'   => array(
+                         'post_type'      => array( 'project' ),
+                         'post_status'    => array( 'publish' ),
+                         'nopagin'        => true,
+                         'posts_per_page' => '50',
+                         'orderby'        => 'title',
+                         'order'          => 'ASC',
+                    ),
+               )
+          );
+     }
+
+     /**
+      * Project Testimonials Metaboxes.
+      */
+     public function projects_testimonials_metaboxes() {
+          $prefix = 'lsx_project_';
+
+          $cmb = new_cmb2_box(
+               array(
+                    'id'           => $prefix . '_project',
+                    'object_types' => 'projects',
+                    'context'      => 'normal',
+                    'priority'     => 'low',
+                    'show_names'   => true,
+               )
+          );
+
+          if ( class_exists( 'LSX_Testimonials' ) ) {
+               $cmb->add_field(
+                    array(
+                         'name'         => esc_html__( 'Testimonials related to this project:', 'lsx-projects' ),
+                         'id'           => 'testimonial_to_project',
+                         'type'         => 'post_search_ajax',
+                         'show_in_rest' => true,
+                         'limit'        => 15,
+                         'sortable'     => true,
+                         'query_args'   => array(
+                              'post_type'      => array( 'testimonial' ),
+                              'post_status'    => array( 'publish' ),
+                              'nopagin'        => true,
+                              'posts_per_page' => '50',
+                              'orderby'        => 'title',
+                              'order'          => 'ASC',
+                         ),
+                    )
+               );
+          }
+     }
+
+     /**
+      * Project Team Metaboxes.
+      */
+     public function projects_team_metaboxes() {
+          $prefix = 'lsx_project_';
+
+          $cmb = new_cmb2_box(
+               array(
+                    'id'           => $prefix . '_project',
+                    'object_types' => 'project',
+                    'context'      => 'normal',
+                    'priority'     => 'low',
+                    'show_names'   => true,
+               )
+          );
+
+          if ( class_exists( 'LSX_Team' ) ) {
+               $cmb->add_field(
+                    array(
+                         'name'         => esc_html__( 'Team members involved with this project:', 'lsx-projects' ),
+                         'id'           => 'team_to_project',
+                         'type'         => 'post_search_ajax',
+                         'show_in_rest' => true,
+                         'limit'        => 15,
+                         'sortable'     => true,
+                         'query_args'   => array(
+                              'post_type'      => array( 'team' ),
+                              'post_status'    => array( 'publish' ),
+                              'nopagin'        => true,
+                              'posts_per_page' => '50',
+                              'orderby'        => 'title',
+                              'order'          => 'ASC',
+                         ),
+                    )
+               );
+          }
+     }
+
+     /**
+      * Project Woocommerce Metaboxes.
+      */
+     public function projects_woocommerce_metaboxes() {
+          $prefix = 'lsx_project_';
+
+          $cmb = new_cmb2_box(
+               array(
+                    'id'           => $prefix . '_project',
+                    'object_types' => 'projects',
+                    'context'      => 'normal',
+                    'priority'     => 'low',
+                    'show_names'   => true,
+               )
+          );
+
+          if ( class_exists( 'woocommerce' ) ) {
+               $cmb->add_field(
+                    array(
+                         'name'         => esc_html__( 'Products used for this project:', 'lsx-projects' ),
+                         'id'           => 'product_to_project',
+                         'type'         => 'post_search_ajax',
+                         'show_in_rest' => true,
+                         'limit'        => 15,
+                         'sortable'     => true,
+                         'query_args'   => array(
+                              'post_type'      => array( 'product' ),
+                              'post_status'    => array( 'publish' ),
+                              'nopagin'        => true,
+                              'posts_per_page' => '50',
+                              'orderby'        => 'title',
+                              'order'          => 'ASC',
+                         ),
+                    )
+               );
+          }
+     }
+
+     /**
+      * Add Alt Product metabox with custom fields to the Project post type
+      */
+     public function project_field_setup_product() {
+          $prefix = 'lsx_project_';
+
+          $cmb = new_cmb2_box(
+               array(
+                    'id'           => $prefix . '_project',
+                    'title'        => __( 'General', 'lsx-projects' ),
+                    'object_types' => 'project',
+                    'context'      => 'normal',
+                    'priority'     => 'low',
+                    'show_names'   => true,
+               )
+          );
+
+          $tip_group = $cmb->add_field(
+               array(
+                    'id'      => $prefix . '_alt_products',
+                    'type'    => 'group',
+                    'options' => array(
+                         'group_title'   => __( 'Alternative Products', 'lsx-projects' ),
+                         'add_button'    => __( 'Add Product', 'lsx-projects' ),
+                         'remove_button' => __( 'Remove Product', 'lsx-projects' ),
+                         'sortable'      => true,
+                    ),
+                    'classes' => 'lsx-admin-row',
+               )
+          );
+
+          $cmb->add_group_field(
+               $tip_group,
+               array(
+                    'name'         => esc_html__( 'Alt Product Name:', 'lsx-projects' ),
+                    'id'           => $prefix . 'alt_product_title',
+                    'type'         => 'text',
+                    'show_in_rest' => true,
+               )
+          );
+
+          $cmb->add_group_field(
+               $tip_group,
+               array(
+                    'name'         => esc_html__( 'Alt Product Link:', 'lsx-projects' ),
+                    'id'           => $prefix . 'alt_product_link',
+                    'type'         => 'text',
+                    'show_in_rest' => true,
+               )
+          );
+
+     }
+
+     /**
+      * Sets up the "post relations".
+      */
+     public function post_relations( $post_id, $field, $value ) {
+          $connections = array(
+               // 'project_to_project',
+
+               'page_to_project',
+               'project_to_page',
+
+               'project_to_service',
+               'service_to_project',
+
+               'project_to_testimonial',
+               'testimonial_to_project',
+
+               'project_to_team',
+               'team_to_project',
+          );
+
+          if ( in_array( $field['id'], $connections ) ) {
+               $this->save_related_post( $connections, $post_id, $field, $value );
+          }
+     }
+
+     /**
+      * Save the reverse post relation.
+      */
+     public function save_related_post( $connections, $post_id, $field, $value ) {
+          $ids = explode( '_to_', $field['id'] );
+          $relation = $ids[1] . '_to_' . $ids[0];
+
+          if ( in_array( $relation, $connections ) ) {
+               $previous_values = get_post_meta( $post_id, $field['id'], false );
+
+               if ( ! empty( $previous_values ) ) {
+                    foreach ( $previous_values as $v ) {
+                         delete_post_meta( $v, $relation, $post_id );
+                    }
+               }
+
+               if ( is_array( $value ) ) {
+                    foreach ( $value as $v ) {
+                         if ( ! empty( $v ) ) {
+                              add_post_meta( $v, $relation, $post_id );
+                         }
+                    }
+               }
+          }
+     }
+
+     public function assets() {
+          //wp_enqueue_media();
+          wp_enqueue_script( 'media-upload' );
+          wp_enqueue_script( 'thickbox' );
+          wp_enqueue_style( 'thickbox' );
+
+          wp_enqueue_script( 'lsx-projects-admin', LSX_PROJECTS_URL . 'assets/js/lsx-projects-admin.min.js', array( 'jquery' ), LSX_PROJECTS_VER, true );
+          wp_enqueue_style( 'lsx-projects-admin', LSX_PROJECTS_URL . 'assets/css/lsx-projects-admin.css', array(), LSX_PROJECTS_VER );
+     }
+
+     /**
+      * Change the "Insert into Post" button text when media modal is used for feature images
+      */
+     public function change_attachment_field_button( $html ) {
+          if ( isset( $_GET['feature_image_text_button'] ) ) {
+               $html = str_replace( 'value="Insert into Post"', sprintf( 'value="%s"', esc_html__( 'Select featured image', 'lsx-projects' ) ), $html );
+          }
+
+          return $html;
+     }
+
+     public function change_title_text( $title ) {
+          $screen = get_current_screen();
+
+          if ( 'project' === $screen->post_type ) {
+               $title = esc_attr__( 'Enter project title', 'lsx-projects' );
+          }
+
+          return $title;
+     }
 }
 
 $lsx_projects_admin = new LSX_Projects_Admin();

Spacing +117 added lines, -117 removed lines

@@ -13,21 +13,21 @@ 
 	public function __construct() {
 		$this->load_classes();
 
-		add_action( 'init', array( $this, 'post_type_setup' ) );
-		add_action( 'init', array( $this, 'taxonomy_setup' ) );
-		add_action( 'init', array( $this, 'taxonomy_project_type_setup' ) );
-		add_action( 'init', array( $this, 'taxonomy_project_tag_setup' ) );
-		add_filter( 'cmb2_admin_init', array( $this, 'field_setup' ) );
-		add_filter( 'cmb2_admin_init', array( $this, 'projects_services_metaboxes' ) );
-		add_filter( 'cmb2_admin_init', array( $this, 'projects_testimonials_metaboxes' ) );
-		add_filter( 'cmb2_admin_init', array( $this, 'projects_team_metaboxes' ) );
-		add_filter( 'cmb2_admin_init', array( $this, 'projects_woocommerce_metaboxes' ) );
-		add_filter( 'cmb2_admin_init', array( $this, 'project_field_setup_product' ) );
-		add_action( 'cmb_save_custom', array( $this, 'post_relations' ), 3, 20 );
-		add_action( 'admin_enqueue_scripts', array( $this, 'assets' ) );
-
-		add_filter( 'type_url_form_media', array( $this, 'change_attachment_field_button' ), 20, 1 );
-		add_filter( 'enter_title_here', array( $this, 'change_title_text' ) );
+		add_action('init', array($this, 'post_type_setup'));
+		add_action('init', array($this, 'taxonomy_setup'));
+		add_action('init', array($this, 'taxonomy_project_type_setup'));
+		add_action('init', array($this, 'taxonomy_project_tag_setup'));
+		add_filter('cmb2_admin_init', array($this, 'field_setup'));
+		add_filter('cmb2_admin_init', array($this, 'projects_services_metaboxes'));
+		add_filter('cmb2_admin_init', array($this, 'projects_testimonials_metaboxes'));
+		add_filter('cmb2_admin_init', array($this, 'projects_team_metaboxes'));
+		add_filter('cmb2_admin_init', array($this, 'projects_woocommerce_metaboxes'));
+		add_filter('cmb2_admin_init', array($this, 'project_field_setup_product'));
+		add_action('cmb_save_custom', array($this, 'post_relations'), 3, 20);
+		add_action('admin_enqueue_scripts', array($this, 'assets'));
+
+		add_filter('type_url_form_media', array($this, 'change_attachment_field_button'), 20, 1);
+		add_filter('enter_title_here', array($this, 'change_title_text'));
 	}
 
 	/**
@@ -46,19 +46,19 @@ 
 	 */
 	public function post_type_setup() {
 		$labels = array(
-			'name'               => esc_html_x( 'Projects', 'post type general name', 'lsx-projects' ),
-			'singular_name'      => esc_html_x( 'Project', 'post type singular name', 'lsx-projects' ),
-			'add_new'            => esc_html_x( 'Add New', 'post type general name', 'lsx-projects' ),
-			'add_new_item'       => esc_html__( 'Add New Project', 'lsx-projects' ),
-			'edit_item'          => esc_html__( 'Edit Project', 'lsx-projects' ),
-			'new_item'           => esc_html__( 'New Project', 'lsx-projects' ),
-			'all_items'          => esc_html__( 'All Projects', 'lsx-projects' ),
-			'view_item'          => esc_html__( 'View Project', 'lsx-projects' ),
-			'search_items'       => esc_html__( 'Search Projects', 'lsx-projects' ),
-			'not_found'          => esc_html__( 'No projects found', 'lsx-projects' ),
-			'not_found_in_trash' => esc_html__( 'No projects found in Trash', 'lsx-projects' ),
+			'name'               => esc_html_x('Projects', 'post type general name', 'lsx-projects'),
+			'singular_name'      => esc_html_x('Project', 'post type singular name', 'lsx-projects'),
+			'add_new'            => esc_html_x('Add New', 'post type general name', 'lsx-projects'),
+			'add_new_item'       => esc_html__('Add New Project', 'lsx-projects'),
+			'edit_item'          => esc_html__('Edit Project', 'lsx-projects'),
+			'new_item'           => esc_html__('New Project', 'lsx-projects'),
+			'all_items'          => esc_html__('All Projects', 'lsx-projects'),
+			'view_item'          => esc_html__('View Project', 'lsx-projects'),
+			'search_items'       => esc_html__('Search Projects', 'lsx-projects'),
+			'not_found'          => esc_html__('No projects found', 'lsx-projects'),
+			'not_found_in_trash' => esc_html__('No projects found in Trash', 'lsx-projects'),
 			'parent_item_colon'  => '',
-			'menu_name'          => esc_html_x( 'Projects', 'admin menu', 'lsx-projects' ),
+			'menu_name'          => esc_html_x('Projects', 'admin menu', 'lsx-projects'),
 		);
 
 		$args = array(
@@ -83,10 +83,10 @@ 
 				'excerpt',
 			),
 			'show_in_rest'       => true,
-			'supports'           => array( 'editor', 'title', 'excerpt', 'thumbnail' ),
+			'supports'           => array('editor', 'title', 'excerpt', 'thumbnail'),
 		);
 
-		register_post_type( 'project', $args );
+		register_post_type('project', $args);
 	}
 
 	/**
@@ -94,17 +94,17 @@ 
 	 */
 	public function taxonomy_setup() {
 		$labels = array(
-			'name'              => esc_html_x( 'Project Groups', 'taxonomy general name', 'lsx-projects' ),
-			'singular_name'     => esc_html_x( 'Group', 'taxonomy singular name', 'lsx-projects' ),
-			'search_items'      => esc_html__( 'Search Groups', 'lsx-projects' ),
-			'all_items'         => esc_html__( 'All Groups', 'lsx-projects' ),
-			'parent_item'       => esc_html__( 'Parent Group', 'lsx-projects' ),
-			'parent_item_colon' => esc_html__( 'Parent Group:', 'lsx-projects' ),
-			'edit_item'         => esc_html__( 'Edit Group', 'lsx-projects' ),
-			'update_item'       => esc_html__( 'Update Group', 'lsx-projects' ),
-			'add_new_item'      => esc_html__( 'Add New Group', 'lsx-projects' ),
-			'new_item_name'     => esc_html__( 'New Group Name', 'lsx-projects' ),
-			'menu_name'         => esc_html__( 'Groups', 'lsx-projects' ),
+			'name'              => esc_html_x('Project Groups', 'taxonomy general name', 'lsx-projects'),
+			'singular_name'     => esc_html_x('Group', 'taxonomy singular name', 'lsx-projects'),
+			'search_items'      => esc_html__('Search Groups', 'lsx-projects'),
+			'all_items'         => esc_html__('All Groups', 'lsx-projects'),
+			'parent_item'       => esc_html__('Parent Group', 'lsx-projects'),
+			'parent_item_colon' => esc_html__('Parent Group:', 'lsx-projects'),
+			'edit_item'         => esc_html__('Edit Group', 'lsx-projects'),
+			'update_item'       => esc_html__('Update Group', 'lsx-projects'),
+			'add_new_item'      => esc_html__('Add New Group', 'lsx-projects'),
+			'new_item_name'     => esc_html__('New Group Name', 'lsx-projects'),
+			'menu_name'         => esc_html__('Groups', 'lsx-projects'),
 		);
 
 		$args = array(
@@ -118,7 +118,7 @@ 
 			),
 		);
 
-		register_taxonomy( 'project-group', array( 'project' ), $args );
+		register_taxonomy('project-group', array('project'), $args);
 	}
 
 	/**
@@ -126,17 +126,17 @@ 
 	 */
 	public function taxonomy_project_type_setup() {
 		$labels = array(
-			'name'              => esc_html_x( 'Project Types', 'taxonomy general name', 'lsx-projects' ),
-			'singular_name'     => esc_html_x( 'Type', 'taxonomy singular name', 'lsx-projects' ),
-			'search_items'      => esc_html__( 'Search Types', 'lsx-projects' ),
-			'all_items'         => esc_html__( 'All Types', 'lsx-projects' ),
-			'parent_item'       => esc_html__( 'Parent Type', 'lsx-projects' ),
-			'parent_item_colon' => esc_html__( 'Parent Type:', 'lsx-projects' ),
-			'edit_item'         => esc_html__( 'Edit Type', 'lsx-projects' ),
-			'update_item'       => esc_html__( 'Update Type', 'lsx-projects' ),
-			'add_new_item'      => esc_html__( 'Add New Type', 'lsx-projects' ),
-			'new_item_name'     => esc_html__( 'New Type Name', 'lsx-projects' ),
-			'menu_name'         => esc_html__( 'Types', 'lsx-projects' ),
+			'name'              => esc_html_x('Project Types', 'taxonomy general name', 'lsx-projects'),
+			'singular_name'     => esc_html_x('Type', 'taxonomy singular name', 'lsx-projects'),
+			'search_items'      => esc_html__('Search Types', 'lsx-projects'),
+			'all_items'         => esc_html__('All Types', 'lsx-projects'),
+			'parent_item'       => esc_html__('Parent Type', 'lsx-projects'),
+			'parent_item_colon' => esc_html__('Parent Type:', 'lsx-projects'),
+			'edit_item'         => esc_html__('Edit Type', 'lsx-projects'),
+			'update_item'       => esc_html__('Update Type', 'lsx-projects'),
+			'add_new_item'      => esc_html__('Add New Type', 'lsx-projects'),
+			'new_item_name'     => esc_html__('New Type Name', 'lsx-projects'),
+			'menu_name'         => esc_html__('Types', 'lsx-projects'),
 		);
 
 		$args = array(
@@ -151,7 +151,7 @@ 
 			'show_in_rest'      => true,
 		);
 
-		register_taxonomy( 'project-type', array( 'project' ), $args );
+		register_taxonomy('project-type', array('project'), $args);
 	}
 
 	/**
@@ -159,17 +159,17 @@ 
 	 */
 	public function taxonomy_project_tag_setup() {
 		$labels = array(
-			'name'              => esc_html_x( 'Project Tags', 'taxonomy general name', 'lsx-projects' ),
-			'singular_name'     => esc_html_x( 'Tag', 'taxonomy singular name', 'lsx-projects' ),
-			'search_items'      => esc_html__( 'Search Tags', 'lsx-projects' ),
-			'all_items'         => esc_html__( 'All Tags', 'lsx-projects' ),
-			'parent_item'       => esc_html__( 'Parent Tag', 'lsx-projects' ),
-			'parent_item_colon' => esc_html__( 'Parent Tag:', 'lsx-projects' ),
-			'edit_item'         => esc_html__( 'Edit Tag', 'lsx-projects' ),
-			'update_item'       => esc_html__( 'Update Tag', 'lsx-projects' ),
-			'add_new_item'      => esc_html__( 'Add New Tag', 'lsx-projects' ),
-			'new_item_name'     => esc_html__( 'New Tag Name', 'lsx-projects' ),
-			'menu_name'         => esc_html__( 'Tags', 'lsx-projects' ),
+			'name'              => esc_html_x('Project Tags', 'taxonomy general name', 'lsx-projects'),
+			'singular_name'     => esc_html_x('Tag', 'taxonomy singular name', 'lsx-projects'),
+			'search_items'      => esc_html__('Search Tags', 'lsx-projects'),
+			'all_items'         => esc_html__('All Tags', 'lsx-projects'),
+			'parent_item'       => esc_html__('Parent Tag', 'lsx-projects'),
+			'parent_item_colon' => esc_html__('Parent Tag:', 'lsx-projects'),
+			'edit_item'         => esc_html__('Edit Tag', 'lsx-projects'),
+			'update_item'       => esc_html__('Update Tag', 'lsx-projects'),
+			'add_new_item'      => esc_html__('Add New Tag', 'lsx-projects'),
+			'new_item_name'     => esc_html__('New Tag Name', 'lsx-projects'),
+			'menu_name'         => esc_html__('Tags', 'lsx-projects'),
 		);
 
 		$args = array(
@@ -184,7 +184,7 @@ 
 			'show_in_rest'      => true,
 		);
 
-		register_taxonomy( 'project-tag', array( 'project' ), $args );
+		register_taxonomy('project-tag', array('project'), $args);
 	}
 
 	/**
@@ -196,7 +196,7 @@ 
 		$cmb = new_cmb2_box(
 			array(
 				'id'           => $prefix . '_project',
-				'title'        => __( 'General', 'lsx-projects' ),
+				'title'        => __('General', 'lsx-projects'),
 				'object_types' => 'project',
 				'context'      => 'normal',
 				'priority'     => 'low',
@@ -206,7 +206,7 @@ 
 
 		$cmb->add_field(
 			array(
-				'name'         => esc_html__( 'Featured:', 'lsx-projects' ),
+				'name'         => esc_html__('Featured:', 'lsx-projects'),
 				'id'           => $prefix . 'featured',
 				'type'         => 'checkbox',
 				'value'        => 1,
@@ -217,7 +217,7 @@ 
 
 		$cmb->add_field(
 			array(
-				'name'         => esc_html__( 'Client:', 'lsx-projects' ),
+				'name'         => esc_html__('Client:', 'lsx-projects'),
 				'id'           => $prefix . 'client',
 				'type'         => 'text',
 				'show_in_rest' => true,
@@ -226,10 +226,10 @@ 
 
 		$cmb->add_field(
 			array(
-				'name'         => esc_html__( 'Client logo:', 'lsx-projects' ),
+				'name'         => esc_html__('Client logo:', 'lsx-projects'),
 				'id'           => $prefix . 'client_logo',
 				'type'         => 'file',
-				'desc'         => esc_html__( 'Recommended image size: 320 x 50~60', 'lsx-projects' ),
+				'desc'         => esc_html__('Recommended image size: 320 x 50~60', 'lsx-projects'),
 				'options'      => array(
 					'url' => false, // Hide the text input for the url.
 				),
@@ -242,7 +242,7 @@ 
 
 		$cmb->add_field(
 			array(
-				'name'         => esc_html__( 'URL for the finished project:', 'lsx-projects' ),
+				'name'         => esc_html__('URL for the finished project:', 'lsx-projects'),
 				'id'           => $prefix . 'url',
 				'type'         => 'text',
 				'show_in_rest' => true,
@@ -268,15 +268,15 @@ 
 
 		$cmb->add_field(
 			array(
-				'name'         => esc_html__( 'Services related to this project:', 'lsx-projects' ),
+				'name'         => esc_html__('Services related to this project:', 'lsx-projects'),
 				'id'           => 'page_to_project',
 				'type'         => 'post_search_ajax',
 				'show_in_rest' => true,
 				'limit'        => 15,
 				'sortable'     => true,
 				'query_args'   => array(
-					'post_type'      => array( 'project' ),
-					'post_status'    => array( 'publish' ),
+					'post_type'      => array('project'),
+					'post_status'    => array('publish'),
 					'nopagin'        => true,
 					'posts_per_page' => '50',
 					'orderby'        => 'title',
@@ -302,18 +302,18 @@ 
 			)
 		);
 
-		if ( class_exists( 'LSX_Testimonials' ) ) {
+		if (class_exists('LSX_Testimonials')) {
 			$cmb->add_field(
 				array(
-					'name'         => esc_html__( 'Testimonials related to this project:', 'lsx-projects' ),
+					'name'         => esc_html__('Testimonials related to this project:', 'lsx-projects'),
 					'id'           => 'testimonial_to_project',
 					'type'         => 'post_search_ajax',
 					'show_in_rest' => true,
 					'limit'        => 15,
 					'sortable'     => true,
 					'query_args'   => array(
-						'post_type'      => array( 'testimonial' ),
-						'post_status'    => array( 'publish' ),
+						'post_type'      => array('testimonial'),
+						'post_status'    => array('publish'),
 						'nopagin'        => true,
 						'posts_per_page' => '50',
 						'orderby'        => 'title',
@@ -340,18 +340,18 @@ 
 			)
 		);
 
-		if ( class_exists( 'LSX_Team' ) ) {
+		if (class_exists('LSX_Team')) {
 			$cmb->add_field(
 				array(
-					'name'         => esc_html__( 'Team members involved with this project:', 'lsx-projects' ),
+					'name'         => esc_html__('Team members involved with this project:', 'lsx-projects'),
 					'id'           => 'team_to_project',
 					'type'         => 'post_search_ajax',
 					'show_in_rest' => true,
 					'limit'        => 15,
 					'sortable'     => true,
 					'query_args'   => array(
-						'post_type'      => array( 'team' ),
-						'post_status'    => array( 'publish' ),
+						'post_type'      => array('team'),
+						'post_status'    => array('publish'),
 						'nopagin'        => true,
 						'posts_per_page' => '50',
 						'orderby'        => 'title',
@@ -378,18 +378,18 @@ 
 			)
 		);
 
-		if ( class_exists( 'woocommerce' ) ) {
+		if (class_exists('woocommerce')) {
 			$cmb->add_field(
 				array(
-					'name'         => esc_html__( 'Products used for this project:', 'lsx-projects' ),
+					'name'         => esc_html__('Products used for this project:', 'lsx-projects'),
 					'id'           => 'product_to_project',
 					'type'         => 'post_search_ajax',
 					'show_in_rest' => true,
 					'limit'        => 15,
 					'sortable'     => true,
 					'query_args'   => array(
-						'post_type'      => array( 'product' ),
-						'post_status'    => array( 'publish' ),
+						'post_type'      => array('product'),
+						'post_status'    => array('publish'),
 						'nopagin'        => true,
 						'posts_per_page' => '50',
 						'orderby'        => 'title',
@@ -409,7 +409,7 @@ 
 		$cmb = new_cmb2_box(
 			array(
 				'id'           => $prefix . '_project',
-				'title'        => __( 'General', 'lsx-projects' ),
+				'title'        => __('General', 'lsx-projects'),
 				'object_types' => 'project',
 				'context'      => 'normal',
 				'priority'     => 'low',
@@ -422,9 +422,9 @@ 
 				'id'      => $prefix . '_alt_products',
 				'type'    => 'group',
 				'options' => array(
-					'group_title'   => __( 'Alternative Products', 'lsx-projects' ),
-					'add_button'    => __( 'Add Product', 'lsx-projects' ),
-					'remove_button' => __( 'Remove Product', 'lsx-projects' ),
+					'group_title'   => __('Alternative Products', 'lsx-projects'),
+					'add_button'    => __('Add Product', 'lsx-projects'),
+					'remove_button' => __('Remove Product', 'lsx-projects'),
 					'sortable'      => true,
 				),
 				'classes' => 'lsx-admin-row',
@@ -434,7 +434,7 @@ 
 		$cmb->add_group_field(
 			$tip_group,
 			array(
-				'name'         => esc_html__( 'Alt Product Name:', 'lsx-projects' ),
+				'name'         => esc_html__('Alt Product Name:', 'lsx-projects'),
 				'id'           => $prefix . 'alt_product_title',
 				'type'         => 'text',
 				'show_in_rest' => true,
@@ -444,7 +444,7 @@ 
 		$cmb->add_group_field(
 			$tip_group,
 			array(
-				'name'         => esc_html__( 'Alt Product Link:', 'lsx-projects' ),
+				'name'         => esc_html__('Alt Product Link:', 'lsx-projects'),
 				'id'           => $prefix . 'alt_product_link',
 				'type'         => 'text',
 				'show_in_rest' => true,
@@ -456,7 +456,7 @@ 
 	/**
 	 * Sets up the "post relations".
 	 */
-	public function post_relations( $post_id, $field, $value ) {
+	public function post_relations($post_id, $field, $value) {
 		$connections = array(
 			// 'project_to_project',
 
@@ -473,31 +473,31 @@ 
 			'team_to_project',
 		);
 
-		if ( in_array( $field['id'], $connections ) ) {
-			$this->save_related_post( $connections, $post_id, $field, $value );
+		if (in_array($field['id'], $connections)) {
+			$this->save_related_post($connections, $post_id, $field, $value);
 		}
 	}
 
 	/**
 	 * Save the reverse post relation.
 	 */
-	public function save_related_post( $connections, $post_id, $field, $value ) {
-		$ids = explode( '_to_', $field['id'] );
+	public function save_related_post($connections, $post_id, $field, $value) {
+		$ids = explode('_to_', $field['id']);
 		$relation = $ids[1] . '_to_' . $ids[0];
 
-		if ( in_array( $relation, $connections ) ) {
-			$previous_values = get_post_meta( $post_id, $field['id'], false );
+		if (in_array($relation, $connections)) {
+			$previous_values = get_post_meta($post_id, $field['id'], false);
 
-			if ( ! empty( $previous_values ) ) {
-				foreach ( $previous_values as $v ) {
-					delete_post_meta( $v, $relation, $post_id );
+			if ( ! empty($previous_values)) {
+				foreach ($previous_values as $v) {
+					delete_post_meta($v, $relation, $post_id);
 				}
 			}
 
-			if ( is_array( $value ) ) {
-				foreach ( $value as $v ) {
-					if ( ! empty( $v ) ) {
-						add_post_meta( $v, $relation, $post_id );
+			if (is_array($value)) {
+				foreach ($value as $v) {
+					if ( ! empty($v)) {
+						add_post_meta($v, $relation, $post_id);
 					}
 				}
 			}
@@ -506,30 +506,30 @@ 
 
 	public function assets() {
 		//wp_enqueue_media();
-		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-projects-admin', LSX_PROJECTS_URL . 'assets/js/lsx-projects-admin.min.js', array( 'jquery' ), LSX_PROJECTS_VER, true );
-		wp_enqueue_style( 'lsx-projects-admin', LSX_PROJECTS_URL . 'assets/css/lsx-projects-admin.css', array(), LSX_PROJECTS_VER );
+		wp_enqueue_script('lsx-projects-admin', LSX_PROJECTS_URL . 'assets/js/lsx-projects-admin.min.js', array('jquery'), LSX_PROJECTS_VER, true);
+		wp_enqueue_style('lsx-projects-admin', LSX_PROJECTS_URL . 'assets/css/lsx-projects-admin.css', array(), LSX_PROJECTS_VER);
 	}
 
 	/**
 	 * Change the "Insert into Post" button text when media modal is used for feature images
 	 */
-	public function change_attachment_field_button( $html ) {
-		if ( isset( $_GET['feature_image_text_button'] ) ) {
-			$html = str_replace( 'value="Insert into Post"', sprintf( 'value="%s"', esc_html__( 'Select featured image', 'lsx-projects' ) ), $html );
+	public function change_attachment_field_button($html) {
+		if (isset($_GET['feature_image_text_button'])) {
+			$html = str_replace('value="Insert into Post"', sprintf('value="%s"', esc_html__('Select featured image', 'lsx-projects')), $html);
 		}
 
 		return $html;
 	}
 
-	public function change_title_text( $title ) {
+	public function change_title_text($title) {
 		$screen = get_current_screen();
 
-		if ( 'project' === $screen->post_type ) {
-			$title = esc_attr__( 'Enter project title', 'lsx-projects' );
+		if ('project' === $screen->post_type) {
+			$title = esc_attr__('Enter project title', 'lsx-projects');
 		}
 
 		return $title;

classes/admin/class-settings.php

Indentation +163 added lines, -163 removed lines

@@ -9,168 +9,168 @@
 
 class Settings {
 
-	/**
-	 * Holds class instance
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var      object \lsx_projects\classes\admin\Settings()
-	 */
-	protected static $instance = null;
-
-	/**
-	 * Option key, and option page slug
-	 *
-	 * @var string
-	 */
-	protected $screen_id = 'lsx_projects_settings';
-
-	/**
-	 * Contructor
-	 */
-	public function __construct() {
-		add_action( 'cmb2_admin_init', array( $this, 'register_settings_page' ) );
-		add_action( 'lsx_projects_settings_page', array( $this, 'general_settings' ), 1, 1 );
-		add_action( 'lsx_projects_settings_page', array( $this, 'contact_modal_settings' ), 1, 1 );
-	}
-
-	/**
-	 * Return an instance of this class.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return    object Settings()    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;
-	}
-
-	/**
-	 * Hook in and register a submenu options page for the Page post-type menu.
-	 */
-	public function register_settings_page() {
-		$cmb = new_cmb2_box(
-			array(
-				'id'           => $this->screen_id,
-				'title'        => esc_html__( 'Settings', 'lsx-projects' ),
-				'object_types' => array( 'options-page' ),
-				'option_key'   => 'lsx_projects_options', // The option key and admin menu page slug.
-				'parent_slug'  => 'edit.php?post_type=project', // Make options page a submenu item of the themes menu.
-				'capability'   => 'manage_options', // Cap required to view options-page.
-			)
-		);
-		do_action( 'lsx_projects_settings_page', $cmb );
-	}
-
-	/**
-	 * Registers the general settings.
-	 *
-	 * @param object $cmb new_cmb2_box().
-	 * @return void
-	 */
-	public function general_settings( $cmb ) {
-		$cmb->add_field(
-			array(
-				'id'      => 'settings_general_title',
-				'type'    => 'title',
-				'name'    => __( 'General', 'lsx-projects' ),
-				'default' => __( 'General', 'lsx-projects' ),
-			)
-		);
-		$cmb->add_field(
-			array(
-				'name'        => __( 'Disable Single Posts', 'lsx-projects' ),
-				'id'          => 'projects_disable_single',
-				'type'        => 'checkbox',
-				'value'       => 1,
-				'default'     => 0,
-				'description' => __( 'Disable Single Posts.', 'lsx-projects' ),
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'name'    => 'Placeholder',
-				'desc'    => __( 'Choose Image.', 'lsx-projects' ),
-				'id'      => 'projects_placeholder',
-				'type'    => 'file',
-				'options' => array(
-					'url' => false, // Hide the text input for the url.
-				),
-				'text'    => array(
-					'add_upload_file_text' => 'Choose Image',
-				),
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'id'   => 'settings_general_closing',
-				'type' => 'tab_closing',
-			)
-		);
-	}
-
-	/**
-	 * Registers the Contact modal settings.
-	 *
-	 * @param object $cmb new_cmb2_box().
-	 * @return void
-	 */
-	public function contact_modal_settings( $cmb ) {
-		$cmb->add_field(
-			array(
-				'id'   => 'settings_contact_modal_title',
-				'type' => 'title',
-				'name' => __( 'Contact modal', 'lsx-projects' ),
-				'description' => __( 'Displays contact modal on project single if there is a linked Caldera or WPform.', 'lsx-projects' ),
-			)
-		);
-		$cmb->add_field(
-			array(
-				'name'        => __( 'Enable contact modal', 'lsx-projects' ),
-				'id'          => 'projects_modal_enable',
-				'type'        => 'checkbox',
-				'value'       => 1,
-				'default'     => 0,
-				'description' => __( 'Displays contact modal on project single.', 'lsx-projects' ),
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'name' => __( 'Button label', 'lsx-projects' ),
-				'id'   => 'projects_modal_cta_label',
-				'type' => 'text',
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'name' => __( 'Caldera Form ID (if enabled)', 'lsx-projects' ),
-				'id'   => 'projects_modal_form_id',
-				'type' => 'text',
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'name' => __( 'WPForm ID (if enabled)', 'lsx-projects' ),
-				'id'   => 'projects_wpform_modal_form_id',
-				'type' => 'text',
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'id'   => 'settings_contact_modal_closing',
-				'type' => 'tab_closing',
-			)
-		);
-	}
+     /**
+      * Holds class instance
+      *
+      * @since 1.0.0
+      *
+      * @var      object \lsx_projects\classes\admin\Settings()
+      */
+     protected static $instance = null;
+
+     /**
+      * Option key, and option page slug
+      *
+      * @var string
+      */
+     protected $screen_id = 'lsx_projects_settings';
+
+     /**
+      * Contructor
+      */
+     public function __construct() {
+          add_action( 'cmb2_admin_init', array( $this, 'register_settings_page' ) );
+          add_action( 'lsx_projects_settings_page', array( $this, 'general_settings' ), 1, 1 );
+          add_action( 'lsx_projects_settings_page', array( $this, 'contact_modal_settings' ), 1, 1 );
+     }
+
+     /**
+      * Return an instance of this class.
+      *
+      * @since 1.0.0
+      *
+      * @return    object Settings()    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;
+     }
+
+     /**
+      * Hook in and register a submenu options page for the Page post-type menu.
+      */
+     public function register_settings_page() {
+          $cmb = new_cmb2_box(
+               array(
+                    'id'           => $this->screen_id,
+                    'title'        => esc_html__( 'Settings', 'lsx-projects' ),
+                    'object_types' => array( 'options-page' ),
+                    'option_key'   => 'lsx_projects_options', // The option key and admin menu page slug.
+                    'parent_slug'  => 'edit.php?post_type=project', // Make options page a submenu item of the themes menu.
+                    'capability'   => 'manage_options', // Cap required to view options-page.
+               )
+          );
+          do_action( 'lsx_projects_settings_page', $cmb );
+     }
+
+     /**
+      * Registers the general settings.
+      *
+      * @param object $cmb new_cmb2_box().
+      * @return void
+      */
+     public function general_settings( $cmb ) {
+          $cmb->add_field(
+               array(
+                    'id'      => 'settings_general_title',
+                    'type'    => 'title',
+                    'name'    => __( 'General', 'lsx-projects' ),
+                    'default' => __( 'General', 'lsx-projects' ),
+               )
+          );
+          $cmb->add_field(
+               array(
+                    'name'        => __( 'Disable Single Posts', 'lsx-projects' ),
+                    'id'          => 'projects_disable_single',
+                    'type'        => 'checkbox',
+                    'value'       => 1,
+                    'default'     => 0,
+                    'description' => __( 'Disable Single Posts.', 'lsx-projects' ),
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'name'    => 'Placeholder',
+                    'desc'    => __( 'Choose Image.', 'lsx-projects' ),
+                    'id'      => 'projects_placeholder',
+                    'type'    => 'file',
+                    'options' => array(
+                         'url' => false, // Hide the text input for the url.
+                    ),
+                    'text'    => array(
+                         'add_upload_file_text' => 'Choose Image',
+                    ),
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'id'   => 'settings_general_closing',
+                    'type' => 'tab_closing',
+               )
+          );
+     }
+
+     /**
+      * Registers the Contact modal settings.
+      *
+      * @param object $cmb new_cmb2_box().
+      * @return void
+      */
+     public function contact_modal_settings( $cmb ) {
+          $cmb->add_field(
+               array(
+                    'id'   => 'settings_contact_modal_title',
+                    'type' => 'title',
+                    'name' => __( 'Contact modal', 'lsx-projects' ),
+                    'description' => __( 'Displays contact modal on project single if there is a linked Caldera or WPform.', 'lsx-projects' ),
+               )
+          );
+          $cmb->add_field(
+               array(
+                    'name'        => __( 'Enable contact modal', 'lsx-projects' ),
+                    'id'          => 'projects_modal_enable',
+                    'type'        => 'checkbox',
+                    'value'       => 1,
+                    'default'     => 0,
+                    'description' => __( 'Displays contact modal on project single.', 'lsx-projects' ),
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'name' => __( 'Button label', 'lsx-projects' ),
+                    'id'   => 'projects_modal_cta_label',
+                    'type' => 'text',
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'name' => __( 'Caldera Form ID (if enabled)', 'lsx-projects' ),
+                    'id'   => 'projects_modal_form_id',
+                    'type' => 'text',
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'name' => __( 'WPForm ID (if enabled)', 'lsx-projects' ),
+                    'id'   => 'projects_wpform_modal_form_id',
+                    'type' => 'text',
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'id'   => 'settings_contact_modal_closing',
+                    'type' => 'tab_closing',
+               )
+          );
+     }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -29,9 +29,9 @@ 
 	 * Contructor
 	 */
 	public function __construct() {
-		add_action( 'cmb2_admin_init', array( $this, 'register_settings_page' ) );
-		add_action( 'lsx_projects_settings_page', array( $this, 'general_settings' ), 1, 1 );
-		add_action( 'lsx_projects_settings_page', array( $this, 'contact_modal_settings' ), 1, 1 );
+		add_action('cmb2_admin_init', array($this, 'register_settings_page'));
+		add_action('lsx_projects_settings_page', array($this, 'general_settings'), 1, 1);
+		add_action('lsx_projects_settings_page', array($this, 'contact_modal_settings'), 1, 1);
 	}
 
 	/**
@@ -43,7 +43,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;
@@ -56,14 +56,14 @@ 
 		$cmb = new_cmb2_box(
 			array(
 				'id'           => $this->screen_id,
-				'title'        => esc_html__( 'Settings', 'lsx-projects' ),
-				'object_types' => array( 'options-page' ),
+				'title'        => esc_html__('Settings', 'lsx-projects'),
+				'object_types' => array('options-page'),
 				'option_key'   => 'lsx_projects_options', // The option key and admin menu page slug.
 				'parent_slug'  => 'edit.php?post_type=project', // Make options page a submenu item of the themes menu.
 				'capability'   => 'manage_options', // Cap required to view options-page.
 			)
 		);
-		do_action( 'lsx_projects_settings_page', $cmb );
+		do_action('lsx_projects_settings_page', $cmb);
 	}
 
 	/**
@@ -72,30 +72,30 @@ 
 	 * @param object $cmb new_cmb2_box().
 	 * @return void
 	 */
-	public function general_settings( $cmb ) {
+	public function general_settings($cmb) {
 		$cmb->add_field(
 			array(
 				'id'      => 'settings_general_title',
 				'type'    => 'title',
-				'name'    => __( 'General', 'lsx-projects' ),
-				'default' => __( 'General', 'lsx-projects' ),
+				'name'    => __('General', 'lsx-projects'),
+				'default' => __('General', 'lsx-projects'),
 			)
 		);
 		$cmb->add_field(
 			array(
-				'name'        => __( 'Disable Single Posts', 'lsx-projects' ),
+				'name'        => __('Disable Single Posts', 'lsx-projects'),
 				'id'          => 'projects_disable_single',
 				'type'        => 'checkbox',
 				'value'       => 1,
 				'default'     => 0,
-				'description' => __( 'Disable Single Posts.', 'lsx-projects' ),
+				'description' => __('Disable Single Posts.', 'lsx-projects'),
 			)
 		);
 
 		$cmb->add_field(
 			array(
 				'name'    => 'Placeholder',
-				'desc'    => __( 'Choose Image.', 'lsx-projects' ),
+				'desc'    => __('Choose Image.', 'lsx-projects'),
 				'id'      => 'projects_placeholder',
 				'type'    => 'file',
 				'options' => array(
@@ -121,29 +121,29 @@ 
 	 * @param object $cmb new_cmb2_box().
 	 * @return void
 	 */
-	public function contact_modal_settings( $cmb ) {
+	public function contact_modal_settings($cmb) {
 		$cmb->add_field(
 			array(
 				'id'   => 'settings_contact_modal_title',
 				'type' => 'title',
-				'name' => __( 'Contact modal', 'lsx-projects' ),
-				'description' => __( 'Displays contact modal on project single if there is a linked Caldera or WPform.', 'lsx-projects' ),
+				'name' => __('Contact modal', 'lsx-projects'),
+				'description' => __('Displays contact modal on project single if there is a linked Caldera or WPform.', 'lsx-projects'),
 			)
 		);
 		$cmb->add_field(
 			array(
-				'name'        => __( 'Enable contact modal', 'lsx-projects' ),
+				'name'        => __('Enable contact modal', 'lsx-projects'),
 				'id'          => 'projects_modal_enable',
 				'type'        => 'checkbox',
 				'value'       => 1,
 				'default'     => 0,
-				'description' => __( 'Displays contact modal on project single.', 'lsx-projects' ),
+				'description' => __('Displays contact modal on project single.', 'lsx-projects'),
 			)
 		);
 
 		$cmb->add_field(
 			array(
-				'name' => __( 'Button label', 'lsx-projects' ),
+				'name' => __('Button label', 'lsx-projects'),
 				'id'   => 'projects_modal_cta_label',
 				'type' => 'text',
 			)
@@ -151,7 +151,7 @@ 
 
 		$cmb->add_field(
 			array(
-				'name' => __( 'Caldera Form ID (if enabled)', 'lsx-projects' ),
+				'name' => __('Caldera Form ID (if enabled)', 'lsx-projects'),
 				'id'   => 'projects_modal_form_id',
 				'type' => 'text',
 			)
@@ -159,7 +159,7 @@ 
 
 		$cmb->add_field(
 			array(
-				'name' => __( 'WPForm ID (if enabled)', 'lsx-projects' ),
+				'name' => __('WPForm ID (if enabled)', 'lsx-projects'),
 				'id'   => 'projects_wpform_modal_form_id',
 				'type' => 'text',
 			)

classes/class-lsx-projects-frontend.php

Indentation +213 added lines, -213 removed lines

@@ -10,115 +10,115 @@ 
  */
 class LSX_Projects_Frontend {
 
-	public function __construct() {
-		$this->options = projects_get_options();
-
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5 );
-		add_filter( 'wp_kses_allowed_html', array( $this, 'wp_kses_allowed_html' ), 10, 2 );
-		add_filter( 'template_include', array( $this, 'single_template_include' ), 99 );
-		add_filter( 'template_include', array( $this, 'archive_template_include' ), 99 );
-
-		if ( ! empty( $this->options['display']['projects_disable_single'] ) ) {
-			add_action( 'template_redirect', array( $this, 'disable_single' ) );
-		}
-
-		if ( is_admin() ) {
-			add_filter( 'lsx_customizer_colour_selectors_body', array( $this, 'customizer_body_colours_handler' ), 15, 2 );
-		}
-
-		add_filter( 'lsx_banner_title', array( $this, 'lsx_banner_archive_title' ), 15 );
-
-		add_filter( 'excerpt_more_p', array( $this, 'change_excerpt_more' ) );
-		add_filter( 'excerpt_length', array( $this, 'change_excerpt_length' ) );
-		add_filter( 'excerpt_strip_tags', array( $this, 'change_excerpt_strip_tags' ) );
-
-		add_filter( 'pre_get_posts', array( $this, 'posts_per_page' ) );
-		add_action( 'wp_footer', array( $this, 'add_form_modal' ) );
-	}
-
-	public function enqueue_scripts() {
-		$has_slick = wp_script_is( 'slick', 'queue' );
-
-		if ( ! $has_slick ) {
-			wp_enqueue_style( 'slick', LSX_PROJECTS_URL . 'assets/css/vendor/slick.css', array(), LSX_PROJECTS_VER, null );
-			wp_enqueue_script( 'slick', LSX_PROJECTS_URL . 'assets/js/vendor/slick.min.js', array( 'jquery' ), null, LSX_PROJECTS_VER, true );
-		}
-
-		$has_scrolltofixed = wp_script_is( 'scrolltofixed', 'queue' );
-
-		if ( ! $has_scrolltofixed ) {
-			wp_enqueue_script( 'scrolltofixed', LSX_PROJECTS_URL . 'assets/js/vendor/jquery-scrolltofixed-min.js', array( 'jquery' ), null, LSX_PROJECTS_VER, true );
-		}
-
-		$has_isotope = wp_script_is( 'isotope', 'queue' );
-
-		if ( ! $has_isotope ) {
-			wp_enqueue_script( 'isotope', LSX_PROJECTS_URL . 'assets/js/vendor/isotope.pkgd.min.js', array( 'jquery' ), null, LSX_PROJECTS_VER, true );
-		}
-
-		wp_enqueue_script( 'lsx-projects', LSX_PROJECTS_URL . 'assets/js/lsx-projects.min.js', array( 'jquery', 'slick', 'scrolltofixed', 'isotope' ), LSX_PROJECTS_VER, true );
-
-		$params = apply_filters( 'lsx_projects_js_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ),
-		));
-
-		wp_localize_script( 'lsx-projects', 'lsx_customizer_params', $params );
-
-		wp_enqueue_style( 'lsx-projects', LSX_PROJECTS_URL . 'assets/css/lsx-projects.css', array(), LSX_PROJECTS_VER );
-		wp_style_add_data( 'lsx-projects', 'rtl', 'replace' );
-	}
-
-	/**
-	 * Allow data params for Slick slider addon.
-	 */
-	public function wp_kses_allowed_html( $allowedtags, $context ) {
-		$allowedtags['div']['data-slick'] = true;
-		return $allowedtags;
-	}
-
-	/**
-	 * Single template.
-	 */
-	public function single_template_include( $template ) {
-		if ( is_main_query() && is_singular( 'project' ) ) {
-			if ( empty( locate_template( array( 'single-projects.php' ) ) ) && file_exists( LSX_PROJECTS_PATH . 'templates/single-projects.php' ) ) {
-				$template = LSX_PROJECTS_PATH . 'templates/single-projects.php';
-			}
-		}
-
-		return $template;
-	}
-
-	/**
-	 * Archive template.
-	 */
-	public function archive_template_include( $template ) {
-		if ( is_main_query() && ( is_post_type_archive( 'project' ) || is_tax( 'project-group' ) ) ) {
-			if ( empty( locate_template( array( 'archive-projects.php' ) ) ) && file_exists( LSX_PROJECTS_PATH . 'templates/archive-projects.php' ) ) {
-				$template = LSX_PROJECTS_PATH . 'templates/archive-projects.php';
-			}
-		}
-
-		return $template;
-	}
-
-	/**
-	 * Removes access to single project member posts.
-	 */
-	public function disable_single() {
-		$queried_post_type = get_query_var( 'post_type' );
-
-		if ( is_single() && 'project' === $queried_post_type ) {
-			wp_redirect( home_url(), 301 );
-			exit;
-		}
-	}
-
-	/**
-	 * Handle body colours that might be change by LSX Customiser
-	 */
-	public function customizer_body_colours_handler( $css, $colors ) {
-		$css .= '
+     public function __construct() {
+          $this->options = projects_get_options();
+
+          add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5 );
+          add_filter( 'wp_kses_allowed_html', array( $this, 'wp_kses_allowed_html' ), 10, 2 );
+          add_filter( 'template_include', array( $this, 'single_template_include' ), 99 );
+          add_filter( 'template_include', array( $this, 'archive_template_include' ), 99 );
+
+          if ( ! empty( $this->options['display']['projects_disable_single'] ) ) {
+               add_action( 'template_redirect', array( $this, 'disable_single' ) );
+          }
+
+          if ( is_admin() ) {
+               add_filter( 'lsx_customizer_colour_selectors_body', array( $this, 'customizer_body_colours_handler' ), 15, 2 );
+          }
+
+          add_filter( 'lsx_banner_title', array( $this, 'lsx_banner_archive_title' ), 15 );
+
+          add_filter( 'excerpt_more_p', array( $this, 'change_excerpt_more' ) );
+          add_filter( 'excerpt_length', array( $this, 'change_excerpt_length' ) );
+          add_filter( 'excerpt_strip_tags', array( $this, 'change_excerpt_strip_tags' ) );
+
+          add_filter( 'pre_get_posts', array( $this, 'posts_per_page' ) );
+          add_action( 'wp_footer', array( $this, 'add_form_modal' ) );
+     }
+
+     public function enqueue_scripts() {
+          $has_slick = wp_script_is( 'slick', 'queue' );
+
+          if ( ! $has_slick ) {
+               wp_enqueue_style( 'slick', LSX_PROJECTS_URL . 'assets/css/vendor/slick.css', array(), LSX_PROJECTS_VER, null );
+               wp_enqueue_script( 'slick', LSX_PROJECTS_URL . 'assets/js/vendor/slick.min.js', array( 'jquery' ), null, LSX_PROJECTS_VER, true );
+          }
+
+          $has_scrolltofixed = wp_script_is( 'scrolltofixed', 'queue' );
+
+          if ( ! $has_scrolltofixed ) {
+               wp_enqueue_script( 'scrolltofixed', LSX_PROJECTS_URL . 'assets/js/vendor/jquery-scrolltofixed-min.js', array( 'jquery' ), null, LSX_PROJECTS_VER, true );
+          }
+
+          $has_isotope = wp_script_is( 'isotope', 'queue' );
+
+          if ( ! $has_isotope ) {
+               wp_enqueue_script( 'isotope', LSX_PROJECTS_URL . 'assets/js/vendor/isotope.pkgd.min.js', array( 'jquery' ), null, LSX_PROJECTS_VER, true );
+          }
+
+          wp_enqueue_script( 'lsx-projects', LSX_PROJECTS_URL . 'assets/js/lsx-projects.min.js', array( 'jquery', 'slick', 'scrolltofixed', 'isotope' ), LSX_PROJECTS_VER, true );
+
+          $params = apply_filters( 'lsx_projects_js_params', array(
+               'ajax_url' => admin_url( 'admin-ajax.php' ),
+          ));
+
+          wp_localize_script( 'lsx-projects', 'lsx_customizer_params', $params );
+
+          wp_enqueue_style( 'lsx-projects', LSX_PROJECTS_URL . 'assets/css/lsx-projects.css', array(), LSX_PROJECTS_VER );
+          wp_style_add_data( 'lsx-projects', 'rtl', 'replace' );
+     }
+
+     /**
+      * Allow data params for Slick slider addon.
+      */
+     public function wp_kses_allowed_html( $allowedtags, $context ) {
+          $allowedtags['div']['data-slick'] = true;
+          return $allowedtags;
+     }
+
+     /**
+      * Single template.
+      */
+     public function single_template_include( $template ) {
+          if ( is_main_query() && is_singular( 'project' ) ) {
+               if ( empty( locate_template( array( 'single-projects.php' ) ) ) && file_exists( LSX_PROJECTS_PATH . 'templates/single-projects.php' ) ) {
+                    $template = LSX_PROJECTS_PATH . 'templates/single-projects.php';
+               }
+          }
+
+          return $template;
+     }
+
+     /**
+      * Archive template.
+      */
+     public function archive_template_include( $template ) {
+          if ( is_main_query() && ( is_post_type_archive( 'project' ) || is_tax( 'project-group' ) ) ) {
+               if ( empty( locate_template( array( 'archive-projects.php' ) ) ) && file_exists( LSX_PROJECTS_PATH . 'templates/archive-projects.php' ) ) {
+                    $template = LSX_PROJECTS_PATH . 'templates/archive-projects.php';
+               }
+          }
+
+          return $template;
+     }
+
+     /**
+      * Removes access to single project member posts.
+      */
+     public function disable_single() {
+          $queried_post_type = get_query_var( 'post_type' );
+
+          if ( is_single() && 'project' === $queried_post_type ) {
+               wp_redirect( home_url(), 301 );
+               exit;
+          }
+     }
+
+     /**
+      * Handle body colours that might be change by LSX Customiser
+      */
+     public function customizer_body_colours_handler( $css, $colors ) {
+          $css .= '
 			@import "' . LSX_PROJECTS_PATH . '/assets/css/scss/customizer-projects-body-colours";
 
 			/**
@@ -134,104 +134,104 @@ 
 			);
 		';
 
-		return $css;
-	}
-
-	/**
-	 * Change the LSX Banners title for project archive.
-	 */
-	public function lsx_banner_archive_title( $title ) {
-		if ( is_main_query() && is_post_type_archive( 'project' ) ) {
-			$title = '<h1 class="page-title">' . esc_html__( 'Portfolio', 'lsx-projects' ) . '</h1>';
-		}
-
-		if ( is_main_query() && is_tax( 'project-group' ) ) {
-			$tax = get_queried_object();
-			$title = '<h1 class="page-title">' . esc_html__( 'Project Type', 'lsx-projects' ) . ': ' . apply_filters( 'the_title', $tax->name ) . '</h1>';
-		}
-
-		return $title;
-	}
-
-	/**
-	 * Remove the "continue reading" when the single is disabled.
-	 */
-	public function change_excerpt_more( $excerpt_more ) {
-		global $post;
-
-		if ( 'project' === $post->post_type ) {
-			if ( ! empty( $this->options['display']['projects_disable_single'] ) ) {
-				$excerpt_more = '';
-			}
-		}
-
-		return $excerpt_more;
-	}
-
-	/**
-	 * Change the word count when crop the content to excerpt (homepage widget).
-	 */
-	public function change_excerpt_length( $excerpt_word_count ) {
-		global $post;
-
-		if ( is_front_page() && 'project' === $post->post_type ) {
-			$excerpt_word_count = 20;
-		}
-
-		if ( is_singular( 'project' ) && ( 'team' === $post->post_type || 'testimonial' === $post->post_type ) ) {
-			$excerpt_word_count = 20;
-		}
-
-		return $excerpt_word_count;
-	}
-
-	/**
-	 * Change the allowed tags crop the content to excerpt (homepage widget).
-	 */
-	public function change_excerpt_strip_tags( $allowed_tags ) {
-		global $post;
-
-		if ( is_front_page() && 'project' === $post->post_type ) {
-			$allowed_tags = '<p>,<br>,<b>,<strong>,<i>,<u>,<ul>,<ol>,<li>,<span>';
-		}
-
-		if ( is_singular( 'project' ) && ( 'team' === $post->post_type || 'testimonial' === $post->post_type ) ) {
-			$allowed_tags = '<p>,<br>,<b>,<strong>,<i>,<u>,<ul>,<ol>,<li>,<span>';
-		}
-
-		return $allowed_tags;
-	}
-
-	/**
-	 * Change posts per page counter for archive.
-	 */
-	public function posts_per_page( $query ) {
-		if ( ! is_admin() && $query->is_main_query() ) {
-			if ( $query->is_post_type_archive( 'project' ) || $query->is_tax( 'project-group' ) ) {
-				$query->set( 'posts_per_page', -1 );
-			}
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Add form modal
-	 */
-	public function add_form_modal() {
-
-		if ( empty( $this->options['display']['projects_modal_enable'] ) ) {
-			return '';
-		}
-
-		if ( empty( $this->options['display']['projects_modal_cta_label'] ) || empty( $this->options['display']['projects_modal_form_id'] ) || empty( $this->options['display']['projects_wpform_modal_form_id'] ) ) {
-			return '';
-		}
-
-		if ( ! is_singular( 'project' ) ) {
-			return '';
-		}
-		?>
+          return $css;
+     }
+
+     /**
+      * Change the LSX Banners title for project archive.
+      */
+     public function lsx_banner_archive_title( $title ) {
+          if ( is_main_query() && is_post_type_archive( 'project' ) ) {
+               $title = '<h1 class="page-title">' . esc_html__( 'Portfolio', 'lsx-projects' ) . '</h1>';
+          }
+
+          if ( is_main_query() && is_tax( 'project-group' ) ) {
+               $tax = get_queried_object();
+               $title = '<h1 class="page-title">' . esc_html__( 'Project Type', 'lsx-projects' ) . ': ' . apply_filters( 'the_title', $tax->name ) . '</h1>';
+          }
+
+          return $title;
+     }
+
+     /**
+      * Remove the "continue reading" when the single is disabled.
+      */
+     public function change_excerpt_more( $excerpt_more ) {
+          global $post;
+
+          if ( 'project' === $post->post_type ) {
+               if ( ! empty( $this->options['display']['projects_disable_single'] ) ) {
+                    $excerpt_more = '';
+               }
+          }
+
+          return $excerpt_more;
+     }
+
+     /**
+      * Change the word count when crop the content to excerpt (homepage widget).
+      */
+     public function change_excerpt_length( $excerpt_word_count ) {
+          global $post;
+
+          if ( is_front_page() && 'project' === $post->post_type ) {
+               $excerpt_word_count = 20;
+          }
+
+          if ( is_singular( 'project' ) && ( 'team' === $post->post_type || 'testimonial' === $post->post_type ) ) {
+               $excerpt_word_count = 20;
+          }
+
+          return $excerpt_word_count;
+     }
+
+     /**
+      * Change the allowed tags crop the content to excerpt (homepage widget).
+      */
+     public function change_excerpt_strip_tags( $allowed_tags ) {
+          global $post;
+
+          if ( is_front_page() && 'project' === $post->post_type ) {
+               $allowed_tags = '<p>,<br>,<b>,<strong>,<i>,<u>,<ul>,<ol>,<li>,<span>';
+          }
+
+          if ( is_singular( 'project' ) && ( 'team' === $post->post_type || 'testimonial' === $post->post_type ) ) {
+               $allowed_tags = '<p>,<br>,<b>,<strong>,<i>,<u>,<ul>,<ol>,<li>,<span>';
+          }
+
+          return $allowed_tags;
+     }
+
+     /**
+      * Change posts per page counter for archive.
+      */
+     public function posts_per_page( $query ) {
+          if ( ! is_admin() && $query->is_main_query() ) {
+               if ( $query->is_post_type_archive( 'project' ) || $query->is_tax( 'project-group' ) ) {
+                    $query->set( 'posts_per_page', -1 );
+               }
+          }
+
+          return $query;
+     }
+
+     /**
+      * Add form modal
+      */
+     public function add_form_modal() {
+
+          if ( empty( $this->options['display']['projects_modal_enable'] ) ) {
+               return '';
+          }
+
+          if ( empty( $this->options['display']['projects_modal_cta_label'] ) || empty( $this->options['display']['projects_modal_form_id'] ) || empty( $this->options['display']['projects_wpform_modal_form_id'] ) ) {
+               return '';
+          }
+
+          if ( ! is_singular( 'project' ) ) {
+               return '';
+          }
+          ?>
 		<div class="lsx-modal modal fade" id="lsx-project-contact" role="dialog">
 			<div class="modal-dialog">
 				<div class="modal-content">
@@ -243,17 +243,17 @@ 
 
 					<div class="modal-body">
 						<?php
-						if ( ! empty( $this->options['display']['projects_modal_form_id'] ) ) {
-							echo do_shortcode( '[caldera_form id="' . $this->options['display']['projects_modal_form_id'] . '"]' );
-						} elseif ( ! empty( $this->options['display']['projects_wpform_modal_form_id'] ) ) {
-							echo do_shortcode( '[wpforms id="' . $this->options['display']['projects_wpform_modal_form_id'] . '"]' );
-						} ?>
+                              if ( ! empty( $this->options['display']['projects_modal_form_id'] ) ) {
+                                   echo do_shortcode( '[caldera_form id="' . $this->options['display']['projects_modal_form_id'] . '"]' );
+                              } elseif ( ! empty( $this->options['display']['projects_wpform_modal_form_id'] ) ) {
+                                   echo do_shortcode( '[wpforms id="' . $this->options['display']['projects_wpform_modal_form_id'] . '"]' );
+                              } ?>
 					</div>
 				</div>
 			</div>
 		</div>
 		<?php
-	}
+     }
 
 }
 

Spacing +67 added lines, -67 removed lines

@@ -13,65 +13,65 @@ 
 	public function __construct() {
 		$this->options = projects_get_options();
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5 );
-		add_filter( 'wp_kses_allowed_html', array( $this, 'wp_kses_allowed_html' ), 10, 2 );
-		add_filter( 'template_include', array( $this, 'single_template_include' ), 99 );
-		add_filter( 'template_include', array( $this, 'archive_template_include' ), 99 );
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'), 5);
+		add_filter('wp_kses_allowed_html', array($this, 'wp_kses_allowed_html'), 10, 2);
+		add_filter('template_include', array($this, 'single_template_include'), 99);
+		add_filter('template_include', array($this, 'archive_template_include'), 99);
 
-		if ( ! empty( $this->options['display']['projects_disable_single'] ) ) {
-			add_action( 'template_redirect', array( $this, 'disable_single' ) );
+		if ( ! empty($this->options['display']['projects_disable_single'])) {
+			add_action('template_redirect', array($this, 'disable_single'));
 		}
 
-		if ( is_admin() ) {
-			add_filter( 'lsx_customizer_colour_selectors_body', array( $this, 'customizer_body_colours_handler' ), 15, 2 );
+		if (is_admin()) {
+			add_filter('lsx_customizer_colour_selectors_body', array($this, 'customizer_body_colours_handler'), 15, 2);
 		}
 
-		add_filter( 'lsx_banner_title', array( $this, 'lsx_banner_archive_title' ), 15 );
+		add_filter('lsx_banner_title', array($this, 'lsx_banner_archive_title'), 15);
 
-		add_filter( 'excerpt_more_p', array( $this, 'change_excerpt_more' ) );
-		add_filter( 'excerpt_length', array( $this, 'change_excerpt_length' ) );
-		add_filter( 'excerpt_strip_tags', array( $this, 'change_excerpt_strip_tags' ) );
+		add_filter('excerpt_more_p', array($this, 'change_excerpt_more'));
+		add_filter('excerpt_length', array($this, 'change_excerpt_length'));
+		add_filter('excerpt_strip_tags', array($this, 'change_excerpt_strip_tags'));
 
-		add_filter( 'pre_get_posts', array( $this, 'posts_per_page' ) );
-		add_action( 'wp_footer', array( $this, 'add_form_modal' ) );
+		add_filter('pre_get_posts', array($this, 'posts_per_page'));
+		add_action('wp_footer', array($this, 'add_form_modal'));
 	}
 
 	public function enqueue_scripts() {
-		$has_slick = wp_script_is( 'slick', 'queue' );
+		$has_slick = wp_script_is('slick', 'queue');
 
-		if ( ! $has_slick ) {
-			wp_enqueue_style( 'slick', LSX_PROJECTS_URL . 'assets/css/vendor/slick.css', array(), LSX_PROJECTS_VER, null );
-			wp_enqueue_script( 'slick', LSX_PROJECTS_URL . 'assets/js/vendor/slick.min.js', array( 'jquery' ), null, LSX_PROJECTS_VER, true );
+		if ( ! $has_slick) {
+			wp_enqueue_style('slick', LSX_PROJECTS_URL . 'assets/css/vendor/slick.css', array(), LSX_PROJECTS_VER, null);
+			wp_enqueue_script('slick', LSX_PROJECTS_URL . 'assets/js/vendor/slick.min.js', array('jquery'), null, LSX_PROJECTS_VER, true);
 		}
 
-		$has_scrolltofixed = wp_script_is( 'scrolltofixed', 'queue' );
+		$has_scrolltofixed = wp_script_is('scrolltofixed', 'queue');
 
-		if ( ! $has_scrolltofixed ) {
-			wp_enqueue_script( 'scrolltofixed', LSX_PROJECTS_URL . 'assets/js/vendor/jquery-scrolltofixed-min.js', array( 'jquery' ), null, LSX_PROJECTS_VER, true );
+		if ( ! $has_scrolltofixed) {
+			wp_enqueue_script('scrolltofixed', LSX_PROJECTS_URL . 'assets/js/vendor/jquery-scrolltofixed-min.js', array('jquery'), null, LSX_PROJECTS_VER, true);
 		}
 
-		$has_isotope = wp_script_is( 'isotope', 'queue' );
+		$has_isotope = wp_script_is('isotope', 'queue');
 
-		if ( ! $has_isotope ) {
-			wp_enqueue_script( 'isotope', LSX_PROJECTS_URL . 'assets/js/vendor/isotope.pkgd.min.js', array( 'jquery' ), null, LSX_PROJECTS_VER, true );
+		if ( ! $has_isotope) {
+			wp_enqueue_script('isotope', LSX_PROJECTS_URL . 'assets/js/vendor/isotope.pkgd.min.js', array('jquery'), null, LSX_PROJECTS_VER, true);
 		}
 
-		wp_enqueue_script( 'lsx-projects', LSX_PROJECTS_URL . 'assets/js/lsx-projects.min.js', array( 'jquery', 'slick', 'scrolltofixed', 'isotope' ), LSX_PROJECTS_VER, true );
+		wp_enqueue_script('lsx-projects', LSX_PROJECTS_URL . 'assets/js/lsx-projects.min.js', array('jquery', 'slick', 'scrolltofixed', 'isotope'), LSX_PROJECTS_VER, true);
 
-		$params = apply_filters( 'lsx_projects_js_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ),
+		$params = apply_filters('lsx_projects_js_params', array(
+			'ajax_url' => admin_url('admin-ajax.php'),
 		));
 
-		wp_localize_script( 'lsx-projects', 'lsx_customizer_params', $params );
+		wp_localize_script('lsx-projects', 'lsx_customizer_params', $params);
 
-		wp_enqueue_style( 'lsx-projects', LSX_PROJECTS_URL . 'assets/css/lsx-projects.css', array(), LSX_PROJECTS_VER );
-		wp_style_add_data( 'lsx-projects', 'rtl', 'replace' );
+		wp_enqueue_style('lsx-projects', LSX_PROJECTS_URL . 'assets/css/lsx-projects.css', array(), LSX_PROJECTS_VER);
+		wp_style_add_data('lsx-projects', 'rtl', 'replace');
 	}
 
 	/**
 	 * Allow data params for Slick slider addon.
 	 */
-	public function wp_kses_allowed_html( $allowedtags, $context ) {
+	public function wp_kses_allowed_html($allowedtags, $context) {
 		$allowedtags['div']['data-slick'] = true;
 		return $allowedtags;
 	}
@@ -79,9 +79,9 @@ 
 	/**
 	 * Single template.
 	 */
-	public function single_template_include( $template ) {
-		if ( is_main_query() && is_singular( 'project' ) ) {
-			if ( empty( locate_template( array( 'single-projects.php' ) ) ) && file_exists( LSX_PROJECTS_PATH . 'templates/single-projects.php' ) ) {
+	public function single_template_include($template) {
+		if (is_main_query() && is_singular('project')) {
+			if (empty(locate_template(array('single-projects.php'))) && file_exists(LSX_PROJECTS_PATH . 'templates/single-projects.php')) {
 				$template = LSX_PROJECTS_PATH . 'templates/single-projects.php';
 			}
 		}
@@ -92,9 +92,9 @@ 
 	/**
 	 * Archive template.
 	 */
-	public function archive_template_include( $template ) {
-		if ( is_main_query() && ( is_post_type_archive( 'project' ) || is_tax( 'project-group' ) ) ) {
-			if ( empty( locate_template( array( 'archive-projects.php' ) ) ) && file_exists( LSX_PROJECTS_PATH . 'templates/archive-projects.php' ) ) {
+	public function archive_template_include($template) {
+		if (is_main_query() && (is_post_type_archive('project') || is_tax('project-group'))) {
+			if (empty(locate_template(array('archive-projects.php'))) && file_exists(LSX_PROJECTS_PATH . 'templates/archive-projects.php')) {
 				$template = LSX_PROJECTS_PATH . 'templates/archive-projects.php';
 			}
 		}
@@ -106,10 +106,10 @@ 
 	 * Removes access to single project member posts.
 	 */
 	public function disable_single() {
-		$queried_post_type = get_query_var( 'post_type' );
+		$queried_post_type = get_query_var('post_type');
 
-		if ( is_single() && 'project' === $queried_post_type ) {
-			wp_redirect( home_url(), 301 );
+		if (is_single() && 'project' === $queried_post_type) {
+			wp_redirect(home_url(), 301);
 			exit;
 		}
 	}
@@ -117,7 +117,7 @@ 
 	/**
 	 * Handle body colours that might be change by LSX Customiser
 	 */
-	public function customizer_body_colours_handler( $css, $colors ) {
+	public function customizer_body_colours_handler($css, $colors) {
 		$css .= '
 			@import "' . LSX_PROJECTS_PATH . '/assets/css/scss/customizer-projects-body-colours";
 
@@ -140,14 +140,14 @@ 
 	/**
 	 * Change the LSX Banners title for project archive.
 	 */
-	public function lsx_banner_archive_title( $title ) {
-		if ( is_main_query() && is_post_type_archive( 'project' ) ) {
-			$title = '<h1 class="page-title">' . esc_html__( 'Portfolio', 'lsx-projects' ) . '</h1>';
+	public function lsx_banner_archive_title($title) {
+		if (is_main_query() && is_post_type_archive('project')) {
+			$title = '<h1 class="page-title">' . esc_html__('Portfolio', 'lsx-projects') . '</h1>';
 		}
 
-		if ( is_main_query() && is_tax( 'project-group' ) ) {
+		if (is_main_query() && is_tax('project-group')) {
 			$tax = get_queried_object();
-			$title = '<h1 class="page-title">' . esc_html__( 'Project Type', 'lsx-projects' ) . ': ' . apply_filters( 'the_title', $tax->name ) . '</h1>';
+			$title = '<h1 class="page-title">' . esc_html__('Project Type', 'lsx-projects') . ': ' . apply_filters('the_title', $tax->name) . '</h1>';
 		}
 
 		return $title;
@@ -156,11 +156,11 @@ 
 	/**
 	 * Remove the "continue reading" when the single is disabled.
 	 */
-	public function change_excerpt_more( $excerpt_more ) {
+	public function change_excerpt_more($excerpt_more) {
 		global $post;
 
-		if ( 'project' === $post->post_type ) {
-			if ( ! empty( $this->options['display']['projects_disable_single'] ) ) {
+		if ('project' === $post->post_type) {
+			if ( ! empty($this->options['display']['projects_disable_single'])) {
 				$excerpt_more = '';
 			}
 		}
@@ -171,14 +171,14 @@ 
 	/**
 	 * Change the word count when crop the content to excerpt (homepage widget).
 	 */
-	public function change_excerpt_length( $excerpt_word_count ) {
+	public function change_excerpt_length($excerpt_word_count) {
 		global $post;
 
-		if ( is_front_page() && 'project' === $post->post_type ) {
+		if (is_front_page() && 'project' === $post->post_type) {
 			$excerpt_word_count = 20;
 		}
 
-		if ( is_singular( 'project' ) && ( 'team' === $post->post_type || 'testimonial' === $post->post_type ) ) {
+		if (is_singular('project') && ('team' === $post->post_type || 'testimonial' === $post->post_type)) {
 			$excerpt_word_count = 20;
 		}
 
@@ -188,14 +188,14 @@ 
 	/**
 	 * Change the allowed tags crop the content to excerpt (homepage widget).
 	 */
-	public function change_excerpt_strip_tags( $allowed_tags ) {
+	public function change_excerpt_strip_tags($allowed_tags) {
 		global $post;
 
-		if ( is_front_page() && 'project' === $post->post_type ) {
+		if (is_front_page() && 'project' === $post->post_type) {
 			$allowed_tags = '<p>,<br>,<b>,<strong>,<i>,<u>,<ul>,<ol>,<li>,<span>';
 		}
 
-		if ( is_singular( 'project' ) && ( 'team' === $post->post_type || 'testimonial' === $post->post_type ) ) {
+		if (is_singular('project') && ('team' === $post->post_type || 'testimonial' === $post->post_type)) {
 			$allowed_tags = '<p>,<br>,<b>,<strong>,<i>,<u>,<ul>,<ol>,<li>,<span>';
 		}
 
@@ -205,10 +205,10 @@ 
 	/**
 	 * Change posts per page counter for archive.
 	 */
-	public function posts_per_page( $query ) {
-		if ( ! is_admin() && $query->is_main_query() ) {
-			if ( $query->is_post_type_archive( 'project' ) || $query->is_tax( 'project-group' ) ) {
-				$query->set( 'posts_per_page', -1 );
+	public function posts_per_page($query) {
+		if ( ! is_admin() && $query->is_main_query()) {
+			if ($query->is_post_type_archive('project') || $query->is_tax('project-group')) {
+				$query->set('posts_per_page', -1);
 			}
 		}
 
@@ -220,15 +220,15 @@ 
 	 */
 	public function add_form_modal() {
 
-		if ( empty( $this->options['display']['projects_modal_enable'] ) ) {
+		if (empty($this->options['display']['projects_modal_enable'])) {
 			return '';
 		}
 
-		if ( empty( $this->options['display']['projects_modal_cta_label'] ) || empty( $this->options['display']['projects_modal_form_id'] ) || empty( $this->options['display']['projects_wpform_modal_form_id'] ) ) {
+		if (empty($this->options['display']['projects_modal_cta_label']) || empty($this->options['display']['projects_modal_form_id']) || empty($this->options['display']['projects_wpform_modal_form_id'])) {
 			return '';
 		}
 
-		if ( ! is_singular( 'project' ) ) {
+		if ( ! is_singular('project')) {
 			return '';
 		}
 		?>
@@ -238,15 +238,15 @@ 
 					<button type="button" class="close" data-dismiss="modal">&times;</button>
 
 					<div class="modal-header">
-						<h4 class="modal-title"><?php echo esc_html( $this->options['display']['projects_modal_cta_label'] ); ?></h4>
+						<h4 class="modal-title"><?php echo esc_html($this->options['display']['projects_modal_cta_label']); ?></h4>
 					</div>
 
 					<div class="modal-body">
 						<?php
-						if ( ! empty( $this->options['display']['projects_modal_form_id'] ) ) {
-							echo do_shortcode( '[caldera_form id="' . $this->options['display']['projects_modal_form_id'] . '"]' );
-						} elseif ( ! empty( $this->options['display']['projects_wpform_modal_form_id'] ) ) {
-							echo do_shortcode( '[wpforms id="' . $this->options['display']['projects_wpform_modal_form_id'] . '"]' );
+						if ( ! empty($this->options['display']['projects_modal_form_id'])) {
+							echo do_shortcode('[caldera_form id="' . $this->options['display']['projects_modal_form_id'] . '"]');
+						} elseif ( ! empty($this->options['display']['projects_wpform_modal_form_id'])) {
+							echo do_shortcode('[wpforms id="' . $this->options['display']['projects_wpform_modal_form_id'] . '"]');
 						} ?>
 					</div>
 				</div>

includes/functions.php

Indentation +54 added lines, -54 removed lines

@@ -13,7 +13,7 @@ 
  * Add our action to init to set up our vars first.
  */
 function lsx_projects_load_plugin_textdomain() {
-	load_plugin_textdomain( 'lsx-projects', false, basename( LSX_PROJECTS_PATH ) . '/languages' );
+     load_plugin_textdomain( 'lsx-projects', false, basename( LSX_PROJECTS_PATH ) . '/languages' );
 }
 add_action( 'init', 'lsx_projects_load_plugin_textdomain' );
 
@@ -21,16 +21,16 @@ 
  * Wraps the output class in a function to be called in templates
  */
 function lsx_projects( $args ) {
-	$lsx_projects = new LSX_Projects;
-	echo wp_kses_post( $lsx_projects->output( $args ) );
+     $lsx_projects = new LSX_Projects;
+     echo wp_kses_post( $lsx_projects->output( $args ) );
 }
 
 /**
  * Shortcode
  */
 function lsx_projects_shortcode( $atts ) {
-	$lsx_projects = new LSX_Projects;
-	return $lsx_projects->output( $atts );
+     $lsx_projects = new LSX_Projects;
+     return $lsx_projects->output( $atts );
 }
 add_shortcode( 'lsx_projects', 'lsx_projects_shortcode' );
 
@@ -38,23 +38,23 @@ 
  * Wraps the output class in a function to be called in templates
  */
 function lsx_groups_list() {
-	do_action( 'lsx_groups_list' );
+     do_action( 'lsx_groups_list' );
 }
 
 function lsx_child_group_list() {
-	do_action( 'lsx_child_group_list' );
+     do_action( 'lsx_child_group_list' );
 }
 
 function lsx_projects_list() {
-	do_action( 'lsx_projects_list' );
+     do_action( 'lsx_projects_list' );
 }
 
 function lsx_projects_sidebar() {
-	do_action( 'lsx_projects_sidebar' );
+     do_action( 'lsx_projects_sidebar' );
 }
 
 function lsx_projects_single_tag() {
-	do_action( 'lsx_projects_single_tag' );
+     do_action( 'lsx_projects_single_tag' );
 }
 
 /**
@@ -65,23 +65,23 @@ 
  * @return mixed           Option value
  */
 function projects_get_options() {
-	$options = array();
-	if ( function_exists( 'tour_operator' ) ) {
-		$options = get_option( '_lsx-to_settings', false );
-	} else {
-		$options = get_option( '_lsx_settings', false );
-
-		if ( false === $options ) {
-			$options = get_option( '_lsx_lsx-settings', false );
-		}
-	}
-
-	// If there are new CMB2 options available, then use those.
-	$new_options = get_option( 'lsx_projects_options', false );
-	if ( false !== $new_options ) {
-		$options['display'] = $new_options;
-	}
-	return $options;
+     $options = array();
+     if ( function_exists( 'tour_operator' ) ) {
+          $options = get_option( '_lsx-to_settings', false );
+     } else {
+          $options = get_option( '_lsx_settings', false );
+
+          if ( false === $options ) {
+               $options = get_option( '_lsx_lsx-settings', false );
+          }
+     }
+
+     // If there are new CMB2 options available, then use those.
+     $new_options = get_option( 'lsx_projects_options', false );
+     if ( false !== $new_options ) {
+          $options['display'] = $new_options;
+     }
+     return $options;
 }
 
 /**
@@ -92,28 +92,28 @@ 
  * @return mixed           Option value
  */
 function projects_get_option( $key = '', $default = false ) {
-	$options = array();
-	$value   = $default;
-	if ( function_exists( 'tour_operator' ) ) {
-		$options = get_option( '_lsx-to_settings', false );
-	} else {
-		$options = get_option( '_lsx_settings', false );
-
-		if ( false === $options ) {
-			$options = get_option( '_lsx_lsx-settings', false );
-		}
-	}
-
-	// If there are new CMB2 options available, then use those.
-	$new_options = get_option( 'lsx_projects_options', false );
-	if ( false !== $new_options ) {
-		$options['display'] = $new_options;
-	}
-
-	if ( isset( $options['display'] ) && isset( $options['display'][ $key ] ) ) {
-		$value = $options['display'][ $key ];
-	}
-	return $value;
+     $options = array();
+     $value   = $default;
+     if ( function_exists( 'tour_operator' ) ) {
+          $options = get_option( '_lsx-to_settings', false );
+     } else {
+          $options = get_option( '_lsx_settings', false );
+
+          if ( false === $options ) {
+               $options = get_option( '_lsx_lsx-settings', false );
+          }
+     }
+
+     // If there are new CMB2 options available, then use those.
+     $new_options = get_option( 'lsx_projects_options', false );
+     if ( false !== $new_options ) {
+          $options['display'] = $new_options;
+     }
+
+     if ( isset( $options['display'] ) && isset( $options['display'][ $key ] ) ) {
+          $value = $options['display'][ $key ];
+     }
+     return $value;
 }
 
 
@@ -124,10 +124,10 @@ 
  * @return void
  */
 function portfolio_modify_archive_title( $title ) {
-	if ( ! is_post_type_archive( 'project' ) ) {
-		return $title;
-	}
-	$title = __( 'Portfolio', 'lsx' );
-	return $title;
+     if ( ! is_post_type_archive( 'project' ) ) {
+          return $title;
+     }
+     $title = __( 'Portfolio', 'lsx' );
+     return $title;
 }
 add_filter( 'get_the_archive_title', 'portfolio_modify_archive_title', 10, 1 );

Spacing +33 added lines, -33 removed lines

@@ -13,48 +13,48 @@ 
  * Add our action to init to set up our vars first.
  */
 function lsx_projects_load_plugin_textdomain() {
-	load_plugin_textdomain( 'lsx-projects', false, basename( LSX_PROJECTS_PATH ) . '/languages' );
+	load_plugin_textdomain('lsx-projects', false, basename(LSX_PROJECTS_PATH) . '/languages');
 }
-add_action( 'init', 'lsx_projects_load_plugin_textdomain' );
+add_action('init', 'lsx_projects_load_plugin_textdomain');
 
 /**
  * Wraps the output class in a function to be called in templates
  */
-function lsx_projects( $args ) {
+function lsx_projects($args) {
 	$lsx_projects = new LSX_Projects;
-	echo wp_kses_post( $lsx_projects->output( $args ) );
+	echo wp_kses_post($lsx_projects->output($args));
 }
 
 /**
  * Shortcode
  */
-function lsx_projects_shortcode( $atts ) {
+function lsx_projects_shortcode($atts) {
 	$lsx_projects = new LSX_Projects;
-	return $lsx_projects->output( $atts );
+	return $lsx_projects->output($atts);
 }
-add_shortcode( 'lsx_projects', 'lsx_projects_shortcode' );
+add_shortcode('lsx_projects', 'lsx_projects_shortcode');
 
 /**
  * Wraps the output class in a function to be called in templates
  */
 function lsx_groups_list() {
-	do_action( 'lsx_groups_list' );
+	do_action('lsx_groups_list');
 }
 
 function lsx_child_group_list() {
-	do_action( 'lsx_child_group_list' );
+	do_action('lsx_child_group_list');
 }
 
 function lsx_projects_list() {
-	do_action( 'lsx_projects_list' );
+	do_action('lsx_projects_list');
 }
 
 function lsx_projects_sidebar() {
-	do_action( 'lsx_projects_sidebar' );
+	do_action('lsx_projects_sidebar');
 }
 
 function lsx_projects_single_tag() {
-	do_action( 'lsx_projects_single_tag' );
+	do_action('lsx_projects_single_tag');
 }
 
 /**
@@ -66,19 +66,19 @@ 
  */
 function projects_get_options() {
 	$options = array();
-	if ( function_exists( 'tour_operator' ) ) {
-		$options = get_option( '_lsx-to_settings', false );
+	if (function_exists('tour_operator')) {
+		$options = get_option('_lsx-to_settings', false);
 	} else {
-		$options = get_option( '_lsx_settings', false );
+		$options = get_option('_lsx_settings', false);
 
-		if ( false === $options ) {
-			$options = get_option( '_lsx_lsx-settings', false );
+		if (false === $options) {
+			$options = get_option('_lsx_lsx-settings', false);
 		}
 	}
 
 	// If there are new CMB2 options available, then use those.
-	$new_options = get_option( 'lsx_projects_options', false );
-	if ( false !== $new_options ) {
+	$new_options = get_option('lsx_projects_options', false);
+	if (false !== $new_options) {
 		$options['display'] = $new_options;
 	}
 	return $options;
@@ -91,27 +91,27 @@ 
  * @param  mixed  $default Optional default value
  * @return mixed           Option value
  */
-function projects_get_option( $key = '', $default = false ) {
+function projects_get_option($key = '', $default = false) {
 	$options = array();
 	$value   = $default;
-	if ( function_exists( 'tour_operator' ) ) {
-		$options = get_option( '_lsx-to_settings', false );
+	if (function_exists('tour_operator')) {
+		$options = get_option('_lsx-to_settings', false);
 	} else {
-		$options = get_option( '_lsx_settings', false );
+		$options = get_option('_lsx_settings', false);
 
-		if ( false === $options ) {
-			$options = get_option( '_lsx_lsx-settings', false );
+		if (false === $options) {
+			$options = get_option('_lsx_lsx-settings', false);
 		}
 	}
 
 	// If there are new CMB2 options available, then use those.
-	$new_options = get_option( 'lsx_projects_options', false );
-	if ( false !== $new_options ) {
+	$new_options = get_option('lsx_projects_options', false);
+	if (false !== $new_options) {
 		$options['display'] = $new_options;
 	}
 
-	if ( isset( $options['display'] ) && isset( $options['display'][ $key ] ) ) {
-		$value = $options['display'][ $key ];
+	if (isset($options['display']) && isset($options['display'][$key])) {
+		$value = $options['display'][$key];
 	}
 	return $value;
 }
@@ -123,11 +123,11 @@ 
  * @param [type] $title
  * @return void
  */
-function portfolio_modify_archive_title( $title ) {
-	if ( ! is_post_type_archive( 'project' ) ) {
+function portfolio_modify_archive_title($title) {
+	if ( ! is_post_type_archive('project')) {
 		return $title;
 	}
-	$title = __( 'Portfolio', 'lsx' );
+	$title = __('Portfolio', 'lsx');
 	return $title;
 }
-add_filter( 'get_the_archive_title', 'portfolio_modify_archive_title', 10, 1 );
+add_filter('get_the_archive_title', 'portfolio_modify_archive_title', 10, 1);