lightspeeddevelopment / lsx-projects

includes/settings/display.php

Spacing +61 added lines, -61 removed lines

@@ -1,147 +1,147 @@
 <div class="uix-field-wrapper">
 	<ul class="ui-tab-nav">
-		<?php if ( class_exists( 'LSX_Banners' ) ) { ?>
-			<li><a href="#ui-placeholders" class="active"><?php esc_html_e( 'Placeholders', 'lsx-projects' ); ?></a></li>
+		<?php if (class_exists('LSX_Banners')) { ?>
+			<li><a href="#ui-placeholders" class="active"><?php esc_html_e('Placeholders', 'lsx-projects'); ?></a></li>
 		<?php } ?>
 
-		<?php if ( class_exists( 'LSX_Currencies' ) ) { ?>
-			<?php $class_active = class_exists( 'LSX_Banners' ) ? '' : 'active' ?>
-			<li><a href="#ui-currencies" class="<?php echo esc_attr( $class_active ) ?>"><?php esc_html_e( 'Currencies', 'lsx-projects' ); ?></a></li>
+		<?php if (class_exists('LSX_Currencies')) { ?>
+			<?php $class_active = class_exists('LSX_Banners') ? '' : 'active' ?>
+			<li><a href="#ui-currencies" class="<?php echo esc_attr($class_active) ?>"><?php esc_html_e('Currencies', 'lsx-projects'); ?></a></li>
 		<?php } ?>
 
-		<?php if ( class_exists( 'LSX_Team' ) ) { ?>
-			<?php $class_active = ( class_exists( 'LSX_Banners' ) || class_exists( 'LSX_Currencies' ) ) ? '' : 'active' ?>
-			<li><a href="#ui-team" class="<?php echo esc_attr( $class_active ) ?>"><?php esc_html_e( 'Team', 'lsx-projects' ); ?></a></li>
+		<?php if (class_exists('LSX_Team')) { ?>
+			<?php $class_active = (class_exists('LSX_Banners') || class_exists('LSX_Currencies')) ? '' : 'active' ?>
+			<li><a href="#ui-team" class="<?php echo esc_attr($class_active) ?>"><?php esc_html_e('Team', 'lsx-projects'); ?></a></li>
 		<?php } ?>
 
-		<?php if ( class_exists( 'LSX_Testimonials' ) ) { ?>
-			<?php $class_active = ( class_exists( 'LSX_Banners' ) || class_exists( 'LSX_Currencies' ) || class_exists( 'LSX_Team' ) ) ? '' : 'active' ?>
-			<li><a href="#ui-testimonials" class="<?php echo esc_attr( $class_active ) ?>"><?php esc_html_e( 'Testimonials', 'lsx-projects' ); ?></a></li>
+		<?php if (class_exists('LSX_Testimonials')) { ?>
+			<?php $class_active = (class_exists('LSX_Banners') || class_exists('LSX_Currencies') || class_exists('LSX_Team')) ? '' : 'active' ?>
+			<li><a href="#ui-testimonials" class="<?php echo esc_attr($class_active) ?>"><?php esc_html_e('Testimonials', 'lsx-projects'); ?></a></li>
 		<?php } ?>
 
-		<?php if ( class_exists( 'LSX_Projects' ) ) { ?>
-			<?php $class_active = ( class_exists( 'LSX_Banners' ) || class_exists( 'LSX_Currencies' ) || class_exists( 'LSX_Team' ) || class_exists( 'LSX_Testimonials' ) ) ? '' : 'active' ?>
-			<li><a href="#ui-projects" class="<?php echo esc_attr( $class_active ) ?>"><?php esc_html_e( 'Projects', 'lsx-projects' ); ?></a></li>
+		<?php if (class_exists('LSX_Projects')) { ?>
+			<?php $class_active = (class_exists('LSX_Banners') || class_exists('LSX_Currencies') || class_exists('LSX_Team') || class_exists('LSX_Testimonials')) ? '' : 'active' ?>
+			<li><a href="#ui-projects" class="<?php echo esc_attr($class_active) ?>"><?php esc_html_e('Projects', 'lsx-projects'); ?></a></li>
 		<?php } ?>
 
-		<?php if ( class_exists( 'LSX_Services' ) ) { ?>
-			<?php $class_active = ( class_exists( 'LSX_Banners' ) || class_exists( 'LSX_Currencies' ) || class_exists( 'LSX_Team' ) || class_exists( 'LSX_Testimonials' ) || class_exists( 'LSX_Projects' ) ) ? '' : 'active' ?>
-			<li><a href="#ui-services" class="<?php echo esc_attr( $class ) ?>"><?php esc_html_e( 'Services', 'lsx-projects' ); ?></a></li>
+		<?php if (class_exists('LSX_Services')) { ?>
+			<?php $class_active = (class_exists('LSX_Banners') || class_exists('LSX_Currencies') || class_exists('LSX_Team') || class_exists('LSX_Testimonials') || class_exists('LSX_Projects')) ? '' : 'active' ?>
+			<li><a href="#ui-services" class="<?php echo esc_attr($class) ?>"><?php esc_html_e('Services', 'lsx-projects'); ?></a></li>
 		<?php $class = ''; } ?>
 
-		<?php if ( class_exists( 'LSX_Blog_Customizer' ) ) { ?>
-			<?php $class_active = ( class_exists( 'LSX_Banners' ) || class_exists( 'LSX_Currencies' ) || class_exists( 'LSX_Team' ) || class_exists( 'LSX_Testimonials' ) || class_exists( 'LSX_Projects' ) || class_exists( 'LSX_Services' ) ) ? '' : 'active' ?>
-			<li><a href="#ui-blog-customizer" class="<?php echo esc_attr( $class_active ) ?>"><?php esc_html_e( 'Blog Customizer (posts widget)', 'lsx-projects' ); ?></a></li>
+		<?php if (class_exists('LSX_Blog_Customizer')) { ?>
+			<?php $class_active = (class_exists('LSX_Banners') || class_exists('LSX_Currencies') || class_exists('LSX_Team') || class_exists('LSX_Testimonials') || class_exists('LSX_Projects') || class_exists('LSX_Services')) ? '' : 'active' ?>
+			<li><a href="#ui-blog-customizer" class="<?php echo esc_attr($class_active) ?>"><?php esc_html_e('Blog Customizer (posts widget)', 'lsx-projects'); ?></a></li>
 		<?php } ?>
 
-		<?php if ( class_exists( 'LSX_Sharing' ) ) { ?>
-			<?php $class_active = ( class_exists( 'LSX_Banners' ) || class_exists( 'LSX_Currencies' ) || class_exists( 'LSX_Team' ) || class_exists( 'LSX_Testimonials' ) || class_exists( 'LSX_Projects' ) || class_exists( 'LSX_Services' ) || class_exists( 'LSX_Blog_Customizer' ) ) ? '' : 'active' ?>
-			<li><a href="#ui-sharing" class="<?php echo esc_attr( $class_active ) ?>"><?php esc_html_e( 'Sharing', 'lsx-projects' ); ?></a></li>
+		<?php if (class_exists('LSX_Sharing')) { ?>
+			<?php $class_active = (class_exists('LSX_Banners') || class_exists('LSX_Currencies') || class_exists('LSX_Team') || class_exists('LSX_Testimonials') || class_exists('LSX_Projects') || class_exists('LSX_Services') || class_exists('LSX_Blog_Customizer')) ? '' : 'active' ?>
+			<li><a href="#ui-sharing" class="<?php echo esc_attr($class_active) ?>"><?php esc_html_e('Sharing', 'lsx-projects'); ?></a></li>
 		<?php } ?>
 
-		<?php if ( class_exists( 'LSX_Videos' ) ) { ?>
-			<?php $class_active = ( class_exists( 'LSX_Banners' ) || class_exists( 'LSX_Currencies' ) || class_exists( 'LSX_Team' ) || class_exists( 'LSX_Testimonials' ) || class_exists( 'LSX_Projects' ) || class_exists( 'LSX_Services' ) || class_exists( 'LSX_Blog_Customizer' ) || class_exists( 'LSX_Sharing' ) ) ? '' : 'active' ?>
-			<li><a href="#ui-videos" class="<?php echo esc_attr( $class_active ) ?>"><?php esc_html_e( 'Videos', 'lsx-projects' ); ?></a></li>
+		<?php if (class_exists('LSX_Videos')) { ?>
+			<?php $class_active = (class_exists('LSX_Banners') || class_exists('LSX_Currencies') || class_exists('LSX_Team') || class_exists('LSX_Testimonials') || class_exists('LSX_Projects') || class_exists('LSX_Services') || class_exists('LSX_Blog_Customizer') || class_exists('LSX_Sharing')) ? '' : 'active' ?>
+			<li><a href="#ui-videos" class="<?php echo esc_attr($class_active) ?>"><?php esc_html_e('Videos', 'lsx-projects'); ?></a></li>
 		<?php } ?>
 	</ul>
 
-	<?php if ( class_exists( 'LSX_Banners' ) ) { ?>
+	<?php if (class_exists('LSX_Banners')) { ?>
 		<div id="ui-placeholders" class="ui-tab active">
 			<table class="form-table">
 				<tbody>
-					<?php do_action( 'lsx_framework_display_tab_content', 'placeholders' ); ?>
+					<?php do_action('lsx_framework_display_tab_content', 'placeholders'); ?>
 				</tbody>
 			</table>
 		</div>
 	<?php } ?>
 
-	<?php if ( class_exists( 'LSX_Currencies' ) ) { ?>
-		<?php $class_active = class_exists( 'LSX_Banners' ) ? '' : 'active' ?>
-		<div id="ui-currencies" class="ui-tab <?php echo esc_attr( $class_active ) ?>">
+	<?php if (class_exists('LSX_Currencies')) { ?>
+		<?php $class_active = class_exists('LSX_Banners') ? '' : 'active' ?>
+		<div id="ui-currencies" class="ui-tab <?php echo esc_attr($class_active) ?>">
 			<table class="form-table">
 				<tbody>
-					<?php do_action( 'lsx_framework_display_tab_content', 'currency_switcher' ); ?>
+					<?php do_action('lsx_framework_display_tab_content', 'currency_switcher'); ?>
 				</tbody>
 			</table>
 		</div>
 	<?php } ?>
 
-	<?php if ( class_exists( 'LSX_Team' ) ) { ?>
-		<?php $class_active = ( class_exists( 'LSX_Banners' ) || class_exists( 'LSX_Currencies' ) ) ? '' : 'active' ?>
-		<div id="ui-team" class="ui-tab <?php echo esc_attr( $class_active ) ?>">
+	<?php if (class_exists('LSX_Team')) { ?>
+		<?php $class_active = (class_exists('LSX_Banners') || class_exists('LSX_Currencies')) ? '' : 'active' ?>
+		<div id="ui-team" class="ui-tab <?php echo esc_attr($class_active) ?>">
 			<table class="form-table">
 				<tbody>
-					<?php do_action( 'lsx_framework_display_tab_content', 'team' ); ?>
+					<?php do_action('lsx_framework_display_tab_content', 'team'); ?>
 				</tbody>
 			</table>
 		</div>
 	<?php } ?>
 
-	<?php if ( class_exists( 'LSX_Testimonials' ) ) { ?>
-		<?php $class_active = ( class_exists( 'LSX_Banners' ) || class_exists( 'LSX_Currencies' ) || class_exists( 'LSX_Team' ) ) ? '' : 'active' ?>
-		<div id="ui-testimonials" class="ui-tab <?php echo esc_attr( $class_active ) ?>">
+	<?php if (class_exists('LSX_Testimonials')) { ?>
+		<?php $class_active = (class_exists('LSX_Banners') || class_exists('LSX_Currencies') || class_exists('LSX_Team')) ? '' : 'active' ?>
+		<div id="ui-testimonials" class="ui-tab <?php echo esc_attr($class_active) ?>">
 			<table class="form-table">
 				<tbody>
-					<?php do_action( 'lsx_framework_display_tab_content', 'testimonials' ); ?>
+					<?php do_action('lsx_framework_display_tab_content', 'testimonials'); ?>
 				</tbody>
 			</table>
 		</div>
 	<?php } ?>
 
-	<?php if ( class_exists( 'LSX_Projects' ) ) { ?>
-		<?php $class_active = ( class_exists( 'LSX_Banners' ) || class_exists( 'LSX_Currencies' ) || class_exists( 'LSX_Team' ) || class_exists( 'LSX_Testimonials' ) ) ? '' : 'active' ?>
-		<div id="ui-projects" class="ui-tab <?php echo esc_attr( $class_active ) ?>">
+	<?php if (class_exists('LSX_Projects')) { ?>
+		<?php $class_active = (class_exists('LSX_Banners') || class_exists('LSX_Currencies') || class_exists('LSX_Team') || class_exists('LSX_Testimonials')) ? '' : 'active' ?>
+		<div id="ui-projects" class="ui-tab <?php echo esc_attr($class_active) ?>">
 			<table class="form-table">
 				<tbody>
-					<?php do_action( 'lsx_framework_display_tab_content', 'projects' ); ?>
+					<?php do_action('lsx_framework_display_tab_content', 'projects'); ?>
 				</tbody>
 			</table>
 		</div>
 	<?php } ?>
 
-	<?php if ( class_exists( 'LSX_Services' ) ) { ?>
-		<?php $class_active = ( class_exists( 'LSX_Banners' ) || class_exists( 'LSX_Currencies' ) || class_exists( 'LSX_Team' ) || class_exists( 'LSX_Testimonials' ) || class_exists( 'LSX_Projects' ) ) ? '' : 'active' ?>
-		<div id="ui-services" class="ui-tab <?php echo esc_attr( $class_active ) ?>">
+	<?php if (class_exists('LSX_Services')) { ?>
+		<?php $class_active = (class_exists('LSX_Banners') || class_exists('LSX_Currencies') || class_exists('LSX_Team') || class_exists('LSX_Testimonials') || class_exists('LSX_Projects')) ? '' : 'active' ?>
+		<div id="ui-services" class="ui-tab <?php echo esc_attr($class_active) ?>">
 			<table class="form-table">
 				<tbody>
-					<?php do_action( 'lsx_framework_display_tab_content', 'services' ); ?>
+					<?php do_action('lsx_framework_display_tab_content', 'services'); ?>
 				</tbody>
 			</table>
 		</div>
 	<?php } ?>
 
-	<?php if ( class_exists( 'LSX_Blog_Customizer' ) ) { ?>
-		<?php $class_active = ( class_exists( 'LSX_Banners' ) || class_exists( 'LSX_Currencies' ) || class_exists( 'LSX_Team' ) || class_exists( 'LSX_Testimonials' ) || class_exists( 'LSX_Projects' ) || class_exists( 'LSX_Services' ) ) ? '' : 'active' ?>
-		<div id="ui-blog-customizer" class="ui-tab <?php echo esc_attr( $class_active ) ?>">
+	<?php if (class_exists('LSX_Blog_Customizer')) { ?>
+		<?php $class_active = (class_exists('LSX_Banners') || class_exists('LSX_Currencies') || class_exists('LSX_Team') || class_exists('LSX_Testimonials') || class_exists('LSX_Projects') || class_exists('LSX_Services')) ? '' : 'active' ?>
+		<div id="ui-blog-customizer" class="ui-tab <?php echo esc_attr($class_active) ?>">
 			<table class="form-table">
 				<tbody>
-					<?php do_action( 'lsx_framework_display_tab_content', 'blog-customizer' ); ?>
+					<?php do_action('lsx_framework_display_tab_content', 'blog-customizer'); ?>
 				</tbody>
 			</table>
 		</div>
 	<?php } ?>
 
-	<?php if ( class_exists( 'LSX_Sharing' ) ) { ?>
-		<?php $class_active = ( class_exists( 'LSX_Banners' ) || class_exists( 'LSX_Currencies' ) || class_exists( 'LSX_Team' ) || class_exists( 'LSX_Testimonials' ) || class_exists( 'LSX_Projects' ) || class_exists( 'LSX_Services' ) || class_exists( 'LSX_Blog_Customizer' ) ) ? '' : 'active' ?>
-		<div id="ui-sharing" class="ui-tab <?php echo esc_attr( $class_active ) ?>">
+	<?php if (class_exists('LSX_Sharing')) { ?>
+		<?php $class_active = (class_exists('LSX_Banners') || class_exists('LSX_Currencies') || class_exists('LSX_Team') || class_exists('LSX_Testimonials') || class_exists('LSX_Projects') || class_exists('LSX_Services') || class_exists('LSX_Blog_Customizer')) ? '' : 'active' ?>
+		<div id="ui-sharing" class="ui-tab <?php echo esc_attr($class_active) ?>">
 			<table class="form-table">
 				<tbody>
-					<?php do_action( 'lsx_framework_display_tab_content', 'sharing' ); ?>
+					<?php do_action('lsx_framework_display_tab_content', 'sharing'); ?>
 				</tbody>
 			</table>
 		</div>
 	<?php } ?>
 
-	<?php if ( class_exists( 'LSX_Videos' ) ) { ?>
-		<?php $class_active = ( class_exists( 'LSX_Banners' ) || class_exists( 'LSX_Currencies' ) || class_exists( 'LSX_Team' ) || class_exists( 'LSX_Testimonials' ) || class_exists( 'LSX_Projects' ) || class_exists( 'LSX_Services' ) || class_exists( 'LSX_Blog_Customizer' ) || class_exists( 'LSX_Sharing' ) ) ? '' : 'active' ?>
-		<div id="ui-videos" class="ui-tab <?php echo esc_attr( $class_active ) ?>">
+	<?php if (class_exists('LSX_Videos')) { ?>
+		<?php $class_active = (class_exists('LSX_Banners') || class_exists('LSX_Currencies') || class_exists('LSX_Team') || class_exists('LSX_Testimonials') || class_exists('LSX_Projects') || class_exists('LSX_Services') || class_exists('LSX_Blog_Customizer') || class_exists('LSX_Sharing')) ? '' : 'active' ?>
+		<div id="ui-videos" class="ui-tab <?php echo esc_attr($class_active) ?>">
 			<table class="form-table">
 				<tbody>
-					<?php do_action( 'lsx_framework_display_tab_content', 'videos' ); ?>
+					<?php do_action('lsx_framework_display_tab_content', 'videos'); ?>
 				</tbody>
 			</table>
 		</div>
 	<?php } ?>
 
-	<?php do_action( 'lsx_framework_display_tab_bottom', 'display' ); ?>
+	<?php do_action('lsx_framework_display_tab_bottom', 'display'); ?>
 </div>

includes/class-lsx-projects-scpo-engine.php

Spacing +81 added lines, -81 removed lines

@@ -14,45 +14,45 @@ 
 class LSX_Projects_SCPO_Engine {
 
 	function __construct() {
-		if ( ! get_option( 'lsx_projects_scporder_install' ) ) {
+		if ( ! get_option('lsx_projects_scporder_install')) {
 			$this->lsx_projects_scporder_install();
 		}
 
-		add_action( 'admin_init', array( $this, 'refresh' ) );
-		add_action( 'admin_init', array( $this, 'load_script_css' ) );
+		add_action('admin_init', array($this, 'refresh'));
+		add_action('admin_init', array($this, 'load_script_css'));
 
-		add_action( 'wp_ajax_update-menu-order', array( $this, 'update_menu_order' ) );
+		add_action('wp_ajax_update-menu-order', array($this, 'update_menu_order'));
 
-		add_action( 'pre_get_posts', array( $this, 'lsx_projects_scporder_pre_get_posts' ) );
+		add_action('pre_get_posts', array($this, 'lsx_projects_scporder_pre_get_posts'));
 
-		add_filter( 'get_previous_post_where', array( $this, 'lsx_projects_scporder_previous_post_where' ) );
-		add_filter( 'get_previous_post_sort', array( $this, 'lsx_projects_scporder_previous_post_sort' ) );
-		add_filter( 'get_next_post_where', array( $this, 'lsx_projects_scporder_next_post_where' ) );
-		add_filter( 'get_next_post_sort', array( $this, 'lsx_projects_scporder_next_post_sort' ) );
+		add_filter('get_previous_post_where', array($this, 'lsx_projects_scporder_previous_post_where'));
+		add_filter('get_previous_post_sort', array($this, 'lsx_projects_scporder_previous_post_sort'));
+		add_filter('get_next_post_where', array($this, 'lsx_projects_scporder_next_post_where'));
+		add_filter('get_next_post_sort', array($this, 'lsx_projects_scporder_next_post_sort'));
 	}
 
 	function lsx_projects_scporder_install() {
-		update_option( 'lsx_projects_scporder_install', 1 );
+		update_option('lsx_projects_scporder_install', 1);
 	}
 
 	function _check_load_script_css() {
 		$active = false;
 		$objects = $this->get_lsx_projects_scporder_options_objects();
 
-		if ( empty( $objects ) ) {
+		if (empty($objects)) {
 			return false;
 		}
 
-		if ( isset( $_GET['orderby'] ) || strstr( sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'action=edit' ) || strstr( sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'wp-admin/post-new.php' ) ) {
+		if (isset($_GET['orderby']) || strstr(sanitize_text_field(wp_unslash($_SERVER['REQUEST_URI'])), 'action=edit') || strstr(sanitize_text_field(wp_unslash($_SERVER['REQUEST_URI'])), 'wp-admin/post-new.php')) {
 			return false;
 		}
 
-		if ( ! empty( $objects ) ) {
-			if ( isset( $_GET['post_type'] ) && ! isset( $_GET['taxonomy'] ) && array_key_exists( sanitize_text_field( wp_unslash( $_GET['post_type'] ) ), $objects ) ) { // if page or custom post types
+		if ( ! empty($objects)) {
+			if (isset($_GET['post_type']) && ! isset($_GET['taxonomy']) && array_key_exists(sanitize_text_field(wp_unslash($_GET['post_type'])), $objects)) { // if page or custom post types
 				$active = true;
 			}
 
-			if ( ! isset( $_GET['post_type'] ) && strstr( sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'wp-admin/edit.php' ) && array_key_exists( 'post', $objects ) ) { // if post
+			if ( ! isset($_GET['post_type']) && strstr(sanitize_text_field(wp_unslash($_SERVER['REQUEST_URI'])), 'wp-admin/edit.php') && array_key_exists('post', $objects)) { // if post
 				$active = true;
 			}
 		}
@@ -61,17 +61,17 @@ 
 	}
 
 	function load_script_css() {
-		if ( $this->_check_load_script_css() ) {
-			wp_enqueue_script( 'scporderjs', LSX_PROJECTS_URL . 'assets/js/scporder.min.js', array( 'jquery', 'jquery-ui-sortable' ), null, true );
+		if ($this->_check_load_script_css()) {
+			wp_enqueue_script('scporderjs', LSX_PROJECTS_URL . 'assets/js/scporder.min.js', array('jquery', 'jquery-ui-sortable'), null, true);
 
 			$scporderjs_params = array(
-				'ajax_url' => admin_url( 'admin-ajax.php' ),
-				'ajax_nonce' => wp_create_nonce( 'scporder' ),
+				'ajax_url' => admin_url('admin-ajax.php'),
+				'ajax_nonce' => wp_create_nonce('scporder'),
 			);
 
-			wp_localize_script( 'scporderjs', 'scporderjs_params', $scporderjs_params );
+			wp_localize_script('scporderjs', 'scporderjs_params', $scporderjs_params);
 
-			wp_enqueue_style( 'scporder', LSX_PROJECTS_URL . 'assets/css/scporder.css', array(), null );
+			wp_enqueue_style('scporder', LSX_PROJECTS_URL . 'assets/css/scporder.css', array(), null);
 		}
 	}
 
@@ -80,26 +80,26 @@ 
 
 		$objects = $this->get_lsx_projects_scporder_options_objects();
 
-		if ( ! empty( $objects ) ) {
-			foreach ( $objects as $object => $object_data ) {
+		if ( ! empty($objects)) {
+			foreach ($objects as $object => $object_data) {
 				$result = $wpdb->get_results($wpdb->prepare("
 					SELECT count(*) as cnt, max(menu_order) as max, min(menu_order) as min
 					FROM $wpdb->posts
 					WHERE post_type = '%s' AND post_status IN ('publish', 'pending', 'draft', 'private', 'future')
 				", $object));
 
-				if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max ) {
+				if (0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max) {
 					continue;
 				}
 
-				$results = $wpdb->get_results( $wpdb->prepare("
+				$results = $wpdb->get_results($wpdb->prepare("
 					SELECT ID
 					FROM $wpdb->posts
 					WHERE post_type = '%s' AND post_status IN ('publish', 'pending', 'draft', 'private', 'future')
 					ORDER BY menu_order ASC
-				", $object ) );
+				", $object));
 
-				foreach ( $results as $key => $result ) {
+				foreach ($results as $key => $result) {
 					$wpdb->update(
 						$wpdb->posts,
 						array(
@@ -115,61 +115,61 @@ 
 	}
 
 	function update_menu_order() {
-		check_ajax_referer( 'scporder', 'security' );
+		check_ajax_referer('scporder', 'security');
 
 		global $wpdb;
 
-		parse_str( sanitize_text_field( wp_unslash( $_POST['order'] ) ), $data );
+		parse_str(sanitize_text_field(wp_unslash($_POST['order'])), $data);
 
-		if ( ! is_array( $data ) ) {
+		if ( ! is_array($data)) {
 			return false;
 		}
 
 		$id_arr = array();
 
-		foreach ( $data as $key => $values ) {
-			foreach ( $values as $position => $id ) {
+		foreach ($data as $key => $values) {
+			foreach ($values as $position => $id) {
 				$id_arr[] = $id;
 			}
 		}
 
 		$menu_order_arr = array();
 
-		foreach ( $id_arr as $key => $id ) {
-			$results = $wpdb->get_results( "SELECT menu_order FROM $wpdb->posts WHERE ID = " . intval( $id ) );
+		foreach ($id_arr as $key => $id) {
+			$results = $wpdb->get_results("SELECT menu_order FROM $wpdb->posts WHERE ID = " . intval($id));
 
-			foreach ( $results as $result ) {
+			foreach ($results as $result) {
 				$menu_order_arr[] = $result->menu_order;
 			}
 		}
 
-		sort( $menu_order_arr );
+		sort($menu_order_arr);
 
-		foreach ( $data as $key => $values ) {
-			foreach ( $values as $position => $id ) {
+		foreach ($data as $key => $values) {
+			foreach ($values as $position => $id) {
 				$wpdb->update(
 					$wpdb->posts,
 					array(
-						'menu_order' => $menu_order_arr[ $position ],
+						'menu_order' => $menu_order_arr[$position],
 					),
 					array(
-						'ID' => intval( $id ),
+						'ID' => intval($id),
 					)
 				);
 			}
 		}
 	}
 
-	function lsx_projects_scporder_previous_post_where( $where ) {
+	function lsx_projects_scporder_previous_post_where($where) {
 		global $post;
 
 		$objects = $this->get_lsx_projects_scporder_options_objects();
 
-		if ( empty( $objects ) ) {
+		if (empty($objects)) {
 			return $where;
 		}
 
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+		if (isset($post->post_type) && array_key_exists($post->post_type, $objects)) {
 			$current_menu_order = $post->menu_order;
 			$where = "WHERE p.menu_order > '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
 		}
@@ -177,32 +177,32 @@ 
 		return $where;
 	}
 
-	function lsx_projects_scporder_previous_post_sort( $orderby ) {
+	function lsx_projects_scporder_previous_post_sort($orderby) {
 		global $post;
 
 		$objects = $this->get_lsx_projects_scporder_options_objects();
 
-		if ( empty( $objects ) ) {
+		if (empty($objects)) {
 			return $orderby;
 		}
 
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+		if (isset($post->post_type) && array_key_exists($post->post_type, $objects)) {
 			$orderby = 'ORDER BY p.menu_order ASC LIMIT 1';
 		}
 
 		return $orderby;
 	}
 
-	function lsx_projects_scporder_next_post_where( $where ) {
+	function lsx_projects_scporder_next_post_where($where) {
 		global $post;
 
 		$objects = $this->get_lsx_projects_scporder_options_objects();
 
-		if ( empty( $objects ) ) {
+		if (empty($objects)) {
 			return $where;
 		}
 
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+		if (isset($post->post_type) && array_key_exists($post->post_type, $objects)) {
 			$current_menu_order = $post->menu_order;
 			$where = "WHERE p.menu_order < '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
 		}
@@ -210,70 +210,70 @@ 
 		return $where;
 	}
 
-	function lsx_projects_scporder_next_post_sort( $orderby ) {
+	function lsx_projects_scporder_next_post_sort($orderby) {
 		global $post;
 
 		$objects = $this->get_lsx_projects_scporder_options_objects();
 
-		if ( empty( $objects ) ) {
+		if (empty($objects)) {
 			return $orderby;
 		}
 
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+		if (isset($post->post_type) && array_key_exists($post->post_type, $objects)) {
 			$orderby = 'ORDER BY p.menu_order DESC LIMIT 1';
 		}
 
 		return $orderby;
 	}
 
-	function lsx_projects_scporder_pre_get_posts( $wp_query ) {
+	function lsx_projects_scporder_pre_get_posts($wp_query) {
 		$objects = $this->get_lsx_projects_scporder_options_objects();
 
-		if ( empty( $objects ) ) {
+		if (empty($objects)) {
 			return false;
 		}
 
-		if ( is_admin() ) {
-			if ( isset( $wp_query->query['post_type'] ) && ! isset( $_GET['orderby'] ) ) {
-				if ( array_key_exists( $wp_query->query['post_type'], $objects ) ) {
-					$wp_query->set( 'orderby', 'menu_order' );
-					$wp_query->set( 'order', 'ASC' );
+		if (is_admin()) {
+			if (isset($wp_query->query['post_type']) && ! isset($_GET['orderby'])) {
+				if (array_key_exists($wp_query->query['post_type'], $objects)) {
+					$wp_query->set('orderby', 'menu_order');
+					$wp_query->set('order', 'ASC');
 				}
 			}
 		} else {
 			$active = false;
 
-			if ( isset( $wp_query->query['post_type'] ) ) {
-				if ( ! is_array( $wp_query->query['post_type'] ) ) {
-					if ( array_key_exists( $wp_query->query['post_type'], $objects ) ) {
+			if (isset($wp_query->query['post_type'])) {
+				if ( ! is_array($wp_query->query['post_type'])) {
+					if (array_key_exists($wp_query->query['post_type'], $objects)) {
 						$active = true;
 					}
 				}
 			} else {
-				if ( array_key_exists( 'post', $objects ) ) {
+				if (array_key_exists('post', $objects)) {
 					$active = true;
 				}
 			}
 
-			if ( ! $active ) {
+			if ( ! $active) {
 				return false;
 			}
 
-			if ( isset( $wp_query->query['suppress_filters'] ) ) {
-				if ( $wp_query->get( 'orderby' ) == 'date' ) {
-					$wp_query->set( 'orderby', 'menu_order' );
+			if (isset($wp_query->query['suppress_filters'])) {
+				if ($wp_query->get('orderby') == 'date') {
+					$wp_query->set('orderby', 'menu_order');
 				}
 
-				if ( $wp_query->get( 'order' ) == 'DESC' ) {
-					$wp_query->set( 'order', 'ASC' );
+				if ($wp_query->get('order') == 'DESC') {
+					$wp_query->set('order', 'ASC');
 				}
 			} else {
-				if ( ! $wp_query->get( 'orderby' ) ) {
-					$wp_query->set( 'orderby', 'menu_order' );
+				if ( ! $wp_query->get('orderby')) {
+					$wp_query->set('orderby', 'menu_order');
 				}
 
-				if ( ! $wp_query->get( 'order' ) ) {
-					$wp_query->set( 'order', 'ASC' );
+				if ( ! $wp_query->get('order')) {
+					$wp_query->set('order', 'ASC');
 				}
 			}
 		}
@@ -281,7 +281,7 @@ 
 
 	function get_lsx_projects_scporder_options_objects() {
 		return array(
-			'project' => esc_html_x( 'Project', 'post type singular name', 'lsx-project' ),
+			'project' => esc_html_x('Project', 'post type singular name', 'lsx-project'),
 		);
 	}
 
@@ -290,26 +290,26 @@ 
 /**
  * SCP Order Uninstall hook
  */
-register_uninstall_hook( __FILE__, 'lsx_projects_scporder_uninstall' );
+register_uninstall_hook(__FILE__, 'lsx_projects_scporder_uninstall');
 
 function lsx_projects_scporder_uninstall() {
 	global $wpdb;
 
-	if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+	if (function_exists('is_multisite') && is_multisite()) {
 		$curr_blog = $wpdb->blogid;
-		$blogids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+		$blogids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
 
-		foreach ( $blogids as $blog_id ) {
-			switch_to_blog( $blog_id );
+		foreach ($blogids as $blog_id) {
+			switch_to_blog($blog_id);
 			lsx_projects_scporder_uninstall_db();
 		}
 
-		switch_to_blog( $curr_blog );
+		switch_to_blog($curr_blog);
 	} else {
 		lsx_projects_scporder_uninstall_db();
 	}
 }
 
 function lsx_projects_scporder_uninstall_db() {
-	delete_option( 'lsx_projects_scporder_install' );
+	delete_option('lsx_projects_scporder_install');
 }

Indentation +243 added lines, -243 removed lines

@@ -13,277 +13,277 @@ 
  */
 class LSX_Projects_SCPO_Engine {
 
-	function __construct() {
-		if ( ! get_option( 'lsx_projects_scporder_install' ) ) {
-			$this->lsx_projects_scporder_install();
-		}
+     function __construct() {
+          if ( ! get_option( 'lsx_projects_scporder_install' ) ) {
+               $this->lsx_projects_scporder_install();
+          }
 
-		add_action( 'admin_init', array( $this, 'refresh' ) );
-		add_action( 'admin_init', array( $this, 'load_script_css' ) );
+          add_action( 'admin_init', array( $this, 'refresh' ) );
+          add_action( 'admin_init', array( $this, 'load_script_css' ) );
 
-		add_action( 'wp_ajax_update-menu-order', array( $this, 'update_menu_order' ) );
+          add_action( 'wp_ajax_update-menu-order', array( $this, 'update_menu_order' ) );
 
-		add_action( 'pre_get_posts', array( $this, 'lsx_projects_scporder_pre_get_posts' ) );
+          add_action( 'pre_get_posts', array( $this, 'lsx_projects_scporder_pre_get_posts' ) );
 
-		add_filter( 'get_previous_post_where', array( $this, 'lsx_projects_scporder_previous_post_where' ) );
-		add_filter( 'get_previous_post_sort', array( $this, 'lsx_projects_scporder_previous_post_sort' ) );
-		add_filter( 'get_next_post_where', array( $this, 'lsx_projects_scporder_next_post_where' ) );
-		add_filter( 'get_next_post_sort', array( $this, 'lsx_projects_scporder_next_post_sort' ) );
-	}
+          add_filter( 'get_previous_post_where', array( $this, 'lsx_projects_scporder_previous_post_where' ) );
+          add_filter( 'get_previous_post_sort', array( $this, 'lsx_projects_scporder_previous_post_sort' ) );
+          add_filter( 'get_next_post_where', array( $this, 'lsx_projects_scporder_next_post_where' ) );
+          add_filter( 'get_next_post_sort', array( $this, 'lsx_projects_scporder_next_post_sort' ) );
+     }
 
-	function lsx_projects_scporder_install() {
-		update_option( 'lsx_projects_scporder_install', 1 );
-	}
+     function lsx_projects_scporder_install() {
+          update_option( 'lsx_projects_scporder_install', 1 );
+     }
 
-	function _check_load_script_css() {
-		$active = false;
-		$objects = $this->get_lsx_projects_scporder_options_objects();
+     function _check_load_script_css() {
+          $active = false;
+          $objects = $this->get_lsx_projects_scporder_options_objects();
 
-		if ( empty( $objects ) ) {
-			return false;
-		}
+          if ( empty( $objects ) ) {
+               return false;
+          }
 
-		if ( isset( $_GET['orderby'] ) || strstr( sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'action=edit' ) || strstr( sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'wp-admin/post-new.php' ) ) {
-			return false;
-		}
+          if ( isset( $_GET['orderby'] ) || strstr( sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'action=edit' ) || strstr( sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'wp-admin/post-new.php' ) ) {
+               return false;
+          }
 
-		if ( ! empty( $objects ) ) {
-			if ( isset( $_GET['post_type'] ) && ! isset( $_GET['taxonomy'] ) && array_key_exists( sanitize_text_field( wp_unslash( $_GET['post_type'] ) ), $objects ) ) { // if page or custom post types
-				$active = true;
-			}
+          if ( ! empty( $objects ) ) {
+               if ( isset( $_GET['post_type'] ) && ! isset( $_GET['taxonomy'] ) && array_key_exists( sanitize_text_field( wp_unslash( $_GET['post_type'] ) ), $objects ) ) { // if page or custom post types
+                    $active = true;
+               }
 
-			if ( ! isset( $_GET['post_type'] ) && strstr( sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'wp-admin/edit.php' ) && array_key_exists( 'post', $objects ) ) { // if post
-				$active = true;
-			}
-		}
+               if ( ! isset( $_GET['post_type'] ) && strstr( sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'wp-admin/edit.php' ) && array_key_exists( 'post', $objects ) ) { // if post
+                    $active = true;
+               }
+          }
 
-		return $active;
-	}
+          return $active;
+     }
 
-	function load_script_css() {
-		if ( $this->_check_load_script_css() ) {
-			wp_enqueue_script( 'scporderjs', LSX_PROJECTS_URL . 'assets/js/scporder.min.js', array( 'jquery', 'jquery-ui-sortable' ), null, true );
+     function load_script_css() {
+          if ( $this->_check_load_script_css() ) {
+               wp_enqueue_script( 'scporderjs', LSX_PROJECTS_URL . 'assets/js/scporder.min.js', array( 'jquery', 'jquery-ui-sortable' ), null, true );
 
-			$scporderjs_params = array(
-				'ajax_url' => admin_url( 'admin-ajax.php' ),
-				'ajax_nonce' => wp_create_nonce( 'scporder' ),
-			);
+               $scporderjs_params = array(
+                    'ajax_url' => admin_url( 'admin-ajax.php' ),
+                    'ajax_nonce' => wp_create_nonce( 'scporder' ),
+               );
 
-			wp_localize_script( 'scporderjs', 'scporderjs_params', $scporderjs_params );
+               wp_localize_script( 'scporderjs', 'scporderjs_params', $scporderjs_params );
 
-			wp_enqueue_style( 'scporder', LSX_PROJECTS_URL . 'assets/css/scporder.css', array(), null );
-		}
-	}
+               wp_enqueue_style( 'scporder', LSX_PROJECTS_URL . 'assets/css/scporder.css', array(), null );
+          }
+     }
 
-	function refresh() {
-		global $wpdb;
+     function refresh() {
+          global $wpdb;
 
-		$objects = $this->get_lsx_projects_scporder_options_objects();
+          $objects = $this->get_lsx_projects_scporder_options_objects();
 
-		if ( ! empty( $objects ) ) {
-			foreach ( $objects as $object => $object_data ) {
-				$result = $wpdb->get_results($wpdb->prepare("
+          if ( ! empty( $objects ) ) {
+               foreach ( $objects as $object => $object_data ) {
+                    $result = $wpdb->get_results($wpdb->prepare("
 					SELECT count(*) as cnt, max(menu_order) as max, min(menu_order) as min
 					FROM $wpdb->posts
 					WHERE post_type = '%s' AND post_status IN ('publish', 'pending', 'draft', 'private', 'future')
 				", $object));
 
-				if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max ) {
-					continue;
-				}
+                    if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max ) {
+                         continue;
+                    }
 
-				$results = $wpdb->get_results( $wpdb->prepare("
+                    $results = $wpdb->get_results( $wpdb->prepare("
 					SELECT ID
 					FROM $wpdb->posts
 					WHERE post_type = '%s' AND post_status IN ('publish', 'pending', 'draft', 'private', 'future')
 					ORDER BY menu_order ASC
 				", $object ) );
 
-				foreach ( $results as $key => $result ) {
-					$wpdb->update(
-						$wpdb->posts,
-						array(
-							'menu_order' => $key + 1,
-						),
-						array(
-							'ID' => $result->ID,
-						)
-					);
-				}
-			}
-		}
-	}
+                    foreach ( $results as $key => $result ) {
+                         $wpdb->update(
+                              $wpdb->posts,
+                              array(
+                                   'menu_order' => $key + 1,
+                              ),
+                              array(
+                                   'ID' => $result->ID,
+                              )
+                         );
+                    }
+               }
+          }
+     }
 
-	function update_menu_order() {
-		check_ajax_referer( 'scporder', 'security' );
+     function update_menu_order() {
+          check_ajax_referer( 'scporder', 'security' );
 
-		global $wpdb;
+          global $wpdb;
 
-		parse_str( sanitize_text_field( wp_unslash( $_POST['order'] ) ), $data );
+          parse_str( sanitize_text_field( wp_unslash( $_POST['order'] ) ), $data );
 
-		if ( ! is_array( $data ) ) {
-			return false;
-		}
+          if ( ! is_array( $data ) ) {
+               return false;
+          }
 
-		$id_arr = array();
+          $id_arr = array();
 
-		foreach ( $data as $key => $values ) {
-			foreach ( $values as $position => $id ) {
-				$id_arr[] = $id;
-			}
-		}
+          foreach ( $data as $key => $values ) {
+               foreach ( $values as $position => $id ) {
+                    $id_arr[] = $id;
+               }
+          }
 
-		$menu_order_arr = array();
+          $menu_order_arr = array();
 
-		foreach ( $id_arr as $key => $id ) {
-			$results = $wpdb->get_results( "SELECT menu_order FROM $wpdb->posts WHERE ID = " . intval( $id ) );
+          foreach ( $id_arr as $key => $id ) {
+               $results = $wpdb->get_results( "SELECT menu_order FROM $wpdb->posts WHERE ID = " . intval( $id ) );
 
-			foreach ( $results as $result ) {
-				$menu_order_arr[] = $result->menu_order;
-			}
-		}
+               foreach ( $results as $result ) {
+                    $menu_order_arr[] = $result->menu_order;
+               }
+          }
 
-		sort( $menu_order_arr );
+          sort( $menu_order_arr );
 
-		foreach ( $data as $key => $values ) {
-			foreach ( $values as $position => $id ) {
-				$wpdb->update(
-					$wpdb->posts,
-					array(
-						'menu_order' => $menu_order_arr[ $position ],
-					),
-					array(
-						'ID' => intval( $id ),
-					)
-				);
-			}
-		}
-	}
-
-	function lsx_projects_scporder_previous_post_where( $where ) {
-		global $post;
-
-		$objects = $this->get_lsx_projects_scporder_options_objects();
-
-		if ( empty( $objects ) ) {
-			return $where;
-		}
-
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
-			$current_menu_order = $post->menu_order;
-			$where = "WHERE p.menu_order > '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
-		}
-
-		return $where;
-	}
-
-	function lsx_projects_scporder_previous_post_sort( $orderby ) {
-		global $post;
-
-		$objects = $this->get_lsx_projects_scporder_options_objects();
-
-		if ( empty( $objects ) ) {
-			return $orderby;
-		}
-
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
-			$orderby = 'ORDER BY p.menu_order ASC LIMIT 1';
-		}
-
-		return $orderby;
-	}
-
-	function lsx_projects_scporder_next_post_where( $where ) {
-		global $post;
-
-		$objects = $this->get_lsx_projects_scporder_options_objects();
-
-		if ( empty( $objects ) ) {
-			return $where;
-		}
-
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
-			$current_menu_order = $post->menu_order;
-			$where = "WHERE p.menu_order < '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
-		}
-
-		return $where;
-	}
-
-	function lsx_projects_scporder_next_post_sort( $orderby ) {
-		global $post;
-
-		$objects = $this->get_lsx_projects_scporder_options_objects();
-
-		if ( empty( $objects ) ) {
-			return $orderby;
-		}
-
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
-			$orderby = 'ORDER BY p.menu_order DESC LIMIT 1';
-		}
-
-		return $orderby;
-	}
-
-	function lsx_projects_scporder_pre_get_posts( $wp_query ) {
-		$objects = $this->get_lsx_projects_scporder_options_objects();
-
-		if ( empty( $objects ) ) {
-			return false;
-		}
-
-		if ( is_admin() ) {
-			if ( isset( $wp_query->query['post_type'] ) && ! isset( $_GET['orderby'] ) ) {
-				if ( array_key_exists( $wp_query->query['post_type'], $objects ) ) {
-					$wp_query->set( 'orderby', 'menu_order' );
-					$wp_query->set( 'order', 'ASC' );
-				}
-			}
-		} else {
-			$active = false;
-
-			if ( isset( $wp_query->query['post_type'] ) ) {
-				if ( ! is_array( $wp_query->query['post_type'] ) ) {
-					if ( array_key_exists( $wp_query->query['post_type'], $objects ) ) {
-						$active = true;
-					}
-				}
-			} else {
-				if ( array_key_exists( 'post', $objects ) ) {
-					$active = true;
-				}
-			}
-
-			if ( ! $active ) {
-				return false;
-			}
-
-			if ( isset( $wp_query->query['suppress_filters'] ) ) {
-				if ( $wp_query->get( 'orderby' ) == 'date' ) {
-					$wp_query->set( 'orderby', 'menu_order' );
-				}
-
-				if ( $wp_query->get( 'order' ) == 'DESC' ) {
-					$wp_query->set( 'order', 'ASC' );
-				}
-			} else {
-				if ( ! $wp_query->get( 'orderby' ) ) {
-					$wp_query->set( 'orderby', 'menu_order' );
-				}
-
-				if ( ! $wp_query->get( 'order' ) ) {
-					$wp_query->set( 'order', 'ASC' );
-				}
-			}
-		}
-	}
-
-	function get_lsx_projects_scporder_options_objects() {
-		return array(
-			'project' => esc_html_x( 'Project', 'post type singular name', 'lsx-project' ),
-		);
-	}
+          foreach ( $data as $key => $values ) {
+               foreach ( $values as $position => $id ) {
+                    $wpdb->update(
+                         $wpdb->posts,
+                         array(
+                              'menu_order' => $menu_order_arr[ $position ],
+                         ),
+                         array(
+                              'ID' => intval( $id ),
+                         )
+                    );
+               }
+          }
+     }
+
+     function lsx_projects_scporder_previous_post_where( $where ) {
+          global $post;
+
+          $objects = $this->get_lsx_projects_scporder_options_objects();
+
+          if ( empty( $objects ) ) {
+               return $where;
+          }
+
+          if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+               $current_menu_order = $post->menu_order;
+               $where = "WHERE p.menu_order > '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
+          }
+
+          return $where;
+     }
+
+     function lsx_projects_scporder_previous_post_sort( $orderby ) {
+          global $post;
+
+          $objects = $this->get_lsx_projects_scporder_options_objects();
+
+          if ( empty( $objects ) ) {
+               return $orderby;
+          }
+
+          if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+               $orderby = 'ORDER BY p.menu_order ASC LIMIT 1';
+          }
+
+          return $orderby;
+     }
+
+     function lsx_projects_scporder_next_post_where( $where ) {
+          global $post;
+
+          $objects = $this->get_lsx_projects_scporder_options_objects();
+
+          if ( empty( $objects ) ) {
+               return $where;
+          }
+
+          if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+               $current_menu_order = $post->menu_order;
+               $where = "WHERE p.menu_order < '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
+          }
+
+          return $where;
+     }
+
+     function lsx_projects_scporder_next_post_sort( $orderby ) {
+          global $post;
+
+          $objects = $this->get_lsx_projects_scporder_options_objects();
+
+          if ( empty( $objects ) ) {
+               return $orderby;
+          }
+
+          if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+               $orderby = 'ORDER BY p.menu_order DESC LIMIT 1';
+          }
+
+          return $orderby;
+     }
+
+     function lsx_projects_scporder_pre_get_posts( $wp_query ) {
+          $objects = $this->get_lsx_projects_scporder_options_objects();
+
+          if ( empty( $objects ) ) {
+               return false;
+          }
+
+          if ( is_admin() ) {
+               if ( isset( $wp_query->query['post_type'] ) && ! isset( $_GET['orderby'] ) ) {
+                    if ( array_key_exists( $wp_query->query['post_type'], $objects ) ) {
+                         $wp_query->set( 'orderby', 'menu_order' );
+                         $wp_query->set( 'order', 'ASC' );
+                    }
+               }
+          } else {
+               $active = false;
+
+               if ( isset( $wp_query->query['post_type'] ) ) {
+                    if ( ! is_array( $wp_query->query['post_type'] ) ) {
+                         if ( array_key_exists( $wp_query->query['post_type'], $objects ) ) {
+                              $active = true;
+                         }
+                    }
+               } else {
+                    if ( array_key_exists( 'post', $objects ) ) {
+                         $active = true;
+                    }
+               }
+
+               if ( ! $active ) {
+                    return false;
+               }
+
+               if ( isset( $wp_query->query['suppress_filters'] ) ) {
+                    if ( $wp_query->get( 'orderby' ) == 'date' ) {
+                         $wp_query->set( 'orderby', 'menu_order' );
+                    }
+
+                    if ( $wp_query->get( 'order' ) == 'DESC' ) {
+                         $wp_query->set( 'order', 'ASC' );
+                    }
+               } else {
+                    if ( ! $wp_query->get( 'orderby' ) ) {
+                         $wp_query->set( 'orderby', 'menu_order' );
+                    }
+
+                    if ( ! $wp_query->get( 'order' ) ) {
+                         $wp_query->set( 'order', 'ASC' );
+                    }
+               }
+          }
+     }
+
+     function get_lsx_projects_scporder_options_objects() {
+          return array(
+               'project' => esc_html_x( 'Project', 'post type singular name', 'lsx-project' ),
+          );
+     }
 
 }
 
@@ -293,23 +293,23 @@ 
 register_uninstall_hook( __FILE__, 'lsx_projects_scporder_uninstall' );
 
 function lsx_projects_scporder_uninstall() {
-	global $wpdb;
+     global $wpdb;
 
-	if ( function_exists( 'is_multisite' ) && is_multisite() ) {
-		$curr_blog = $wpdb->blogid;
-		$blogids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+     if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+          $curr_blog = $wpdb->blogid;
+          $blogids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
 
-		foreach ( $blogids as $blog_id ) {
-			switch_to_blog( $blog_id );
-			lsx_projects_scporder_uninstall_db();
-		}
+          foreach ( $blogids as $blog_id ) {
+               switch_to_blog( $blog_id );
+               lsx_projects_scporder_uninstall_db();
+          }
 
-		switch_to_blog( $curr_blog );
-	} else {
-		lsx_projects_scporder_uninstall_db();
-	}
+          switch_to_blog( $curr_blog );
+     } else {
+          lsx_projects_scporder_uninstall_db();
+     }
 }
 
 function lsx_projects_scporder_uninstall_db() {
-	delete_option( 'lsx_projects_scporder_install' );
+     delete_option( 'lsx_projects_scporder_install' );
 }

templates/single-projects.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
 
 <?php lsx_content_wrap_before(); ?>
 
-<div id="primary" class="content-area <?php echo esc_attr( lsx_main_class() ); ?>">
+<div id="primary" class="content-area <?php echo esc_attr(lsx_main_class()); ?>">
 
 	<?php lsx_content_before(); ?>
 
@@ -17,11 +17,11 @@ 
 
 		<?php lsx_content_top(); ?>
 
-		<?php if ( have_posts() ) : ?>
+		<?php if (have_posts()) : ?>
 
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php while (have_posts()) : the_post(); ?>
 
-				<?php include( LSX_PROJECTS_PATH . '/templates/content-single-projects.php' ); ?>
+				<?php include(LSX_PROJECTS_PATH . '/templates/content-single-projects.php'); ?>
 
 			<?php endwhile; ?>
 

templates/archive-projects.php

Spacing +13 added lines, -13 removed lines

@@ -9,7 +9,7 @@ 
 
 <?php lsx_content_wrap_before(); ?>
 
-<div id="primary" class="content-area <?php echo esc_attr( lsx_main_class() ); ?>">
+<div id="primary" class="content-area <?php echo esc_attr(lsx_main_class()); ?>">
 
 	<?php lsx_content_before(); ?>
 
@@ -23,33 +23,33 @@ 
 				'hide_empty' => false,
 			);
 
-			$groups = get_terms( $args );
-			$group_selected = get_query_var( 'project-group' );
+			$groups = get_terms($args);
+			$group_selected = get_query_var('project-group');
 
-			if ( count( $groups ) > 0 ) :
+			if (count($groups) > 0) :
 			?>
 
 			<ul class="nav nav-tabs lsx-projects-filter">
 				<?php
 					$group_selected_class = '';
 
-					if ( empty( $group_selected ) ) {
+					if (empty($group_selected)) {
 						$group_selected_class = ' class="active"';
 					}
 				?>
 
-				<li<?php echo wp_kses_post( $group_selected_class ); ?>><a href="<?php echo empty( $group_selected ) ? '#' : esc_url( get_post_type_archive_link( 'project' ) ); ?>" data-filter="*"><?php esc_html_e( 'All', 'lsx-projects' ); ?></a></li>
+				<li<?php echo wp_kses_post($group_selected_class); ?>><a href="<?php echo empty($group_selected) ? '#' : esc_url(get_post_type_archive_link('project')); ?>" data-filter="*"><?php esc_html_e('All', 'lsx-projects'); ?></a></li>
 
-				<?php foreach ( $groups as $group ) : ?>
+				<?php foreach ($groups as $group) : ?>
 					<?php
 						$group_selected_class = '';
 
-						if ( (string) $group_selected === (string) $group->slug ) {
+						if ((string) $group_selected === (string) $group->slug) {
 							$group_selected_class = ' class="active"';
 						}
 					?>
 
-					<li<?php echo wp_kses_post( $group_selected_class ); ?>><a href="<?php echo empty( $group_selected ) ? '#' : esc_url( get_term_link( $group ) ); ?>" data-filter=".filter-<?php echo esc_attr( $group->slug ); ?>"><?php echo esc_attr( $group->name ); ?></a></li>
+					<li<?php echo wp_kses_post($group_selected_class); ?>><a href="<?php echo empty($group_selected) ? '#' : esc_url(get_term_link($group)); ?>" data-filter=".filter-<?php echo esc_attr($group->slug); ?>"><?php echo esc_attr($group->name); ?></a></li>
 				<?php endforeach; ?>
 			</ul>
 
@@ -57,7 +57,7 @@ 
 			endif;
 		?>
 
-		<?php if ( have_posts() ) : ?>
+		<?php if (have_posts()) : ?>
 
 			<div class="lsx-projects-container">
 				<div class="row row-flex lsx-projects-row"">
@@ -65,9 +65,9 @@ 
 					<?php
 						$count = 0;
 
-						while ( have_posts() ) {
+						while (have_posts()) {
 							the_post();
-							include( LSX_PROJECTS_PATH . '/templates/content-archive-projects.php' );
+							include(LSX_PROJECTS_PATH . '/templates/content-archive-projects.php');
 						}
 					?>
 
@@ -78,7 +78,7 @@ 
 
 		<?php else : ?>
 
-			<?php get_template_part( 'partials/content', 'none' ); ?>
+			<?php get_template_part('partials/content', 'none'); ?>
 
 		<?php endif; ?>
 

Indentation +26 added lines, -26 removed lines

@@ -18,44 +18,44 @@ 
 		<?php lsx_content_top(); ?>
 
 		<?php
-			$args = array(
-				'taxonomy'   => 'project-group',
-				'hide_empty' => false,
-			);
+               $args = array(
+                    'taxonomy'   => 'project-group',
+                    'hide_empty' => false,
+               );
 
-			$groups = get_terms( $args );
-			$group_selected = get_query_var( 'project-group' );
+               $groups = get_terms( $args );
+               $group_selected = get_query_var( 'project-group' );
 
-			if ( count( $groups ) > 0 ) :
-			?>
+               if ( count( $groups ) > 0 ) :
+               ?>
 
 			<ul class="nav nav-tabs lsx-projects-filter">
 				<?php
-					$group_selected_class = '';
+                         $group_selected_class = '';
 
-					if ( empty( $group_selected ) ) {
-						$group_selected_class = ' class="active"';
-					}
-				?>
+                         if ( empty( $group_selected ) ) {
+                              $group_selected_class = ' class="active"';
+                         }
+                    ?>
 
 				<li<?php echo wp_kses_post( $group_selected_class ); ?>><a href="<?php echo empty( $group_selected ) ? '#' : esc_url( get_post_type_archive_link( 'project' ) ); ?>" data-filter="*"><?php esc_html_e( 'All', 'lsx-projects' ); ?></a></li>
 
 				<?php foreach ( $groups as $group ) : ?>
 					<?php
-						$group_selected_class = '';
+                              $group_selected_class = '';
 
-						if ( (string) $group_selected === (string) $group->slug ) {
-							$group_selected_class = ' class="active"';
-						}
-					?>
+                              if ( (string) $group_selected === (string) $group->slug ) {
+                                   $group_selected_class = ' class="active"';
+                              }
+                         ?>
 
 					<li<?php echo wp_kses_post( $group_selected_class ); ?>><a href="<?php echo empty( $group_selected ) ? '#' : esc_url( get_term_link( $group ) ); ?>" data-filter=".filter-<?php echo esc_attr( $group->slug ); ?>"><?php echo esc_attr( $group->name ); ?></a></li>
 				<?php endforeach; ?>
 			</ul>
 
 			<?php
-			endif;
-		?>
+               endif;
+          ?>
 
 		<?php if ( have_posts() ) : ?>
 
@@ -63,13 +63,13 @@ 
 				<div class="row row-flex lsx-projects-row"">
 
 					<?php
-						$count = 0;
+                              $count = 0;
 
-						while ( have_posts() ) {
-							the_post();
-							include( LSX_PROJECTS_PATH . '/templates/content-archive-projects.php' );
-						}
-					?>
+                              while ( have_posts() ) {
+                                   the_post();
+                                   include( LSX_PROJECTS_PATH . '/templates/content-archive-projects.php' );
+                              }
+                         ?>
 
 				</div>
 			</div>

Braces +5 added lines, -2 removed lines

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

classes/class-lsx-projects-widget.php

Spacing +111 added lines, -111 removed lines

@@ -15,11 +15,11 @@ 
 			'classname' => 'lsx-projects',
 		);
 
-		parent::__construct( 'LSX_Projects_Widget', esc_html__( 'LSX Projects', 'lsx-projects' ), $widget_ops );
+		parent::__construct('LSX_Projects_Widget', esc_html__('LSX Projects', 'lsx-projects'), $widget_ops);
 	}
 
-	function widget( $args, $instance ) {
-		extract( $args );
+	function widget($args, $instance) {
+		extract($args);
 
 		$title = $instance['title'];
 		$title_link = $instance['title_link'];
@@ -38,40 +38,40 @@ 
 		$featured = $instance['featured'];
 
 		// If limit not set, display 99 posts
-		if ( empty( $limit ) ) {
+		if (empty($limit)) {
 			$limit = '99';
 		}
 
 		// If specific posts included, display 99 posts
-		if ( ! empty( $include ) ) {
+		if ( ! empty($include)) {
 			$limit = '99';
 		}
 
-		if ( '1' == $responsive ) {
+		if ('1' == $responsive) {
 			$responsive = 'true';
 		} else {
 			$responsive = 'false';
 		}
 
-		if ( '1' == $show_image ) {
+		if ('1' == $show_image) {
 			$show_image = 'true';
 		} else {
 			$show_image = 'false';
 		}
 
-		if ( '1' == $carousel ) {
+		if ('1' == $carousel) {
 			$carousel = 'true';
 		} else {
 			$carousel = 'false';
 		}
 
-		if ( '1' == $featured ) {
+		if ('1' == $featured) {
 			$featured = 'true';
 		} else {
 			$featured = 'false';
 		}
 
-		if ( $title_link ) {
+		if ($title_link) {
 			//$link_open = '<a href="' . $title_link . '">';
 			$link_open = '';
 			$link_btn_open = '<a href="' . $title_link . '" class="btn border-btn">';
@@ -85,18 +85,18 @@ 
 			$link_btn_close = '';
 		}
 
-		echo wp_kses_post( $before_widget );
+		echo wp_kses_post($before_widget);
 
-		if ( $title ) {
-			echo wp_kses_post( $before_title . $link_open . $title . $link_close . $after_title );
+		if ($title) {
+			echo wp_kses_post($before_title . $link_open . $title . $link_close . $after_title);
 		}
 
-		if ( $tagline ) {
-			echo '<p class="tagline text-center">' . esc_html( $tagline ) . '</p>';
+		if ($tagline) {
+			echo '<p class="tagline text-center">' . esc_html($tagline) . '</p>';
 		}
 
-		if ( class_exists( 'LSX_Projects' ) ) {
-			lsx_projects( array(
+		if (class_exists('LSX_Projects')) {
+			lsx_projects(array(
 				'columns' => $columns,
 				'orderby' => $orderby,
 				'order' => $order,
@@ -108,39 +108,39 @@ 
 				'show_image' => $show_image,
 				'carousel' => $carousel,
 				'featured' => $featured,
-			) );
+			));
 		};
 
-		if ( $button_text && $title_link ) {
-			echo wp_kses_post( '<p class="text-center lsx-projects-archive-link-wrap"><span class="lsx-projects-archive-link">' . $link_btn_open . $button_text . ' <i class="fa fa-angle-right"></i>' . $link_btn_close . '</span></p>' );
+		if ($button_text && $title_link) {
+			echo wp_kses_post('<p class="text-center lsx-projects-archive-link-wrap"><span class="lsx-projects-archive-link">' . $link_btn_open . $button_text . ' <i class="fa fa-angle-right"></i>' . $link_btn_close . '</span></p>');
 		}
 
-		echo wp_kses_post( $after_widget );
+		echo wp_kses_post($after_widget);
 	}
 
-	function update( $new_instance, $old_instance ) {
+	function update($new_instance, $old_instance) {
 		$instance = $old_instance;
 
-		$instance['title'] = wp_kses_post( force_balance_tags( $new_instance['title'] ) );
-		$instance['title_link'] = strip_tags( $new_instance['title_link'] );
-		$instance['tagline'] = wp_kses_post( force_balance_tags( $new_instance['tagline'] ) );
-		$instance['columns'] = strip_tags( $new_instance['columns'] );
-		$instance['orderby'] = strip_tags( $new_instance['orderby'] );
-		$instance['order'] = strip_tags( $new_instance['order'] );
-		$instance['limit'] = strip_tags( $new_instance['limit'] );
-		$instance['include'] = strip_tags( $new_instance['include'] );
-		$instance['display'] = strip_tags( $new_instance['display'] );
-		$instance['size'] = strip_tags( $new_instance['size'] );
-		$instance['button_text'] = strip_tags( $new_instance['button_text'] );
-		$instance['responsive'] = strip_tags( $new_instance['responsive'] );
-		$instance['show_image'] = strip_tags( $new_instance['show_image'] );
-		$instance['carousel'] = strip_tags( $new_instance['carousel'] );
-		$instance['featured'] = strip_tags( $new_instance['featured'] );
+		$instance['title'] = wp_kses_post(force_balance_tags($new_instance['title']));
+		$instance['title_link'] = strip_tags($new_instance['title_link']);
+		$instance['tagline'] = wp_kses_post(force_balance_tags($new_instance['tagline']));
+		$instance['columns'] = strip_tags($new_instance['columns']);
+		$instance['orderby'] = strip_tags($new_instance['orderby']);
+		$instance['order'] = strip_tags($new_instance['order']);
+		$instance['limit'] = strip_tags($new_instance['limit']);
+		$instance['include'] = strip_tags($new_instance['include']);
+		$instance['display'] = strip_tags($new_instance['display']);
+		$instance['size'] = strip_tags($new_instance['size']);
+		$instance['button_text'] = strip_tags($new_instance['button_text']);
+		$instance['responsive'] = strip_tags($new_instance['responsive']);
+		$instance['show_image'] = strip_tags($new_instance['show_image']);
+		$instance['carousel'] = strip_tags($new_instance['carousel']);
+		$instance['featured'] = strip_tags($new_instance['featured']);
 
 		return $instance;
 	}
 
-	function form( $instance ) {
+	function form($instance) {
 		$defaults = array(
 			'title' => 'Projects',
 			'title_link' => '',
@@ -159,134 +159,134 @@ 
 			'featured' => 0,
 		);
 
-		$instance = wp_parse_args( (array) $instance, $defaults );
+		$instance = wp_parse_args((array) $instance, $defaults);
 
-		$title          = esc_attr( $instance['title'] );
-		$title_link     = esc_attr( $instance['title_link'] );
-		$tagline        = esc_attr( $instance['tagline'] );
-		$columns        = esc_attr( $instance['columns'] );
-		$orderby        = esc_attr( $instance['orderby'] );
-		$order          = esc_attr( $instance['order'] );
-		$limit          = esc_attr( $instance['limit'] );
-		$include        = esc_attr( $instance['include'] );
-		$display        = esc_attr( $instance['display'] );
-		$size           = esc_attr( $instance['size'] );
-		$button_text    = esc_attr( $instance['button_text'] );
-		$responsive     = esc_attr( $instance['responsive'] );
-		$show_image     = esc_attr( $instance['show_image'] );
-		$carousel       = esc_attr( $instance['carousel'] );
-		$featured       = esc_attr( $instance['featured'] );
+		$title          = esc_attr($instance['title']);
+		$title_link     = esc_attr($instance['title_link']);
+		$tagline        = esc_attr($instance['tagline']);
+		$columns        = esc_attr($instance['columns']);
+		$orderby        = esc_attr($instance['orderby']);
+		$order          = esc_attr($instance['order']);
+		$limit          = esc_attr($instance['limit']);
+		$include        = esc_attr($instance['include']);
+		$display        = esc_attr($instance['display']);
+		$size           = esc_attr($instance['size']);
+		$button_text    = esc_attr($instance['button_text']);
+		$responsive     = esc_attr($instance['responsive']);
+		$show_image     = esc_attr($instance['show_image']);
+		$carousel       = esc_attr($instance['carousel']);
+		$featured       = esc_attr($instance['featured']);
 		?>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php esc_html_e( 'Title:', 'lsx-projects' ); ?></label>
-			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" />
+			<label for="<?php echo esc_attr($this->get_field_id('title')); ?>"><?php esc_html_e('Title:', 'lsx-projects'); ?></label>
+			<input class="widefat" id="<?php echo esc_attr($this->get_field_id('title')); ?>" name="<?php echo esc_attr($this->get_field_name('title')); ?>" type="text" value="<?php echo esc_attr($title); ?>" />
 		</p>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'title_link' ) ); ?>"><?php esc_html_e( 'Page Link:', 'lsx-projects' ); ?></label>
-			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title_link' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title_link' ) ); ?>" type="text" value="<?php echo esc_attr( $title_link ); ?>" />
-			<small><?php esc_html_e( 'Link the widget to a page', 'lsx-projects' ); ?></small>
+			<label for="<?php echo esc_attr($this->get_field_id('title_link')); ?>"><?php esc_html_e('Page Link:', 'lsx-projects'); ?></label>
+			<input class="widefat" id="<?php echo esc_attr($this->get_field_id('title_link')); ?>" name="<?php echo esc_attr($this->get_field_name('title_link')); ?>" type="text" value="<?php echo esc_attr($title_link); ?>" />
+			<small><?php esc_html_e('Link the widget to a page', 'lsx-projects'); ?></small>
 		</p>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'tagline' ) ); ?>"><?php esc_html_e( 'Tagline:', 'lsx-projects' ); ?></label>
-			<textarea class="widefat" rows="8" cols="20" id="<?php echo esc_attr( $this->get_field_id( 'tagline' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'tagline' ) ); ?>"><?php echo esc_html( $tagline ); ?></textarea>
-			<small><?php esc_html_e( 'Tagline to display below the widget title', 'lsx-projects' ); ?></small>
+			<label for="<?php echo esc_attr($this->get_field_id('tagline')); ?>"><?php esc_html_e('Tagline:', 'lsx-projects'); ?></label>
+			<textarea class="widefat" rows="8" cols="20" id="<?php echo esc_attr($this->get_field_id('tagline')); ?>" name="<?php echo esc_attr($this->get_field_name('tagline')); ?>"><?php echo esc_html($tagline); ?></textarea>
+			<small><?php esc_html_e('Tagline to display below the widget title', 'lsx-projects'); ?></small>
 		</p>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'columns' ) ); ?>"><?php esc_html_e( 'Columns:', 'lsx-projects' ); ?></label>
-			<select name="<?php echo esc_attr( $this->get_field_name( 'columns' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'columns' ) ); ?>" class="widefat">
+			<label for="<?php echo esc_attr($this->get_field_id('columns')); ?>"><?php esc_html_e('Columns:', 'lsx-projects'); ?></label>
+			<select name="<?php echo esc_attr($this->get_field_name('columns')); ?>" id="<?php echo esc_attr($this->get_field_id('columns')); ?>" class="widefat">
 			<?php
-				$options = array( '1', '2', '3', '4' );
+				$options = array('1', '2', '3', '4');
 
-				foreach ( $options as $option ) {
-					echo '<option value="' . esc_attr( lcfirst( $option ) ) . '" id="' . esc_attr( $option ) . '"', lcfirst( $option ) == $columns ? ' selected="selected"' : '', '>', esc_html( $option ), '</option>';
+				foreach ($options as $option) {
+					echo '<option value="' . esc_attr(lcfirst($option)) . '" id="' . esc_attr($option) . '"', lcfirst($option) == $columns ? ' selected="selected"' : '', '>', esc_html($option), '</option>';
 				}
 			?>
 			</select>
 		</p>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'orderby' ) ); ?>"><?php esc_html_e( 'Order By:', 'lsx-projects' ); ?></label>
-			<select name="<?php echo esc_attr( $this->get_field_name( 'orderby' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'orderby' ) ); ?>" class="widefat">
+			<label for="<?php echo esc_attr($this->get_field_id('orderby')); ?>"><?php esc_html_e('Order By:', 'lsx-projects'); ?></label>
+			<select name="<?php echo esc_attr($this->get_field_name('orderby')); ?>" id="<?php echo esc_attr($this->get_field_id('orderby')); ?>" class="widefat">
 			<?php
 				$options = array(
-					esc_html__( 'None', 'lsx-projects' ) => 'none',
-					esc_html__( 'ID', 'lsx-projects' ) => 'ID',
-					esc_html__( 'Name', 'lsx-projects' ) => 'name',
-					esc_html__( 'Date', 'lsx-projects' ) => 'date',
-					esc_html__( 'Modified Date', 'lsx-projects' ) => 'modified',
-					esc_html__( 'Random', 'lsx-projects' ) => 'rand',
-					esc_html__( 'Menu (WP dashboard order)', 'lsx-projects' ) => 'menu_order',
+					esc_html__('None', 'lsx-projects') => 'none',
+					esc_html__('ID', 'lsx-projects') => 'ID',
+					esc_html__('Name', 'lsx-projects') => 'name',
+					esc_html__('Date', 'lsx-projects') => 'date',
+					esc_html__('Modified Date', 'lsx-projects') => 'modified',
+					esc_html__('Random', 'lsx-projects') => 'rand',
+					esc_html__('Menu (WP dashboard order)', 'lsx-projects') => 'menu_order',
 				);
 
-				foreach ( $options as $name => $value ) {
-					echo '<option value="' . esc_attr( $value ) . '" id="' . esc_attr( $value ) . '"', $orderby == $value ? ' selected="selected"' : '', '>', esc_html( $name ), '</option>';
+				foreach ($options as $name => $value) {
+					echo '<option value="' . esc_attr($value) . '" id="' . esc_attr($value) . '"', $orderby == $value ? ' selected="selected"' : '', '>', esc_html($name), '</option>';
 				}
 			?>
 			</select>
 		</p>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'order' ) ); ?>"><?php esc_html_e( 'Order:', 'lsx-projects' ); ?></label>
-			<select name="<?php echo esc_attr( $this->get_field_name( 'order' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'order' ) ); ?>" class="widefat">
+			<label for="<?php echo esc_attr($this->get_field_id('order')); ?>"><?php esc_html_e('Order:', 'lsx-projects'); ?></label>
+			<select name="<?php echo esc_attr($this->get_field_name('order')); ?>" id="<?php echo esc_attr($this->get_field_id('order')); ?>" class="widefat">
 			<?php
 				$options = array(
-					esc_html__( 'Ascending', 'lsx-projects' ) => 'ASC',
-					esc_html__( 'Descending', 'lsx-projects' ) => 'DESC',
+					esc_html__('Ascending', 'lsx-projects') => 'ASC',
+					esc_html__('Descending', 'lsx-projects') => 'DESC',
 				);
 
-				foreach ( $options as $name => $value ) {
-					echo '<option value="' . esc_attr( $value ) . '" id="' . esc_attr( $value ) . '"', $order == $value ? ' selected="selected"' : '', '>', esc_html( $name ), '</option>';
+				foreach ($options as $name => $value) {
+					echo '<option value="' . esc_attr($value) . '" id="' . esc_attr($value) . '"', $order == $value ? ' selected="selected"' : '', '>', esc_html($name), '</option>';
 				}
 			?>
 			</select>
 		</p>
 		<p class="limit">
-			<label for="<?php echo esc_attr( $this->get_field_id( 'limit' ) ); ?>"><?php esc_html_e( 'Maximum amount:', 'lsx-projects' ); ?></label>
-			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'limit' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'limit' ) ); ?>" type="text" value="<?php echo esc_attr( $limit ); ?>" />
-			<small><?php esc_html_e( 'Leave empty to display all', 'lsx-projects' ); ?></small>
+			<label for="<?php echo esc_attr($this->get_field_id('limit')); ?>"><?php esc_html_e('Maximum amount:', 'lsx-projects'); ?></label>
+			<input class="widefat" id="<?php echo esc_attr($this->get_field_id('limit')); ?>" name="<?php echo esc_attr($this->get_field_name('limit')); ?>" type="text" value="<?php echo esc_attr($limit); ?>" />
+			<small><?php esc_html_e('Leave empty to display all', 'lsx-projects'); ?></small>
 		</p>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'include' ) ); ?>"><?php esc_html_e( 'Specify Projects by ID:', 'lsx-projects' ); ?></label>
-			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'include' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'include' ) ); ?>" type="text" value="<?php echo esc_attr( $include ); ?>" />
-			<small><?php esc_html_e( 'Comma separated list, overrides limit and order settings', 'lsx-projects' ); ?></small>
+			<label for="<?php echo esc_attr($this->get_field_id('include')); ?>"><?php esc_html_e('Specify Projects by ID:', 'lsx-projects'); ?></label>
+			<input class="widefat" id="<?php echo esc_attr($this->get_field_id('include')); ?>" name="<?php echo esc_attr($this->get_field_name('include')); ?>" type="text" value="<?php echo esc_attr($include); ?>" />
+			<small><?php esc_html_e('Comma separated list, overrides limit and order settings', 'lsx-projects'); ?></small>
 		</p>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'display' ) ); ?>"><?php esc_html_e( 'Display:', 'lsx-projects' ); ?></label>
-			<select name="<?php echo esc_attr( $this->get_field_name( 'display' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'display' ) ); ?>" class="widefat">
+			<label for="<?php echo esc_attr($this->get_field_id('display')); ?>"><?php esc_html_e('Display:', 'lsx-projects'); ?></label>
+			<select name="<?php echo esc_attr($this->get_field_name('display')); ?>" id="<?php echo esc_attr($this->get_field_id('display')); ?>" class="widefat">
 			<?php
 				$options = array(
-					esc_html__( 'Excerpt', 'lsx-projects' ) => 'excerpt',
-					esc_html__( 'Full Content', 'lsx-projects' ) => 'full',
+					esc_html__('Excerpt', 'lsx-projects') => 'excerpt',
+					esc_html__('Full Content', 'lsx-projects') => 'full',
 				);
 
-				foreach ( $options as $name => $value ) {
-					echo '<option value="' . esc_attr( $value ) . '" id="' . esc_attr( $value ) . '"', $display == $value ? ' selected="selected"' : '', '>', esc_html( $name ), '</option>';
+				foreach ($options as $name => $value) {
+					echo '<option value="' . esc_attr($value) . '" id="' . esc_attr($value) . '"', $display == $value ? ' selected="selected"' : '', '>', esc_html($name), '</option>';
 				}
 			?>
 			</select>
 		</p>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'size' ) ); ?>"><?php esc_html_e( 'Image size:', 'lsx-projects' ); ?></label>
-			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'size' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'size' ) ); ?>" type="text" value="<?php echo esc_attr( $size ); ?>" />
+			<label for="<?php echo esc_attr($this->get_field_id('size')); ?>"><?php esc_html_e('Image size:', 'lsx-projects'); ?></label>
+			<input class="widefat" id="<?php echo esc_attr($this->get_field_id('size')); ?>" name="<?php echo esc_attr($this->get_field_name('size')); ?>" type="text" value="<?php echo esc_attr($size); ?>" />
 		</p>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'button_text' ) ); ?>"><?php esc_html_e( 'Button "view all" text:', 'lsx-projects' ); ?></label>
-			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'button_text' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'button_text' ) ); ?>" type="text" value="<?php echo esc_attr( $button_text ); ?>" />
-			<small><?php esc_html_e( 'Leave empty to not display the button', 'lsx-projects' ); ?></small>
+			<label for="<?php echo esc_attr($this->get_field_id('button_text')); ?>"><?php esc_html_e('Button "view all" text:', 'lsx-projects'); ?></label>
+			<input class="widefat" id="<?php echo esc_attr($this->get_field_id('button_text')); ?>" name="<?php echo esc_attr($this->get_field_name('button_text')); ?>" type="text" value="<?php echo esc_attr($button_text); ?>" />
+			<small><?php esc_html_e('Leave empty to not display the button', 'lsx-projects'); ?></small>
 		</p>
 		<p>
-			<input id="<?php echo esc_attr( $this->get_field_id( 'show_image' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'show_image' ) ); ?>" type="checkbox" value="1" <?php checked( '1', $show_image ); ?> />
-			<label for="<?php echo esc_attr( $this->get_field_id( 'show_image' ) ); ?>"><?php esc_html_e( 'Display Images', 'lsx-projects' ); ?></label>
+			<input id="<?php echo esc_attr($this->get_field_id('show_image')); ?>" name="<?php echo esc_attr($this->get_field_name('show_image')); ?>" type="checkbox" value="1" <?php checked('1', $show_image); ?> />
+			<label for="<?php echo esc_attr($this->get_field_id('show_image')); ?>"><?php esc_html_e('Display Images', 'lsx-projects'); ?></label>
 		</p>
 		<p>
-			<input id="<?php echo esc_attr( $this->get_field_id( 'responsive' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'responsive' ) ); ?>" type="checkbox" value="1" <?php checked( '1', $responsive ); ?> />
-			<label for="<?php echo esc_attr( $this->get_field_id( 'responsive' ) ); ?>"><?php esc_html_e( 'Responsive Images', 'lsx-projects' ); ?></label>
+			<input id="<?php echo esc_attr($this->get_field_id('responsive')); ?>" name="<?php echo esc_attr($this->get_field_name('responsive')); ?>" type="checkbox" value="1" <?php checked('1', $responsive); ?> />
+			<label for="<?php echo esc_attr($this->get_field_id('responsive')); ?>"><?php esc_html_e('Responsive Images', 'lsx-projects'); ?></label>
 		</p>
 		<p>
-			<input id="<?php echo esc_attr( $this->get_field_id( 'carousel' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'carousel' ) ); ?>" type="checkbox" value="1" <?php checked( '1', $carousel ); ?> />
-			<label for="<?php echo esc_attr( $this->get_field_id( 'carousel' ) ); ?>"><?php esc_html_e( 'Carousel', 'lsx-projects' ); ?></label>
+			<input id="<?php echo esc_attr($this->get_field_id('carousel')); ?>" name="<?php echo esc_attr($this->get_field_name('carousel')); ?>" type="checkbox" value="1" <?php checked('1', $carousel); ?> />
+			<label for="<?php echo esc_attr($this->get_field_id('carousel')); ?>"><?php esc_html_e('Carousel', 'lsx-projects'); ?></label>
 		</p>
 		<p>
-			<input id="<?php echo esc_attr( $this->get_field_id( 'featured' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'featured' ) ); ?>" type="checkbox" value="1" <?php checked( '1', $featured ); ?> />
-			<label for="<?php echo esc_attr( $this->get_field_id( 'featured' ) ); ?>"><?php esc_html_e( 'Featured posts', 'lsx-projects' ); ?></label>
+			<input id="<?php echo esc_attr($this->get_field_id('featured')); ?>" name="<?php echo esc_attr($this->get_field_name('featured')); ?>" type="checkbox" value="1" <?php checked('1', $featured); ?> />
+			<label for="<?php echo esc_attr($this->get_field_id('featured')); ?>"><?php esc_html_e('Featured posts', 'lsx-projects'); ?></label>
 		</p>
 		<?php
 	}
@@ -294,6 +294,6 @@ 
 }
 
 function lsx_projects_register_widget() {
-	return register_widget( 'LSX_Projects_Widget' );
+	return register_widget('LSX_Projects_Widget');
 }
-add_action( 'widgets_init', 'lsx_projects_register_widget' );
+add_action('widgets_init', 'lsx_projects_register_widget');

Indentation +181 added lines, -181 removed lines

@@ -10,173 +10,173 @@ 
  */
 class LSX_Projects_Widget extends WP_Widget {
 
-	public function __construct() {
-		$widget_ops = array(
-			'classname' => 'lsx-projects',
-		);
+     public function __construct() {
+          $widget_ops = array(
+               'classname' => 'lsx-projects',
+          );
 
-		parent::__construct( 'LSX_Projects_Widget', esc_html__( 'LSX Projects', 'lsx-projects' ), $widget_ops );
-	}
+          parent::__construct( 'LSX_Projects_Widget', esc_html__( 'LSX Projects', 'lsx-projects' ), $widget_ops );
+     }
 
-	function widget( $args, $instance ) {
-		extract( $args );
+     function widget( $args, $instance ) {
+          extract( $args );
 
-		$title = $instance['title'];
-		$title_link = $instance['title_link'];
-		$tagline = $instance['tagline'];
-		$columns = $instance['columns'];
-		$orderby = $instance['orderby'];
-		$order = $instance['order'];
-		$limit = $instance['limit'];
-		$include = $instance['include'];
-		$display = $instance['display'];
-		$size = $instance['size'];
-		$button_text = $instance['button_text'];
-		$responsive = $instance['responsive'];
-		$show_image = $instance['show_image'];
-		$carousel = $instance['carousel'];
-		$featured = $instance['featured'];
+          $title = $instance['title'];
+          $title_link = $instance['title_link'];
+          $tagline = $instance['tagline'];
+          $columns = $instance['columns'];
+          $orderby = $instance['orderby'];
+          $order = $instance['order'];
+          $limit = $instance['limit'];
+          $include = $instance['include'];
+          $display = $instance['display'];
+          $size = $instance['size'];
+          $button_text = $instance['button_text'];
+          $responsive = $instance['responsive'];
+          $show_image = $instance['show_image'];
+          $carousel = $instance['carousel'];
+          $featured = $instance['featured'];
 
-		// If limit not set, display 99 posts
-		if ( empty( $limit ) ) {
-			$limit = '99';
-		}
+          // If limit not set, display 99 posts
+          if ( empty( $limit ) ) {
+               $limit = '99';
+          }
 
-		// If specific posts included, display 99 posts
-		if ( ! empty( $include ) ) {
-			$limit = '99';
-		}
+          // If specific posts included, display 99 posts
+          if ( ! empty( $include ) ) {
+               $limit = '99';
+          }
 
-		if ( '1' == $responsive ) {
-			$responsive = 'true';
-		} else {
-			$responsive = 'false';
-		}
+          if ( '1' == $responsive ) {
+               $responsive = 'true';
+          } else {
+               $responsive = 'false';
+          }
 
-		if ( '1' == $show_image ) {
-			$show_image = 'true';
-		} else {
-			$show_image = 'false';
-		}
+          if ( '1' == $show_image ) {
+               $show_image = 'true';
+          } else {
+               $show_image = 'false';
+          }
 
-		if ( '1' == $carousel ) {
-			$carousel = 'true';
-		} else {
-			$carousel = 'false';
-		}
+          if ( '1' == $carousel ) {
+               $carousel = 'true';
+          } else {
+               $carousel = 'false';
+          }
 
-		if ( '1' == $featured ) {
-			$featured = 'true';
-		} else {
-			$featured = 'false';
-		}
+          if ( '1' == $featured ) {
+               $featured = 'true';
+          } else {
+               $featured = 'false';
+          }
 
-		if ( $title_link ) {
-			//$link_open = '<a href="' . $title_link . '">';
-			$link_open = '';
-			$link_btn_open = '<a href="' . $title_link . '" class="btn border-btn">';
-			//$link_close = '</a>';
-			$link_close = '';
-			$link_btn_close = '</a>';
-		} else {
-			$link_open = '';
-			$link_btn_open = '';
-			$link_close = '';
-			$link_btn_close = '';
-		}
+          if ( $title_link ) {
+               //$link_open = '<a href="' . $title_link . '">';
+               $link_open = '';
+               $link_btn_open = '<a href="' . $title_link . '" class="btn border-btn">';
+               //$link_close = '</a>';
+               $link_close = '';
+               $link_btn_close = '</a>';
+          } else {
+               $link_open = '';
+               $link_btn_open = '';
+               $link_close = '';
+               $link_btn_close = '';
+          }
 
-		echo wp_kses_post( $before_widget );
+          echo wp_kses_post( $before_widget );
 
-		if ( $title ) {
-			echo wp_kses_post( $before_title . $link_open . $title . $link_close . $after_title );
-		}
+          if ( $title ) {
+               echo wp_kses_post( $before_title . $link_open . $title . $link_close . $after_title );
+          }
 
-		if ( $tagline ) {
-			echo '<p class="tagline text-center">' . esc_html( $tagline ) . '</p>';
-		}
+          if ( $tagline ) {
+               echo '<p class="tagline text-center">' . esc_html( $tagline ) . '</p>';
+          }
 
-		if ( class_exists( 'LSX_Projects' ) ) {
-			lsx_projects( array(
-				'columns' => $columns,
-				'orderby' => $orderby,
-				'order' => $order,
-				'limit' => $limit,
-				'include' => $include,
-				'display' => $display,
-				'size' => $size,
-				'responsive' => $responsive,
-				'show_image' => $show_image,
-				'carousel' => $carousel,
-				'featured' => $featured,
-			) );
-		};
+          if ( class_exists( 'LSX_Projects' ) ) {
+               lsx_projects( array(
+                    'columns' => $columns,
+                    'orderby' => $orderby,
+                    'order' => $order,
+                    'limit' => $limit,
+                    'include' => $include,
+                    'display' => $display,
+                    'size' => $size,
+                    'responsive' => $responsive,
+                    'show_image' => $show_image,
+                    'carousel' => $carousel,
+                    'featured' => $featured,
+               ) );
+          };
 
-		if ( $button_text && $title_link ) {
-			echo wp_kses_post( '<p class="text-center lsx-projects-archive-link-wrap"><span class="lsx-projects-archive-link">' . $link_btn_open . $button_text . ' <i class="fa fa-angle-right"></i>' . $link_btn_close . '</span></p>' );
-		}
+          if ( $button_text && $title_link ) {
+               echo wp_kses_post( '<p class="text-center lsx-projects-archive-link-wrap"><span class="lsx-projects-archive-link">' . $link_btn_open . $button_text . ' <i class="fa fa-angle-right"></i>' . $link_btn_close . '</span></p>' );
+          }
 
-		echo wp_kses_post( $after_widget );
-	}
+          echo wp_kses_post( $after_widget );
+     }
 
-	function update( $new_instance, $old_instance ) {
-		$instance = $old_instance;
+     function update( $new_instance, $old_instance ) {
+          $instance = $old_instance;
 
-		$instance['title'] = wp_kses_post( force_balance_tags( $new_instance['title'] ) );
-		$instance['title_link'] = strip_tags( $new_instance['title_link'] );
-		$instance['tagline'] = wp_kses_post( force_balance_tags( $new_instance['tagline'] ) );
-		$instance['columns'] = strip_tags( $new_instance['columns'] );
-		$instance['orderby'] = strip_tags( $new_instance['orderby'] );
-		$instance['order'] = strip_tags( $new_instance['order'] );
-		$instance['limit'] = strip_tags( $new_instance['limit'] );
-		$instance['include'] = strip_tags( $new_instance['include'] );
-		$instance['display'] = strip_tags( $new_instance['display'] );
-		$instance['size'] = strip_tags( $new_instance['size'] );
-		$instance['button_text'] = strip_tags( $new_instance['button_text'] );
-		$instance['responsive'] = strip_tags( $new_instance['responsive'] );
-		$instance['show_image'] = strip_tags( $new_instance['show_image'] );
-		$instance['carousel'] = strip_tags( $new_instance['carousel'] );
-		$instance['featured'] = strip_tags( $new_instance['featured'] );
+          $instance['title'] = wp_kses_post( force_balance_tags( $new_instance['title'] ) );
+          $instance['title_link'] = strip_tags( $new_instance['title_link'] );
+          $instance['tagline'] = wp_kses_post( force_balance_tags( $new_instance['tagline'] ) );
+          $instance['columns'] = strip_tags( $new_instance['columns'] );
+          $instance['orderby'] = strip_tags( $new_instance['orderby'] );
+          $instance['order'] = strip_tags( $new_instance['order'] );
+          $instance['limit'] = strip_tags( $new_instance['limit'] );
+          $instance['include'] = strip_tags( $new_instance['include'] );
+          $instance['display'] = strip_tags( $new_instance['display'] );
+          $instance['size'] = strip_tags( $new_instance['size'] );
+          $instance['button_text'] = strip_tags( $new_instance['button_text'] );
+          $instance['responsive'] = strip_tags( $new_instance['responsive'] );
+          $instance['show_image'] = strip_tags( $new_instance['show_image'] );
+          $instance['carousel'] = strip_tags( $new_instance['carousel'] );
+          $instance['featured'] = strip_tags( $new_instance['featured'] );
 
-		return $instance;
-	}
+          return $instance;
+     }
 
-	function form( $instance ) {
-		$defaults = array(
-			'title' => 'Projects',
-			'title_link' => '',
-			'tagline' => '',
-			'columns' => '3',
-			'orderby' => 'name',
-			'order' => 'ASC',
-			'limit' => '',
-			'include' => '',
-			'display' => 'excerpt',
-			'size' => 'lsx-thumbnail-single',
-			'button_text' => '',
-			'responsive' => 1,
-			'show_image' => 1,
-			'carousel' => 1,
-			'featured' => 0,
-		);
+     function form( $instance ) {
+          $defaults = array(
+               'title' => 'Projects',
+               'title_link' => '',
+               'tagline' => '',
+               'columns' => '3',
+               'orderby' => 'name',
+               'order' => 'ASC',
+               'limit' => '',
+               'include' => '',
+               'display' => 'excerpt',
+               'size' => 'lsx-thumbnail-single',
+               'button_text' => '',
+               'responsive' => 1,
+               'show_image' => 1,
+               'carousel' => 1,
+               'featured' => 0,
+          );
 
-		$instance = wp_parse_args( (array) $instance, $defaults );
+          $instance = wp_parse_args( (array) $instance, $defaults );
 
-		$title          = esc_attr( $instance['title'] );
-		$title_link     = esc_attr( $instance['title_link'] );
-		$tagline        = esc_attr( $instance['tagline'] );
-		$columns        = esc_attr( $instance['columns'] );
-		$orderby        = esc_attr( $instance['orderby'] );
-		$order          = esc_attr( $instance['order'] );
-		$limit          = esc_attr( $instance['limit'] );
-		$include        = esc_attr( $instance['include'] );
-		$display        = esc_attr( $instance['display'] );
-		$size           = esc_attr( $instance['size'] );
-		$button_text    = esc_attr( $instance['button_text'] );
-		$responsive     = esc_attr( $instance['responsive'] );
-		$show_image     = esc_attr( $instance['show_image'] );
-		$carousel       = esc_attr( $instance['carousel'] );
-		$featured       = esc_attr( $instance['featured'] );
-		?>
+          $title          = esc_attr( $instance['title'] );
+          $title_link     = esc_attr( $instance['title_link'] );
+          $tagline        = esc_attr( $instance['tagline'] );
+          $columns        = esc_attr( $instance['columns'] );
+          $orderby        = esc_attr( $instance['orderby'] );
+          $order          = esc_attr( $instance['order'] );
+          $limit          = esc_attr( $instance['limit'] );
+          $include        = esc_attr( $instance['include'] );
+          $display        = esc_attr( $instance['display'] );
+          $size           = esc_attr( $instance['size'] );
+          $button_text    = esc_attr( $instance['button_text'] );
+          $responsive     = esc_attr( $instance['responsive'] );
+          $show_image     = esc_attr( $instance['show_image'] );
+          $carousel       = esc_attr( $instance['carousel'] );
+          $featured       = esc_attr( $instance['featured'] );
+          ?>
 		<p>
 			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php esc_html_e( 'Title:', 'lsx-projects' ); ?></label>
 			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" />
@@ -195,47 +195,47 @@ 
 			<label for="<?php echo esc_attr( $this->get_field_id( 'columns' ) ); ?>"><?php esc_html_e( 'Columns:', 'lsx-projects' ); ?></label>
 			<select name="<?php echo esc_attr( $this->get_field_name( 'columns' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'columns' ) ); ?>" class="widefat">
 			<?php
-				$options = array( '1', '2', '3', '4' );
+                    $options = array( '1', '2', '3', '4' );
 
-				foreach ( $options as $option ) {
-					echo '<option value="' . esc_attr( lcfirst( $option ) ) . '" id="' . esc_attr( $option ) . '"', lcfirst( $option ) == $columns ? ' selected="selected"' : '', '>', esc_html( $option ), '</option>';
-				}
-			?>
+                    foreach ( $options as $option ) {
+                         echo '<option value="' . esc_attr( lcfirst( $option ) ) . '" id="' . esc_attr( $option ) . '"', lcfirst( $option ) == $columns ? ' selected="selected"' : '', '>', esc_html( $option ), '</option>';
+                    }
+               ?>
 			</select>
 		</p>
 		<p>
 			<label for="<?php echo esc_attr( $this->get_field_id( 'orderby' ) ); ?>"><?php esc_html_e( 'Order By:', 'lsx-projects' ); ?></label>
 			<select name="<?php echo esc_attr( $this->get_field_name( 'orderby' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'orderby' ) ); ?>" class="widefat">
 			<?php
-				$options = array(
-					esc_html__( 'None', 'lsx-projects' ) => 'none',
-					esc_html__( 'ID', 'lsx-projects' ) => 'ID',
-					esc_html__( 'Name', 'lsx-projects' ) => 'name',
-					esc_html__( 'Date', 'lsx-projects' ) => 'date',
-					esc_html__( 'Modified Date', 'lsx-projects' ) => 'modified',
-					esc_html__( 'Random', 'lsx-projects' ) => 'rand',
-					esc_html__( 'Menu (WP dashboard order)', 'lsx-projects' ) => 'menu_order',
-				);
+                    $options = array(
+                         esc_html__( 'None', 'lsx-projects' ) => 'none',
+                         esc_html__( 'ID', 'lsx-projects' ) => 'ID',
+                         esc_html__( 'Name', 'lsx-projects' ) => 'name',
+                         esc_html__( 'Date', 'lsx-projects' ) => 'date',
+                         esc_html__( 'Modified Date', 'lsx-projects' ) => 'modified',
+                         esc_html__( 'Random', 'lsx-projects' ) => 'rand',
+                         esc_html__( 'Menu (WP dashboard order)', 'lsx-projects' ) => 'menu_order',
+                    );
 
-				foreach ( $options as $name => $value ) {
-					echo '<option value="' . esc_attr( $value ) . '" id="' . esc_attr( $value ) . '"', $orderby == $value ? ' selected="selected"' : '', '>', esc_html( $name ), '</option>';
-				}
-			?>
+                    foreach ( $options as $name => $value ) {
+                         echo '<option value="' . esc_attr( $value ) . '" id="' . esc_attr( $value ) . '"', $orderby == $value ? ' selected="selected"' : '', '>', esc_html( $name ), '</option>';
+                    }
+               ?>
 			</select>
 		</p>
 		<p>
 			<label for="<?php echo esc_attr( $this->get_field_id( 'order' ) ); ?>"><?php esc_html_e( 'Order:', 'lsx-projects' ); ?></label>
 			<select name="<?php echo esc_attr( $this->get_field_name( 'order' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'order' ) ); ?>" class="widefat">
 			<?php
-				$options = array(
-					esc_html__( 'Ascending', 'lsx-projects' ) => 'ASC',
-					esc_html__( 'Descending', 'lsx-projects' ) => 'DESC',
-				);
+                    $options = array(
+                         esc_html__( 'Ascending', 'lsx-projects' ) => 'ASC',
+                         esc_html__( 'Descending', 'lsx-projects' ) => 'DESC',
+                    );
 
-				foreach ( $options as $name => $value ) {
-					echo '<option value="' . esc_attr( $value ) . '" id="' . esc_attr( $value ) . '"', $order == $value ? ' selected="selected"' : '', '>', esc_html( $name ), '</option>';
-				}
-			?>
+                    foreach ( $options as $name => $value ) {
+                         echo '<option value="' . esc_attr( $value ) . '" id="' . esc_attr( $value ) . '"', $order == $value ? ' selected="selected"' : '', '>', esc_html( $name ), '</option>';
+                    }
+               ?>
 			</select>
 		</p>
 		<p class="limit">
@@ -252,15 +252,15 @@ 
 			<label for="<?php echo esc_attr( $this->get_field_id( 'display' ) ); ?>"><?php esc_html_e( 'Display:', 'lsx-projects' ); ?></label>
 			<select name="<?php echo esc_attr( $this->get_field_name( 'display' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'display' ) ); ?>" class="widefat">
 			<?php
-				$options = array(
-					esc_html__( 'Excerpt', 'lsx-projects' ) => 'excerpt',
-					esc_html__( 'Full Content', 'lsx-projects' ) => 'full',
-				);
+                    $options = array(
+                         esc_html__( 'Excerpt', 'lsx-projects' ) => 'excerpt',
+                         esc_html__( 'Full Content', 'lsx-projects' ) => 'full',
+                    );
 
-				foreach ( $options as $name => $value ) {
-					echo '<option value="' . esc_attr( $value ) . '" id="' . esc_attr( $value ) . '"', $display == $value ? ' selected="selected"' : '', '>', esc_html( $name ), '</option>';
-				}
-			?>
+                    foreach ( $options as $name => $value ) {
+                         echo '<option value="' . esc_attr( $value ) . '" id="' . esc_attr( $value ) . '"', $display == $value ? ' selected="selected"' : '', '>', esc_html( $name ), '</option>';
+                    }
+               ?>
 			</select>
 		</p>
 		<p>
@@ -289,11 +289,11 @@ 
 			<label for="<?php echo esc_attr( $this->get_field_id( 'featured' ) ); ?>"><?php esc_html_e( 'Featured posts', 'lsx-projects' ); ?></label>
 		</p>
 		<?php
-	}
+     }
 
 }
 
 function lsx_projects_register_widget() {
-	return register_widget( 'LSX_Projects_Widget' );
+     return register_widget( 'LSX_Projects_Widget' );
 }
 add_action( 'widgets_init', 'lsx_projects_register_widget' );

lsx-projects.php

Spacing +5 added lines, -5 removed lines

@@ -13,14 +13,14 @@
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	die;
 }
 
-define( 'LSX_PROJECTS_PATH', plugin_dir_path( __FILE__ ) );
-define( 'LSX_PROJECTS_CORE', __FILE__ );
-define( 'LSX_PROJECTS_URL', plugin_dir_url( __FILE__ ) );
-define( 'LSX_PROJECTS_VER', '1.1.3' );
+define('LSX_PROJECTS_PATH', plugin_dir_path(__FILE__));
+define('LSX_PROJECTS_CORE', __FILE__);
+define('LSX_PROJECTS_URL', plugin_dir_url(__FILE__));
+define('LSX_PROJECTS_VER', '1.1.3');
 
 /* ======================= Below is the Plugin Class init ========================= */
 

Indentation +1 added lines, -1 removed lines

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

classes/class-lsx-projects-frontend.php

Spacing +64 added lines, -64 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);
 			}
 		}
 
@@ -221,15 +221,15 @@ 
 	public function add_form_modal() {
 		global $lsx_projects;
 
-		if ( empty( $lsx_projects->options['display']['projects_modal_enable'] ) ) {
+		if (empty($lsx_projects->options['display']['projects_modal_enable'])) {
 			return '';
 		}
 
-		if ( empty( $lsx_projects->options['display']['projects_modal_cta_label'] ) || empty( $lsx_projects->options['display']['projects_modal_form_id'] ) ) {
+		if (empty($lsx_projects->options['display']['projects_modal_cta_label']) || empty($lsx_projects->options['display']['projects_modal_form_id'])) {
 			return '';
 		}
 
-		if ( ! is_single( 'project' ) ) {
+		if ( ! is_single('project')) {
 			return '';
 		}
 		?>
@@ -239,11 +239,11 @@ 
 					<button type="button" class="close" data-dismiss="modal">&times;</button>
 
 					<div class="modal-header">
-						<h4 class="modal-title"><?php echo esc_html( $lsx_projects->options['display']['projects_modal_cta_label'] ); ?></h4>
+						<h4 class="modal-title"><?php echo esc_html($lsx_projects->options['display']['projects_modal_cta_label']); ?></h4>
 					</div>
 
 					<div class="modal-body">
-						<?php echo do_shortcode( '[caldera_form id="' . $lsx_projects->options['display']['projects_modal_form_id'] . '"]' ); ?>
+						<?php echo do_shortcode('[caldera_form id="' . $lsx_projects->options['display']['projects_modal_form_id'] . '"]'); ?>
 					</div>
 				</div>
 			</div>

Indentation +209 added lines, -209 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,105 +134,105 @@ 
 			);
 		';
 
-		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() {
-		global $lsx_projects;
-
-		if ( empty( $lsx_projects->options['display']['projects_modal_enable'] ) ) {
-			return '';
-		}
-
-		if ( empty( $lsx_projects->options['display']['projects_modal_cta_label'] ) || empty( $lsx_projects->options['display']['projects_modal_form_id'] ) ) {
-			return '';
-		}
-
-		if ( ! is_single( '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() {
+          global $lsx_projects;
+
+          if ( empty( $lsx_projects->options['display']['projects_modal_enable'] ) ) {
+               return '';
+          }
+
+          if ( empty( $lsx_projects->options['display']['projects_modal_cta_label'] ) || empty( $lsx_projects->options['display']['projects_modal_form_id'] ) ) {
+               return '';
+          }
+
+          if ( ! is_single( 'project' ) ) {
+               return '';
+          }
+          ?>
 		<div class="lsx-modal modal fade" id="lsx-project-contact" role="dialog">
 			<div class="modal-dialog">
 				<div class="modal-content">
@@ -249,7 +249,7 @@ 
 			</div>
 		</div>
 		<?php
-	}
+     }
 
 }
 

classes/class-lsx-projects.php

Spacing +43 added lines, -43 removed lines

@@ -15,14 +15,14 @@ 
 	public function __construct() {
 		$this->options = projects_get_options();
 
-		add_filter( 'lsx_banner_allowed_post_types', array( $this, 'lsx_banner_allowed_post_types' ) );
-		add_filter( 'lsx_banner_allowed_taxonomies', array( $this, 'lsx_banner_allowed_taxonomies' ) );
+		add_filter('lsx_banner_allowed_post_types', array($this, 'lsx_banner_allowed_post_types'));
+		add_filter('lsx_banner_allowed_taxonomies', array($this, 'lsx_banner_allowed_taxonomies'));
 	}
 
 	/**
 	 * Enable project custom post type on LSX Banners.
 	 */
-	public function lsx_banner_allowed_post_types( $post_types ) {
+	public function lsx_banner_allowed_post_types($post_types) {
 		$post_types[] = 'project';
 		return $post_types;
 	}
@@ -30,7 +30,7 @@ 
 	/**
 	 * Enable project custom taxonomies on LSX Banners.
 	 */
-	public function lsx_banner_allowed_taxonomies( $taxonomies ) {
+	public function lsx_banner_allowed_taxonomies($taxonomies) {
 		$taxonomies[] = 'project-group';
 		return $taxonomies;
 	}
@@ -38,9 +38,9 @@ 
 	/**
 	 * Returns the shortcode output markup
 	 */
-	public function output( $atts ) {
+	public function output($atts) {
 		// @codingStandardsIgnoreLine
-		extract( shortcode_atts( array(
+		extract(shortcode_atts(array(
 			'columns' => 3,
 			'orderby' => 'name',
 			'order' => 'ASC',
@@ -52,11 +52,11 @@ 
 			'show_image' => 'true',
 			'carousel' => 'true',
 			'featured' => 'false',
-		), $atts ) );
+		), $atts));
 
 		$output = '';
 
-		if ( 'true' === $responsive || true === $responsive ) {
+		if ('true' === $responsive || true === $responsive) {
 			$responsive = ' img-responsive';
 		} else {
 			$responsive = '';
@@ -65,8 +65,8 @@ 
 		$this->columns = $columns;
 		$this->responsive = $responsive;
 
-		if ( ! empty( $include ) ) {
-			$include = explode( ',', $include );
+		if ( ! empty($include)) {
+			$include = explode(',', $include);
 
 			$args = array(
 				'post_type' => 'project',
@@ -83,27 +83,27 @@ 
 				'order' => $order,
 			);
 
-			if ( 'true' === $featured || true === $featured ) {
+			if ('true' === $featured || true === $featured) {
 				$args['meta_key'] = 'lsx_project_featured';
 				$args['meta_value'] = 1;
 			}
 		}
 
-		$projects = new \WP_Query( $args );
+		$projects = new \WP_Query($args);
 
-		if ( $projects->have_posts() ) {
+		if ($projects->have_posts()) {
 			global $post;
 
 			$count = 0;
 			$count_global = 0;
 
-			if ( 'true' === $carousel || true === $carousel ) {
+			if ('true' === $carousel || true === $carousel) {
 				$output .= "<div id='lsx-projects-slider' class='lsx-projects-shortcode' data-slick='{\"slidesToShow\": $columns, \"slidesToScroll\": $columns }'>";
 			} else {
 				$output .= "<div class='lsx-projects-shortcode'><div class='row'>";
 			}
 
-			while ( $projects->have_posts() ) {
+			while ($projects->have_posts()) {
 				$projects->the_post();
 
 				// Count
@@ -111,31 +111,31 @@ 
 				$count_global++;
 
 				// Content
-				if ( 'full' === $display ) {
-					$content = apply_filters( 'the_content', get_the_content() );
-					$content = str_replace( ']]>', ']]&gt;', $content );
-				} elseif ( 'excerpt' === $display ) {
-					$content = apply_filters( 'the_excerpt', get_the_excerpt() );
+				if ('full' === $display) {
+					$content = apply_filters('the_content', get_the_content());
+					$content = str_replace(']]>', ']]&gt;', $content);
+				} elseif ('excerpt' === $display) {
+					$content = apply_filters('the_excerpt', get_the_excerpt());
 				}
 
 				// Image
-				if ( 'true' === $show_image || true === $show_image ) {
-					if ( is_numeric( $size ) ) {
-						$thumb_size = array( $size, $size );
+				if ('true' === $show_image || true === $show_image) {
+					if (is_numeric($size)) {
+						$thumb_size = array($size, $size);
 					} else {
 						$thumb_size = $size;
 					}
 
-					if ( ! empty( get_the_post_thumbnail( $post->ID ) ) ) {
-						$image = get_the_post_thumbnail( $post->ID, $thumb_size, array(
+					if ( ! empty(get_the_post_thumbnail($post->ID))) {
+						$image = get_the_post_thumbnail($post->ID, $thumb_size, array(
 							'class' => $responsive,
-						) );
+						));
 					} else {
 						$image = '';
 					}
 
-					if ( empty( $image ) ) {
-						if ( ! empty( $this->options['display']['projects_placeholder'] ) ) {
+					if (empty($image)) {
+						if ( ! empty($this->options['display']['projects_placeholder'])) {
 							$image = '<img class="' . $responsive . '" src="' . $this->options['display']['projects_placeholder'] . '" width="' . $size . '" alt="placeholder" />';
 						} else {
 							$image = '';
@@ -147,42 +147,42 @@ 
 
 				// Project groups
 				$groups = '';
-				$terms = get_the_terms( $post->ID, 'project-group' );
+				$terms = get_the_terms($post->ID, 'project-group');
 
-				if ( $terms && ! is_wp_error( $terms ) ) {
+				if ($terms && ! is_wp_error($terms)) {
 					$groups = array();
 
-					foreach ( $terms as $term ) {
+					foreach ($terms as $term) {
 						$groups[] = $term->name;
 					}
 
-					$groups = join( ', ', $groups );
+					$groups = join(', ', $groups);
 				}
 
 				$project_groups = '' !== $groups ? "<p class='lsx-projects-groups'>$groups</p>" : '';
 
-				if ( 'true' === $carousel || true === $carousel ) {
+				if ('true' === $carousel || true === $carousel) {
 					$output .= "
 						<div class='lsx-projects-slot'>
-							" . ( ! empty( $image ) ? "<a href='" . get_permalink() . "'><figure class='lsx-projects-avatar'>$image</figure></a>" : '' ) . "
-							<h5 class='lsx-projects-title'><a href='" . get_permalink() . "'>" . apply_filters( 'the_title', $post->post_title ) . "</a></h5>
+							" . ( ! empty($image) ? "<a href='" . get_permalink() . "'><figure class='lsx-projects-avatar'>$image</figure></a>" : '') . "
+							<h5 class='lsx-projects-title'><a href='" . get_permalink() . "'>" . apply_filters('the_title', $post->post_title) . "</a></h5>
 							$project_groups
-							<div class='lsx-projects-content'><a href='" . get_permalink() . "' class='moretag'>" . esc_html__( 'View more', 'lsx-projects' ) . '</a></div>
+							<div class='lsx-projects-content'><a href='" . get_permalink() . "' class='moretag'>" . esc_html__('View more', 'lsx-projects') . '</a></div>
 						</div>';
-				} elseif ( $columns >= 1 && $columns <= 4 ) {
+				} elseif ($columns >= 1 && $columns <= 4) {
 					$md_col_width = 12 / $columns;
 
 					$output .= "
 						<div class='col-xs-12 col-md-" . $md_col_width . "'>
 							<div class='lsx-projects-slot'>
-								" . ( ! empty( $image ) ? "<a href='" . get_permalink() . "'><figure class='lsx-projects-avatar'>$image</figure></a>" : '' ) . "
-								<h5 class='lsx-projects-title'><a href='" . get_permalink() . "'>" . apply_filters( 'the_title', $post->post_title ) . "</a></h5>
+								" . ( ! empty($image) ? "<a href='" . get_permalink() . "'><figure class='lsx-projects-avatar'>$image</figure></a>" : '') . "
+								<h5 class='lsx-projects-title'><a href='" . get_permalink() . "'>" . apply_filters('the_title', $post->post_title) . "</a></h5>
 								$project_groups
-								<div class='lsx-projects-content'><a href='" . get_permalink() . "' class='moretag'>" . esc_html__( 'View more', 'lsx-projects' ) . '</a></div>
+								<div class='lsx-projects-content'><a href='" . get_permalink() . "' class='moretag'>" . esc_html__('View more', 'lsx-projects') . '</a></div>
 							</div>
 						</div>';
 
-					if ( $count == $columns && $projects->post_count > $count_global ) {
+					if ($count == $columns && $projects->post_count > $count_global) {
 						$output .= '</div>';
 						$output .= "<div class='row'>";
 						$count = 0;
@@ -190,14 +190,14 @@ 
 				} else {
 					$output .= "
 						<p class='bg-warning' style='padding: 20px;'>
-							" . esc_html__( 'Invalid number of columns set. LSX Projects supports 1 to 4 columns.', 'lsx-projects' ) . '
+							" . esc_html__('Invalid number of columns set. LSX Projects supports 1 to 4 columns.', 'lsx-projects') . '
 						</p>';
 				}
 
 				wp_reset_postdata();
 			}
 
-			if ( 'true' !== $carousel && true !== $carousel ) {
+			if ('true' !== $carousel && true !== $carousel) {
 				$output .= '</div>';
 			}
 

Indentation +173 added lines, -173 removed lines

@@ -10,169 +10,169 @@ 
  */
 class LSX_Projects {
 
-	public $columns, $responsive, $options;
-
-	public function __construct() {
-		$this->options = projects_get_options();
-
-		add_filter( 'lsx_banner_allowed_post_types', array( $this, 'lsx_banner_allowed_post_types' ) );
-		add_filter( 'lsx_banner_allowed_taxonomies', array( $this, 'lsx_banner_allowed_taxonomies' ) );
-	}
-
-	/**
-	 * Enable project custom post type on LSX Banners.
-	 */
-	public function lsx_banner_allowed_post_types( $post_types ) {
-		$post_types[] = 'project';
-		return $post_types;
-	}
-
-	/**
-	 * Enable project custom taxonomies on LSX Banners.
-	 */
-	public function lsx_banner_allowed_taxonomies( $taxonomies ) {
-		$taxonomies[] = 'project-group';
-		return $taxonomies;
-	}
-
-	/**
-	 * Returns the shortcode output markup
-	 */
-	public function output( $atts ) {
-		// @codingStandardsIgnoreLine
-		extract( shortcode_atts( array(
-			'columns' => 3,
-			'orderby' => 'name',
-			'order' => 'ASC',
-			'limit' => '-1',
-			'include' => '',
-			'display' => 'excerpt',
-			'size' => 'lsx-thumbnail-single',
-			'responsive' => 'true',
-			'show_image' => 'true',
-			'carousel' => 'true',
-			'featured' => 'false',
-		), $atts ) );
-
-		$output = '';
-
-		if ( 'true' === $responsive || true === $responsive ) {
-			$responsive = ' img-responsive';
-		} else {
-			$responsive = '';
-		}
-
-		$this->columns = $columns;
-		$this->responsive = $responsive;
-
-		if ( ! empty( $include ) ) {
-			$include = explode( ',', $include );
-
-			$args = array(
-				'post_type' => 'project',
-				'posts_per_page' => $limit,
-				'post__in' => $include,
-				'orderby' => 'post__in',
-				'order' => $order,
-			);
-		} else {
-			$args = array(
-				'post_type' => 'project',
-				'posts_per_page' => $limit,
-				'orderby' => $orderby,
-				'order' => $order,
-			);
-
-			if ( 'true' === $featured || true === $featured ) {
-				$args['meta_key'] = 'lsx_project_featured';
-				$args['meta_value'] = 1;
-			}
-		}
-
-		$projects = new \WP_Query( $args );
-
-		if ( $projects->have_posts() ) {
-			global $post;
-
-			$count = 0;
-			$count_global = 0;
-
-			if ( 'true' === $carousel || true === $carousel ) {
-				$output .= "<div id='lsx-projects-slider' class='lsx-projects-shortcode' data-slick='{\"slidesToShow\": $columns, \"slidesToScroll\": $columns }'>";
-			} else {
-				$output .= "<div class='lsx-projects-shortcode'><div class='row'>";
-			}
-
-			while ( $projects->have_posts() ) {
-				$projects->the_post();
-
-				// Count
-				$count++;
-				$count_global++;
-
-				// Content
-				if ( 'full' === $display ) {
-					$content = apply_filters( 'the_content', get_the_content() );
-					$content = str_replace( ']]>', ']]&gt;', $content );
-				} elseif ( 'excerpt' === $display ) {
-					$content = apply_filters( 'the_excerpt', get_the_excerpt() );
-				}
-
-				// Image
-				if ( 'true' === $show_image || true === $show_image ) {
-					if ( is_numeric( $size ) ) {
-						$thumb_size = array( $size, $size );
-					} else {
-						$thumb_size = $size;
-					}
-
-					if ( ! empty( get_the_post_thumbnail( $post->ID ) ) ) {
-						$image = get_the_post_thumbnail( $post->ID, $thumb_size, array(
-							'class' => $responsive,
-						) );
-					} else {
-						$image = '';
-					}
-
-					if ( empty( $image ) ) {
-						if ( ! empty( $this->options['display']['projects_placeholder'] ) ) {
-							$image = '<img class="' . $responsive . '" src="' . $this->options['display']['projects_placeholder'] . '" width="' . $size . '" alt="placeholder" />';
-						} else {
-							$image = '';
-						}
-					}
-				} else {
-					$image = '';
-				}
-
-				// Project groups
-				$groups = '';
-				$terms = get_the_terms( $post->ID, 'project-group' );
-
-				if ( $terms && ! is_wp_error( $terms ) ) {
-					$groups = array();
-
-					foreach ( $terms as $term ) {
-						$groups[] = $term->name;
-					}
-
-					$groups = join( ', ', $groups );
-				}
-
-				$project_groups = '' !== $groups ? "<p class='lsx-projects-groups'>$groups</p>" : '';
-
-				if ( 'true' === $carousel || true === $carousel ) {
-					$output .= "
+     public $columns, $responsive, $options;
+
+     public function __construct() {
+          $this->options = projects_get_options();
+
+          add_filter( 'lsx_banner_allowed_post_types', array( $this, 'lsx_banner_allowed_post_types' ) );
+          add_filter( 'lsx_banner_allowed_taxonomies', array( $this, 'lsx_banner_allowed_taxonomies' ) );
+     }
+
+     /**
+      * Enable project custom post type on LSX Banners.
+      */
+     public function lsx_banner_allowed_post_types( $post_types ) {
+          $post_types[] = 'project';
+          return $post_types;
+     }
+
+     /**
+      * Enable project custom taxonomies on LSX Banners.
+      */
+     public function lsx_banner_allowed_taxonomies( $taxonomies ) {
+          $taxonomies[] = 'project-group';
+          return $taxonomies;
+     }
+
+     /**
+      * Returns the shortcode output markup
+      */
+     public function output( $atts ) {
+          // @codingStandardsIgnoreLine
+          extract( shortcode_atts( array(
+               'columns' => 3,
+               'orderby' => 'name',
+               'order' => 'ASC',
+               'limit' => '-1',
+               'include' => '',
+               'display' => 'excerpt',
+               'size' => 'lsx-thumbnail-single',
+               'responsive' => 'true',
+               'show_image' => 'true',
+               'carousel' => 'true',
+               'featured' => 'false',
+          ), $atts ) );
+
+          $output = '';
+
+          if ( 'true' === $responsive || true === $responsive ) {
+               $responsive = ' img-responsive';
+          } else {
+               $responsive = '';
+          }
+
+          $this->columns = $columns;
+          $this->responsive = $responsive;
+
+          if ( ! empty( $include ) ) {
+               $include = explode( ',', $include );
+
+               $args = array(
+                    'post_type' => 'project',
+                    'posts_per_page' => $limit,
+                    'post__in' => $include,
+                    'orderby' => 'post__in',
+                    'order' => $order,
+               );
+          } else {
+               $args = array(
+                    'post_type' => 'project',
+                    'posts_per_page' => $limit,
+                    'orderby' => $orderby,
+                    'order' => $order,
+               );
+
+               if ( 'true' === $featured || true === $featured ) {
+                    $args['meta_key'] = 'lsx_project_featured';
+                    $args['meta_value'] = 1;
+               }
+          }
+
+          $projects = new \WP_Query( $args );
+
+          if ( $projects->have_posts() ) {
+               global $post;
+
+               $count = 0;
+               $count_global = 0;
+
+               if ( 'true' === $carousel || true === $carousel ) {
+                    $output .= "<div id='lsx-projects-slider' class='lsx-projects-shortcode' data-slick='{\"slidesToShow\": $columns, \"slidesToScroll\": $columns }'>";
+               } else {
+                    $output .= "<div class='lsx-projects-shortcode'><div class='row'>";
+               }
+
+               while ( $projects->have_posts() ) {
+                    $projects->the_post();
+
+                    // Count
+                    $count++;
+                    $count_global++;
+
+                    // Content
+                    if ( 'full' === $display ) {
+                         $content = apply_filters( 'the_content', get_the_content() );
+                         $content = str_replace( ']]>', ']]&gt;', $content );
+                    } elseif ( 'excerpt' === $display ) {
+                         $content = apply_filters( 'the_excerpt', get_the_excerpt() );
+                    }
+
+                    // Image
+                    if ( 'true' === $show_image || true === $show_image ) {
+                         if ( is_numeric( $size ) ) {
+                              $thumb_size = array( $size, $size );
+                         } else {
+                              $thumb_size = $size;
+                         }
+
+                         if ( ! empty( get_the_post_thumbnail( $post->ID ) ) ) {
+                              $image = get_the_post_thumbnail( $post->ID, $thumb_size, array(
+                                   'class' => $responsive,
+                              ) );
+                         } else {
+                              $image = '';
+                         }
+
+                         if ( empty( $image ) ) {
+                              if ( ! empty( $this->options['display']['projects_placeholder'] ) ) {
+                                   $image = '<img class="' . $responsive . '" src="' . $this->options['display']['projects_placeholder'] . '" width="' . $size . '" alt="placeholder" />';
+                              } else {
+                                   $image = '';
+                              }
+                         }
+                    } else {
+                         $image = '';
+                    }
+
+                    // Project groups
+                    $groups = '';
+                    $terms = get_the_terms( $post->ID, 'project-group' );
+
+                    if ( $terms && ! is_wp_error( $terms ) ) {
+                         $groups = array();
+
+                         foreach ( $terms as $term ) {
+                              $groups[] = $term->name;
+                         }
+
+                         $groups = join( ', ', $groups );
+                    }
+
+                    $project_groups = '' !== $groups ? "<p class='lsx-projects-groups'>$groups</p>" : '';
+
+                    if ( 'true' === $carousel || true === $carousel ) {
+                         $output .= "
 						<div class='lsx-projects-slot'>
 							" . ( ! empty( $image ) ? "<a href='" . get_permalink() . "'><figure class='lsx-projects-avatar'>$image</figure></a>" : '' ) . "
 							<h5 class='lsx-projects-title'><a href='" . get_permalink() . "'>" . apply_filters( 'the_title', $post->post_title ) . "</a></h5>
 							$project_groups
 							<div class='lsx-projects-content'><a href='" . get_permalink() . "' class='moretag'>" . esc_html__( 'View more', 'lsx-projects' ) . '</a></div>
 						</div>';
-				} elseif ( $columns >= 1 && $columns <= 4 ) {
-					$md_col_width = 12 / $columns;
+                    } elseif ( $columns >= 1 && $columns <= 4 ) {
+                         $md_col_width = 12 / $columns;
 
-					$output .= "
+                         $output .= "
 						<div class='col-xs-12 col-md-" . $md_col_width . "'>
 							<div class='lsx-projects-slot'>
 								" . ( ! empty( $image ) ? "<a href='" . get_permalink() . "'><figure class='lsx-projects-avatar'>$image</figure></a>" : '' ) . "
@@ -182,30 +182,30 @@ 
 							</div>
 						</div>';
 
-					if ( $count == $columns && $projects->post_count > $count_global ) {
-						$output .= '</div>';
-						$output .= "<div class='row'>";
-						$count = 0;
-					}
-				} else {
-					$output .= "
+                         if ( $count == $columns && $projects->post_count > $count_global ) {
+                              $output .= '</div>';
+                              $output .= "<div class='row'>";
+                              $count = 0;
+                         }
+                    } else {
+                         $output .= "
 						<p class='bg-warning' style='padding: 20px;'>
 							" . esc_html__( 'Invalid number of columns set. LSX Projects supports 1 to 4 columns.', 'lsx-projects' ) . '
 						</p>';
-				}
+                    }
 
-				wp_reset_postdata();
-			}
+                    wp_reset_postdata();
+               }
 
-			if ( 'true' !== $carousel && true !== $carousel ) {
-				$output .= '</div>';
-			}
+               if ( 'true' !== $carousel && true !== $carousel ) {
+                    $output .= '</div>';
+               }
 
-			$output .= '</div>';
+               $output .= '</div>';
 
-			return $output;
-		}
-	}
+               return $output;
+          }
+     }
 
 }
 

classes/admin/class-settings.php

Spacing +19 added lines, -19 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,28 +121,28 @@ 
 	 * @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' ),
+				'name' => __('Contact modal', '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',
 			)
@@ -150,7 +150,7 @@ 
 
 		$cmb->add_field(
 			array(
-				'name' => __( 'Caldera Form ID', 'lsx-projects' ),
+				'name' => __('Caldera Form ID', 'lsx-projects'),
 				'id'   => 'projects_modal_form_id',
 				'type' => 'text',
 			)

Indentation +143 added lines, -143 removed lines

@@ -9,159 +9,159 @@
 
 class Settings {
 
-	/**
-	 * Holds class instance
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var      object \lsx_projects\classes\admin\Settings()
-	 */
-	protected static $instance = null;
+     /**
+      * 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';
+     /**
+      * 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 );
-	}
+     /**
+      * 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;
-	}
+     /**
+      * 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 );
-	}
+     /**
+      * 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' ),
-			)
-		);
+     /**
+      * 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(
+                    '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',
-			)
-		);
-	}
+          $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' ),
-			)
-		);
-		$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' ),
-			)
-		);
+     /**
+      * 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' ),
+               )
+          );
+          $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' => __( 'Button label', 'lsx-projects' ),
+                    'id'   => 'projects_modal_cta_label',
+                    'type' => 'text',
+               )
+          );
 
-		$cmb->add_field(
-			array(
-				'name' => __( 'Caldera Form ID', 'lsx-projects' ),
-				'id'   => 'projects_modal_form_id',
-				'type' => 'text',
-			)
-		);
+          $cmb->add_field(
+               array(
+                    'name' => __( 'Caldera Form ID', 'lsx-projects' ),
+                    'id'   => 'projects_modal_form_id',
+                    'type' => 'text',
+               )
+          );
 
-		$cmb->add_field(
-			array(
-				'id'   => 'settings_contact_modal_closing',
-				'type' => 'tab_closing',
-			)
-		);
-	}
+          $cmb->add_field(
+               array(
+                    'id'   => 'settings_contact_modal_closing',
+                    'type' => 'tab_closing',
+               )
+          );
+     }
 
 }