lightspeeddevelopment / lsx-team

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

Indentation +366 added lines, -366 removed lines

@@ -13,133 +13,133 @@ 
  */
 class LSX_TEAM_SCPO_Engine {
 
-	public function __construct() {
-		if ( ! get_option( 'lsx_team_scporder_install' ) )
-			$this->lsx_team_scporder_install();
+     public function __construct() {
+          if ( ! get_option( 'lsx_team_scporder_install' ) )
+               $this->lsx_team_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-tags', array( $this, 'update_menu_order_tags' ) );
+          add_action( 'wp_ajax_update-menu-order', array( $this, 'update_menu_order' ) );
+          add_action( 'wp_ajax_update-menu-order-tags', array( $this, 'update_menu_order_tags' ) );
 
-		add_action( 'pre_get_posts', array( $this, 'lsx_team_scporder_pre_get_posts' ) );
+          add_action( 'pre_get_posts', array( $this, 'lsx_team_scporder_pre_get_posts' ) );
 
-		add_filter( 'get_previous_post_where', array( $this, 'lsx_team_scporder_previous_post_where' ) );
-		add_filter( 'get_previous_post_sort', array( $this, 'lsx_team_scporder_previous_post_sort' ) );
-		add_filter( 'get_next_post_where', array( $this, 'lsx_team_scporder_next_post_where' ) );
-		add_filter( 'get_next_post_sort', array( $this, 'lsx_team_scporder_next_post_sort' ) );
+          add_filter( 'get_previous_post_where', array( $this, 'lsx_team_scporder_previous_post_where' ) );
+          add_filter( 'get_previous_post_sort', array( $this, 'lsx_team_scporder_previous_post_sort' ) );
+          add_filter( 'get_next_post_where', array( $this, 'lsx_team_scporder_next_post_where' ) );
+          add_filter( 'get_next_post_sort', array( $this, 'lsx_team_scporder_next_post_sort' ) );
 
-		add_filter( 'get_terms_orderby', array( $this, 'lsx_team_scporder_get_terms_orderby' ), 10, 3 );
-		add_filter( 'wp_get_object_terms', array( $this, 'lsx_team_scporder_get_object_terms' ), 10, 3 );
-		add_filter( 'get_terms', array( $this, 'lsx_team_scporder_get_object_terms' ), 10, 3 );
-	}
+          add_filter( 'get_terms_orderby', array( $this, 'lsx_team_scporder_get_terms_orderby' ), 10, 3 );
+          add_filter( 'wp_get_object_terms', array( $this, 'lsx_team_scporder_get_object_terms' ), 10, 3 );
+          add_filter( 'get_terms', array( $this, 'lsx_team_scporder_get_object_terms' ), 10, 3 );
+     }
 
-	public function lsx_team_scporder_install() {
-		global $wpdb;
-		$result = $wpdb->query( "DESCRIBE $wpdb->terms `lsx_team_term_order`" );
+     public function lsx_team_scporder_install() {
+          global $wpdb;
+          $result = $wpdb->query( "DESCRIBE $wpdb->terms `lsx_team_term_order`" );
 
-		if ( ! $result ) {
-			$result = $wpdb->query( "ALTER TABLE $wpdb->terms ADD `lsx_team_term_order` INT( 4 ) NULL DEFAULT '0'" );
-		}
+          if ( ! $result ) {
+               $result = $wpdb->query( "ALTER TABLE $wpdb->terms ADD `lsx_team_term_order` INT( 4 ) NULL DEFAULT '0'" );
+          }
 
-		update_option( 'lsx_team_scporder_install', 1 );
-	}
+          update_option( 'lsx_team_scporder_install', 1 );
+     }
 
-	public function _check_load_script_css() {
-		$active = false;
+     public function _check_load_script_css() {
+          $active = false;
 
-		$objects = $this->get_lsx_team_scporder_options_objects();
-		$tags = $this->get_lsx_team_scporder_options_tags();
+          $objects = $this->get_lsx_team_scporder_options_objects();
+          $tags = $this->get_lsx_team_scporder_options_tags();
 
-		if ( empty( $objects ) && empty( $tags ) )
-			return false;
+          if ( empty( $objects ) && empty( $tags ) )
+               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 ( ! 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 ( ! 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 ( ! empty( $tags ) ) {
-			if ( isset( $_GET['taxonomy'] ) && array_key_exists( sanitize_text_field( wp_unslash( $_GET['taxonomy'] ) ), $tags ) ) {
-				$active = true;
-			}
-		}
+          if ( ! empty( $tags ) ) {
+               if ( isset( $_GET['taxonomy'] ) && array_key_exists( sanitize_text_field( wp_unslash( $_GET['taxonomy'] ) ), $tags ) ) {
+                    $active = true;
+               }
+          }
 
-		return $active;
-	}
+          return $active;
+     }
 
-	public function load_script_css() {
-		if ( $this->_check_load_script_css() ) {
-			wp_enqueue_script( 'scporderjs', LSX_TEAM_URL . 'assets/js/scporder.min.js', array( 'jquery', 'jquery-ui-sortable' ), null, true );
+     public function load_script_css() {
+          if ( $this->_check_load_script_css() ) {
+               wp_enqueue_script( 'scporderjs', LSX_TEAM_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_TEAM_URL . 'assets/css/scporder.css', array(), null );
-		}
-	}
+               wp_enqueue_style( 'scporder', LSX_TEAM_URL . 'assets/css/scporder.css', array(), null );
+          }
+     }
 
-	public function refresh() {
-		global $wpdb;
-		$objects = $this->get_lsx_team_scporder_options_objects();
-		$tags = $this->get_lsx_team_scporder_options_tags();
+     public function refresh() {
+          global $wpdb;
+          $objects = $this->get_lsx_team_scporder_options_objects();
+          $tags = $this->get_lsx_team_scporder_options_tags();
 
-		if ( ! empty( $objects ) ) {
-			foreach ( $objects as $object => $object_data ) {
-				$result = $wpdb->get_results( $wpdb->prepare( "
+          if ( ! empty( $objects ) ) {
+               foreach ( $objects as $object => $object_data ) {
+                    $result = $wpdb->get_results( $wpdb->prepare( "
 					SELECT count( * ) as cnt, max( menu_order ) as max, min( menu_order ) as min
 					FROM $wpdb->posts
 					WHERE post_type = '%s' AND post_status IN ( 'publish', 'pending', 'draft', 'private', 'future' )
 				", $object ) );
 
-				if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max )
-					continue;
+                    if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max )
+                         continue;
 
-				$results = $wpdb->get_results( $wpdb->prepare( "
+                    $results = $wpdb->get_results( $wpdb->prepare( "
 					SELECT ID
 					FROM $wpdb->posts
 					WHERE post_type = '%s' AND post_status IN ( 'publish', 'pending', 'draft', 'private', 'future' )
 					ORDER BY menu_order ASC
 				", $object ) );
 
-				foreach ( $results as $key => $result ) {
-					$wpdb->update( $wpdb->posts,
-						array(
-							'menu_order' => $key + 1,
-						),
-						array(
-							'ID' => $result->ID,
-						)
-					);
-				}
-			}
-		}
-
-		if ( ! empty( $tags ) ) {
-			foreach ( $tags as $taxonomy => $taxonomy_data ) {
-				$result = $wpdb->get_results( $wpdb->prepare( "
+                    foreach ( $results as $key => $result ) {
+                         $wpdb->update( $wpdb->posts,
+                              array(
+                                   'menu_order' => $key + 1,
+                              ),
+                              array(
+                                   'ID' => $result->ID,
+                              )
+                         );
+                    }
+               }
+          }
+
+          if ( ! empty( $tags ) ) {
+               foreach ( $tags as $taxonomy => $taxonomy_data ) {
+                    $result = $wpdb->get_results( $wpdb->prepare( "
 					SELECT count( * ) as cnt, max( lsx_team_term_order ) as max, min( lsx_team_term_order ) as min
 					FROM $wpdb->terms AS terms
 					INNER JOIN $wpdb->term_taxonomy AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id )
 					WHERE term_taxonomy.taxonomy = '%s'
 				", $taxonomy ) );
 
-				if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max )
-					continue;
+                    if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max )
+                         continue;
 
-				$results = $wpdb->get_results( $wpdb->prepare( "
+                    $results = $wpdb->get_results( $wpdb->prepare( "
 					SELECT terms.term_id
 					FROM $wpdb->terms AS terms
 					INNER JOIN $wpdb->term_taxonomy AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id )
@@ -147,270 +147,270 @@ 
 					ORDER BY lsx_team_term_order ASC
 				", $taxonomy ) );
 
-				foreach ( $results as $key => $result ) {
-					$wpdb->update(
-						$wpdb->terms,
-						array(
-							'lsx_team_term_order' => $key + 1,
-						),
-						array(
-							'term_id' => $result->term_id,
-						)
-					);
-				}
-			}
-		}
-	}
-
-	public function update_menu_order() {
-		check_ajax_referer( 'scporder', 'security' );
-
-		global $wpdb;
-
-		parse_str( sanitize_text_field( wp_unslash( $_POST['order'] ) ), $data );
-
-		if ( ! is_array( $data ) )
-			return false;
-
-		$id_arr = array();
-
-		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 ( $results as $result ) {
-				$menu_order_arr[] = $result->menu_order;
-			}
-		}
-
-		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 ),
-					)
-				);
-			}
-		}
-	}
-
-	public function update_menu_order_tags() {
-		check_ajax_referer( 'scporder', 'security' );
-
-		global $wpdb;
-
-		parse_str( sanitize_text_field( wp_unslash( $_POST['order'] ) ), $data );
-
-		if ( ! is_array( $data ) )
-			return false;
-
-		$id_arr = array();
-
-		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( "
+                    foreach ( $results as $key => $result ) {
+                         $wpdb->update(
+                              $wpdb->terms,
+                              array(
+                                   'lsx_team_term_order' => $key + 1,
+                              ),
+                              array(
+                                   'term_id' => $result->term_id,
+                              )
+                         );
+                    }
+               }
+          }
+     }
+
+     public function update_menu_order() {
+          check_ajax_referer( 'scporder', 'security' );
+
+          global $wpdb;
+
+          parse_str( sanitize_text_field( wp_unslash( $_POST['order'] ) ), $data );
+
+          if ( ! is_array( $data ) )
+               return false;
+
+          $id_arr = array();
+
+          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 ( $results as $result ) {
+                    $menu_order_arr[] = $result->menu_order;
+               }
+          }
+
+          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 ),
+                         )
+                    );
+               }
+          }
+     }
+
+     public function update_menu_order_tags() {
+          check_ajax_referer( 'scporder', 'security' );
+
+          global $wpdb;
+
+          parse_str( sanitize_text_field( wp_unslash( $_POST['order'] ) ), $data );
+
+          if ( ! is_array( $data ) )
+               return false;
+
+          $id_arr = array();
+
+          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 lsx_team_term_order 
 				FROM $wpdb->terms 
 				WHERE term_id = " . intval( $id ) );
-			foreach ( $results as $result ) {
-				$menu_order_arr[] = $result->lsx_team_term_order;
-			}
-		}
-
-		sort( $menu_order_arr );
-
-		foreach ( $data as $key => $values ) {
-			foreach ( $values as $position => $id ) {
-				$wpdb->update( $wpdb->terms,
-					array(
-						'lsx_team_term_order' => $menu_order_arr[ $position ],
-					),
-					array(
-						'term_id' => intval( $id ),
-					)
-				);
-			}
-		}
-	}
-
-	public function lsx_team_scporder_previous_post_where( $where ) {
-		global $post;
-		$objects = $this->get_lsx_team_scporder_options_objects();
-
-		if ( empty( $objects ) )
-			return $where;
-
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
-			$current_menu_order = $post->menu_order;
-			$where = "WHERE p.menu_order > '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
-		}
-
-		return $where;
-	}
-
-	public function lsx_team_scporder_previous_post_sort( $orderby ) {
-		global $post;
-		$objects = $this->get_lsx_team_scporder_options_objects();
-
-		if ( empty( $objects ) )
-			return $orderby;
-
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
-			$orderby = 'ORDER BY p.menu_order ASC LIMIT 1';
-		}
-
-		return $orderby;
-	}
-
-	public function lsx_team_scporder_next_post_where( $where ) {
-		global $post;
-		$objects = $this->get_lsx_team_scporder_options_objects();
-
-		if ( empty( $objects ) )
-			return $where;
-
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
-			$current_menu_order = $post->menu_order;
-			$where = "WHERE p.menu_order < '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
-		}
-
-		return $where;
-	}
-
-	public function lsx_team_scporder_next_post_sort( $orderby ) {
-		global $post;
-		$objects = $this->get_lsx_team_scporder_options_objects();
-
-		if ( empty( $objects ) )
-			return $orderby;
-
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
-			$orderby = 'ORDER BY p.menu_order DESC LIMIT 1';
-		}
-
-		return $orderby;
-	}
-
-	public function lsx_team_scporder_pre_get_posts( $wp_query ) {
-		$objects = $this->get_lsx_team_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' );
-			}
-		}
-	}
-
-	public function lsx_team_scporder_get_terms_orderby( $orderby, $args ) {
-		if ( is_admin() )
-			return $orderby;
-
-		$tags = $this->get_lsx_team_scporder_options_tags();
-
-		if ( ! isset( $args['taxonomy'] ) )
-			return $orderby;
-
-		$taxonomy = $args['taxonomy'];
-		if ( is_array( $taxonomy ) && count( $taxonomy ) == 1 )
-			$taxonomy = $taxonomy[0];
-		if ( ! array_key_exists( $taxonomy[0], $tags ) )
-			return $orderby;
-
-		$orderby = 't.lsx_team_term_order';
-		return $orderby;
-	}
-
-	public function lsx_team_scporder_get_object_terms( $terms ) {
-		$tags = $this->get_lsx_team_scporder_options_tags();
-
-		if ( is_admin() && isset( $_GET['orderby'] ) )
-			return $terms;
-
-		foreach ( $terms as $key => $term ) {
-			if ( is_object( $term ) && isset( $term->taxonomy ) ) {
-				$taxonomy = $term->taxonomy;
-				if ( ! array_key_exists( $taxonomy, $tags ) )
-					return $terms;
-			} else {
-				return $terms;
-			}
-		}
-
-		usort( $terms, array( $this, 'taxcmp' ) );
-		return $terms;
-	}
-
-	public function taxcmp( $a, $b ) {
-		if ( $a->lsx_team_term_order == $b->lsx_team_term_order )
-			return 0;
-
-		return ( $a->lsx_team_term_order < $b->lsx_team_term_order ) ? -1 : 1;
-	}
-
-	public function get_lsx_team_scporder_options_objects() {
-		return array(
-			'team' => esc_html_x( 'Team Member', 'post type singular name', 'lsx-team' ),
-		);
-	}
-
-	public function get_lsx_team_scporder_options_tags() {
-		return array(
-			'team_role' => esc_html_x( 'Role', 'taxonomy singular name', 'lsx-team' ),
-		);
-	}
+               foreach ( $results as $result ) {
+                    $menu_order_arr[] = $result->lsx_team_term_order;
+               }
+          }
+
+          sort( $menu_order_arr );
+
+          foreach ( $data as $key => $values ) {
+               foreach ( $values as $position => $id ) {
+                    $wpdb->update( $wpdb->terms,
+                         array(
+                              'lsx_team_term_order' => $menu_order_arr[ $position ],
+                         ),
+                         array(
+                              'term_id' => intval( $id ),
+                         )
+                    );
+               }
+          }
+     }
+
+     public function lsx_team_scporder_previous_post_where( $where ) {
+          global $post;
+          $objects = $this->get_lsx_team_scporder_options_objects();
+
+          if ( empty( $objects ) )
+               return $where;
+
+          if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+               $current_menu_order = $post->menu_order;
+               $where = "WHERE p.menu_order > '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
+          }
+
+          return $where;
+     }
+
+     public function lsx_team_scporder_previous_post_sort( $orderby ) {
+          global $post;
+          $objects = $this->get_lsx_team_scporder_options_objects();
+
+          if ( empty( $objects ) )
+               return $orderby;
+
+          if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+               $orderby = 'ORDER BY p.menu_order ASC LIMIT 1';
+          }
+
+          return $orderby;
+     }
+
+     public function lsx_team_scporder_next_post_where( $where ) {
+          global $post;
+          $objects = $this->get_lsx_team_scporder_options_objects();
+
+          if ( empty( $objects ) )
+               return $where;
+
+          if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+               $current_menu_order = $post->menu_order;
+               $where = "WHERE p.menu_order < '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
+          }
+
+          return $where;
+     }
+
+     public function lsx_team_scporder_next_post_sort( $orderby ) {
+          global $post;
+          $objects = $this->get_lsx_team_scporder_options_objects();
+
+          if ( empty( $objects ) )
+               return $orderby;
+
+          if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+               $orderby = 'ORDER BY p.menu_order DESC LIMIT 1';
+          }
+
+          return $orderby;
+     }
+
+     public function lsx_team_scporder_pre_get_posts( $wp_query ) {
+          $objects = $this->get_lsx_team_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' );
+               }
+          }
+     }
+
+     public function lsx_team_scporder_get_terms_orderby( $orderby, $args ) {
+          if ( is_admin() )
+               return $orderby;
+
+          $tags = $this->get_lsx_team_scporder_options_tags();
+
+          if ( ! isset( $args['taxonomy'] ) )
+               return $orderby;
+
+          $taxonomy = $args['taxonomy'];
+          if ( is_array( $taxonomy ) && count( $taxonomy ) == 1 )
+               $taxonomy = $taxonomy[0];
+          if ( ! array_key_exists( $taxonomy[0], $tags ) )
+               return $orderby;
+
+          $orderby = 't.lsx_team_term_order';
+          return $orderby;
+     }
+
+     public function lsx_team_scporder_get_object_terms( $terms ) {
+          $tags = $this->get_lsx_team_scporder_options_tags();
+
+          if ( is_admin() && isset( $_GET['orderby'] ) )
+               return $terms;
+
+          foreach ( $terms as $key => $term ) {
+               if ( is_object( $term ) && isset( $term->taxonomy ) ) {
+                    $taxonomy = $term->taxonomy;
+                    if ( ! array_key_exists( $taxonomy, $tags ) )
+                         return $terms;
+               } else {
+                    return $terms;
+               }
+          }
+
+          usort( $terms, array( $this, 'taxcmp' ) );
+          return $terms;
+     }
+
+     public function taxcmp( $a, $b ) {
+          if ( $a->lsx_team_term_order == $b->lsx_team_term_order )
+               return 0;
+
+          return ( $a->lsx_team_term_order < $b->lsx_team_term_order ) ? -1 : 1;
+     }
+
+     public function get_lsx_team_scporder_options_objects() {
+          return array(
+               'team' => esc_html_x( 'Team Member', 'post type singular name', 'lsx-team' ),
+          );
+     }
+
+     public function get_lsx_team_scporder_options_tags() {
+          return array(
+               'team_role' => esc_html_x( 'Role', 'taxonomy singular name', 'lsx-team' ),
+          );
+     }
 
 }
 
@@ -420,30 +420,30 @@ 
 register_uninstall_hook( __FILE__, 'lsx_team_scporder_uninstall' );
 
 function lsx_team_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_team_scporder_uninstall_db();
-		}
+          foreach ( $blogids as $blog_id ) {
+               switch_to_blog( $blog_id );
+               lsx_team_scporder_uninstall_db();
+          }
 
-		switch_to_blog( $curr_blog );
-	} else {
-		lsx_team_scporder_uninstall_db();
-	}
+          switch_to_blog( $curr_blog );
+     } else {
+          lsx_team_scporder_uninstall_db();
+     }
 }
 
 function lsx_team_scporder_uninstall_db() {
-	global $wpdb;
-	$result = $wpdb->query( "DESCRIBE $wpdb->terms `lsx_team_term_order`" );
+     global $wpdb;
+     $result = $wpdb->query( "DESCRIBE $wpdb->terms `lsx_team_term_order`" );
 
-	if ( $result ) {
-		$result = $wpdb->query( "ALTER TABLE $wpdb->terms DROP `lsx_team_term_order`" );
-	}
+     if ( $result ) {
+          $result = $wpdb->query( "ALTER TABLE $wpdb->terms DROP `lsx_team_term_order`" );
+     }
 
-	delete_option( 'lsx_team_scporder_install' );
+     delete_option( 'lsx_team_scporder_install' );
 }

Spacing +137 added lines, -137 removed lines

@@ -14,36 +14,36 @@ 
 class LSX_TEAM_SCPO_Engine {
 
 	public function __construct() {
-		if ( ! get_option( 'lsx_team_scporder_install' ) )
+		if (!get_option('lsx_team_scporder_install'))
 			$this->lsx_team_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-tags', array( $this, 'update_menu_order_tags' ) );
+		add_action('wp_ajax_update-menu-order', array($this, 'update_menu_order'));
+		add_action('wp_ajax_update-menu-order-tags', array($this, 'update_menu_order_tags'));
 
-		add_action( 'pre_get_posts', array( $this, 'lsx_team_scporder_pre_get_posts' ) );
+		add_action('pre_get_posts', array($this, 'lsx_team_scporder_pre_get_posts'));
 
-		add_filter( 'get_previous_post_where', array( $this, 'lsx_team_scporder_previous_post_where' ) );
-		add_filter( 'get_previous_post_sort', array( $this, 'lsx_team_scporder_previous_post_sort' ) );
-		add_filter( 'get_next_post_where', array( $this, 'lsx_team_scporder_next_post_where' ) );
-		add_filter( 'get_next_post_sort', array( $this, 'lsx_team_scporder_next_post_sort' ) );
+		add_filter('get_previous_post_where', array($this, 'lsx_team_scporder_previous_post_where'));
+		add_filter('get_previous_post_sort', array($this, 'lsx_team_scporder_previous_post_sort'));
+		add_filter('get_next_post_where', array($this, 'lsx_team_scporder_next_post_where'));
+		add_filter('get_next_post_sort', array($this, 'lsx_team_scporder_next_post_sort'));
 
-		add_filter( 'get_terms_orderby', array( $this, 'lsx_team_scporder_get_terms_orderby' ), 10, 3 );
-		add_filter( 'wp_get_object_terms', array( $this, 'lsx_team_scporder_get_object_terms' ), 10, 3 );
-		add_filter( 'get_terms', array( $this, 'lsx_team_scporder_get_object_terms' ), 10, 3 );
+		add_filter('get_terms_orderby', array($this, 'lsx_team_scporder_get_terms_orderby'), 10, 3);
+		add_filter('wp_get_object_terms', array($this, 'lsx_team_scporder_get_object_terms'), 10, 3);
+		add_filter('get_terms', array($this, 'lsx_team_scporder_get_object_terms'), 10, 3);
 	}
 
 	public function lsx_team_scporder_install() {
 		global $wpdb;
-		$result = $wpdb->query( "DESCRIBE $wpdb->terms `lsx_team_term_order`" );
+		$result = $wpdb->query("DESCRIBE $wpdb->terms `lsx_team_term_order`");
 
-		if ( ! $result ) {
-			$result = $wpdb->query( "ALTER TABLE $wpdb->terms ADD `lsx_team_term_order` INT( 4 ) NULL DEFAULT '0'" );
+		if (!$result) {
+			$result = $wpdb->query("ALTER TABLE $wpdb->terms ADD `lsx_team_term_order` INT( 4 ) NULL DEFAULT '0'");
 		}
 
-		update_option( 'lsx_team_scporder_install', 1 );
+		update_option('lsx_team_scporder_install', 1);
 	}
 
 	public function _check_load_script_css() {
@@ -52,23 +52,23 @@ 
 		$objects = $this->get_lsx_team_scporder_options_objects();
 		$tags = $this->get_lsx_team_scporder_options_tags();
 
-		if ( empty( $objects ) && empty( $tags ) )
+		if (empty($objects) && empty($tags))
 			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;
 			}
 		}
 
-		if ( ! empty( $tags ) ) {
-			if ( isset( $_GET['taxonomy'] ) && array_key_exists( sanitize_text_field( wp_unslash( $_GET['taxonomy'] ) ), $tags ) ) {
+		if (!empty($tags)) {
+			if (isset($_GET['taxonomy']) && array_key_exists(sanitize_text_field(wp_unslash($_GET['taxonomy'])), $tags)) {
 				$active = true;
 			}
 		}
@@ -77,17 +77,17 @@ 
 	}
 
 	public function load_script_css() {
-		if ( $this->_check_load_script_css() ) {
-			wp_enqueue_script( 'scporderjs', LSX_TEAM_URL . 'assets/js/scporder.min.js', array( 'jquery', 'jquery-ui-sortable' ), null, true );
+		if ($this->_check_load_script_css()) {
+			wp_enqueue_script('scporderjs', LSX_TEAM_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_TEAM_URL . 'assets/css/scporder.css', array(), null );
+			wp_enqueue_style('scporder', LSX_TEAM_URL.'assets/css/scporder.css', array(), null);
 		}
 	}
 
@@ -96,26 +96,26 @@ 
 		$objects = $this->get_lsx_team_scporder_options_objects();
 		$tags = $this->get_lsx_team_scporder_options_tags();
 
-		if ( ! empty( $objects ) ) {
-			foreach ( $objects as $object => $object_data ) {
-				$result = $wpdb->get_results( $wpdb->prepare( "
+		if (!empty($objects)) {
+			foreach ($objects as $object => $object_data) {
+				$result = $wpdb->get_results($wpdb->prepare("
 					SELECT count( * ) as cnt, max( menu_order ) as max, min( menu_order ) as min
 					FROM $wpdb->posts
 					WHERE post_type = '%s' AND post_status IN ( 'publish', 'pending', 'draft', 'private', 'future' )
-				", $object ) );
+				", $object));
 
-				if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max )
+				if (0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max)
 					continue;
 
-				$results = $wpdb->get_results( $wpdb->prepare( "
+				$results = $wpdb->get_results($wpdb->prepare("
 					SELECT ID
 					FROM $wpdb->posts
 					WHERE post_type = '%s' AND post_status IN ( 'publish', 'pending', 'draft', 'private', 'future' )
 					ORDER BY menu_order ASC
-				", $object ) );
+				", $object));
 
-				foreach ( $results as $key => $result ) {
-					$wpdb->update( $wpdb->posts,
+				foreach ($results as $key => $result) {
+					$wpdb->update($wpdb->posts,
 						array(
 							'menu_order' => $key + 1,
 						),
@@ -127,27 +127,27 @@ 
 			}
 		}
 
-		if ( ! empty( $tags ) ) {
-			foreach ( $tags as $taxonomy => $taxonomy_data ) {
-				$result = $wpdb->get_results( $wpdb->prepare( "
+		if (!empty($tags)) {
+			foreach ($tags as $taxonomy => $taxonomy_data) {
+				$result = $wpdb->get_results($wpdb->prepare("
 					SELECT count( * ) as cnt, max( lsx_team_term_order ) as max, min( lsx_team_term_order ) as min
 					FROM $wpdb->terms AS terms
 					INNER JOIN $wpdb->term_taxonomy AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id )
 					WHERE term_taxonomy.taxonomy = '%s'
-				", $taxonomy ) );
+				", $taxonomy));
 
-				if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max )
+				if (0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max)
 					continue;
 
-				$results = $wpdb->get_results( $wpdb->prepare( "
+				$results = $wpdb->get_results($wpdb->prepare("
 					SELECT terms.term_id
 					FROM $wpdb->terms AS terms
 					INNER JOIN $wpdb->term_taxonomy AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id )
 					WHERE term_taxonomy.taxonomy = '%s'
 					ORDER BY lsx_team_term_order ASC
-				", $taxonomy ) );
+				", $taxonomy));
 
-				foreach ( $results as $key => $result ) {
+				foreach ($results as $key => $result) {
 					$wpdb->update(
 						$wpdb->terms,
 						array(
@@ -163,42 +163,42 @@ 
 	}
 
 	public 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 ( $results as $result ) {
+		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;
 			}
 		}
 
-		sort( $menu_order_arr );
+		sort($menu_order_arr);
 
-		foreach ( $data as $key => $values ) {
-			foreach ( $values as $position => $id ) {
-				$wpdb->update( $wpdb->posts,
+		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),
 					)
 				);
 			}
@@ -206,209 +206,209 @@ 
 	}
 
 	public function update_menu_order_tags() {
-		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( "
+		foreach ($id_arr as $key => $id) {
+			$results = $wpdb->get_results("
 				SELECT lsx_team_term_order 
 				FROM $wpdb->terms 
-				WHERE term_id = " . intval( $id ) );
-			foreach ( $results as $result ) {
+				WHERE term_id = ".intval($id));
+			foreach ($results as $result) {
 				$menu_order_arr[] = $result->lsx_team_term_order;
 			}
 		}
 
-		sort( $menu_order_arr );
+		sort($menu_order_arr);
 
-		foreach ( $data as $key => $values ) {
-			foreach ( $values as $position => $id ) {
-				$wpdb->update( $wpdb->terms,
+		foreach ($data as $key => $values) {
+			foreach ($values as $position => $id) {
+				$wpdb->update($wpdb->terms,
 					array(
-						'lsx_team_term_order' => $menu_order_arr[ $position ],
+						'lsx_team_term_order' => $menu_order_arr[$position],
 					),
 					array(
-						'term_id' => intval( $id ),
+						'term_id' => intval($id),
 					)
 				);
 			}
 		}
 	}
 
-	public function lsx_team_scporder_previous_post_where( $where ) {
+	public function lsx_team_scporder_previous_post_where($where) {
 		global $post;
 		$objects = $this->get_lsx_team_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'";
+			$where = "WHERE p.menu_order > '".$current_menu_order."' AND p.post_type = '".$post->post_type."' AND p.post_status = 'publish'";
 		}
 
 		return $where;
 	}
 
-	public function lsx_team_scporder_previous_post_sort( $orderby ) {
+	public function lsx_team_scporder_previous_post_sort($orderby) {
 		global $post;
 		$objects = $this->get_lsx_team_scporder_options_objects();
 
-		if ( empty( $objects ) )
+		if (empty($objects))
 			return $orderby;
 
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+		if (isset($post->post_type) && array_key_exists($post->post_type, $objects)) {
 			$orderby = 'ORDER BY p.menu_order ASC LIMIT 1';
 		}
 
 		return $orderby;
 	}
 
-	public function lsx_team_scporder_next_post_where( $where ) {
+	public function lsx_team_scporder_next_post_where($where) {
 		global $post;
 		$objects = $this->get_lsx_team_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'";
+			$where = "WHERE p.menu_order < '".$current_menu_order."' AND p.post_type = '".$post->post_type."' AND p.post_status = 'publish'";
 		}
 
 		return $where;
 	}
 
-	public function lsx_team_scporder_next_post_sort( $orderby ) {
+	public function lsx_team_scporder_next_post_sort($orderby) {
 		global $post;
 		$objects = $this->get_lsx_team_scporder_options_objects();
 
-		if ( empty( $objects ) )
+		if (empty($objects))
 			return $orderby;
 
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+		if (isset($post->post_type) && array_key_exists($post->post_type, $objects)) {
 			$orderby = 'ORDER BY p.menu_order DESC LIMIT 1';
 		}
 
 		return $orderby;
 	}
 
-	public function lsx_team_scporder_pre_get_posts( $wp_query ) {
+	public function lsx_team_scporder_pre_get_posts($wp_query) {
 		$objects = $this->get_lsx_team_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 ( $wp_query->get( 'order' ) == 'DESC' )
-					$wp_query->set( 'order', 'ASC' );
+			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' );
+				if (!$wp_query->get('orderby'))
+					$wp_query->set('orderby', 'menu_order');
+				if (!$wp_query->get('order'))
+					$wp_query->set('order', 'ASC');
 			}
 		}
 	}
 
-	public function lsx_team_scporder_get_terms_orderby( $orderby, $args ) {
-		if ( is_admin() )
+	public function lsx_team_scporder_get_terms_orderby($orderby, $args) {
+		if (is_admin())
 			return $orderby;
 
 		$tags = $this->get_lsx_team_scporder_options_tags();
 
-		if ( ! isset( $args['taxonomy'] ) )
+		if (!isset($args['taxonomy']))
 			return $orderby;
 
 		$taxonomy = $args['taxonomy'];
-		if ( is_array( $taxonomy ) && count( $taxonomy ) == 1 )
+		if (is_array($taxonomy) && count($taxonomy) == 1)
 			$taxonomy = $taxonomy[0];
-		if ( ! array_key_exists( $taxonomy[0], $tags ) )
+		if (!array_key_exists($taxonomy[0], $tags))
 			return $orderby;
 
 		$orderby = 't.lsx_team_term_order';
 		return $orderby;
 	}
 
-	public function lsx_team_scporder_get_object_terms( $terms ) {
+	public function lsx_team_scporder_get_object_terms($terms) {
 		$tags = $this->get_lsx_team_scporder_options_tags();
 
-		if ( is_admin() && isset( $_GET['orderby'] ) )
+		if (is_admin() && isset($_GET['orderby']))
 			return $terms;
 
-		foreach ( $terms as $key => $term ) {
-			if ( is_object( $term ) && isset( $term->taxonomy ) ) {
+		foreach ($terms as $key => $term) {
+			if (is_object($term) && isset($term->taxonomy)) {
 				$taxonomy = $term->taxonomy;
-				if ( ! array_key_exists( $taxonomy, $tags ) )
+				if (!array_key_exists($taxonomy, $tags))
 					return $terms;
 			} else {
 				return $terms;
 			}
 		}
 
-		usort( $terms, array( $this, 'taxcmp' ) );
+		usort($terms, array($this, 'taxcmp'));
 		return $terms;
 	}
 
-	public function taxcmp( $a, $b ) {
-		if ( $a->lsx_team_term_order == $b->lsx_team_term_order )
+	public function taxcmp($a, $b) {
+		if ($a->lsx_team_term_order == $b->lsx_team_term_order)
 			return 0;
 
-		return ( $a->lsx_team_term_order < $b->lsx_team_term_order ) ? -1 : 1;
+		return ($a->lsx_team_term_order < $b->lsx_team_term_order) ? -1 : 1;
 	}
 
 	public function get_lsx_team_scporder_options_objects() {
 		return array(
-			'team' => esc_html_x( 'Team Member', 'post type singular name', 'lsx-team' ),
+			'team' => esc_html_x('Team Member', 'post type singular name', 'lsx-team'),
 		);
 	}
 
 	public function get_lsx_team_scporder_options_tags() {
 		return array(
-			'team_role' => esc_html_x( 'Role', 'taxonomy singular name', 'lsx-team' ),
+			'team_role' => esc_html_x('Role', 'taxonomy singular name', 'lsx-team'),
 		);
 	}
 
@@ -417,21 +417,21 @@ 
 /**
  * SCP Order Uninstall hook
  */
-register_uninstall_hook( __FILE__, 'lsx_team_scporder_uninstall' );
+register_uninstall_hook(__FILE__, 'lsx_team_scporder_uninstall');
 
 function lsx_team_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_team_scporder_uninstall_db();
 		}
 
-		switch_to_blog( $curr_blog );
+		switch_to_blog($curr_blog);
 	} else {
 		lsx_team_scporder_uninstall_db();
 	}
@@ -439,11 +439,11 @@ 
 
 function lsx_team_scporder_uninstall_db() {
 	global $wpdb;
-	$result = $wpdb->query( "DESCRIBE $wpdb->terms `lsx_team_term_order`" );
+	$result = $wpdb->query("DESCRIBE $wpdb->terms `lsx_team_term_order`");
 
-	if ( $result ) {
-		$result = $wpdb->query( "ALTER TABLE $wpdb->terms DROP `lsx_team_term_order`" );
+	if ($result) {
+		$result = $wpdb->query("ALTER TABLE $wpdb->terms DROP `lsx_team_term_order`");
 	}
 
-	delete_option( 'lsx_team_scporder_install' );
+	delete_option('lsx_team_scporder_install');
 }

Braces +72 added lines, -48 removed lines

@@ -14,8 +14,9 @@ 
 class LSX_TEAM_SCPO_Engine {
 
 	public function __construct() {
-		if ( ! get_option( 'lsx_team_scporder_install' ) )
-			$this->lsx_team_scporder_install();
+		if ( ! get_option( 'lsx_team_scporder_install' ) ) {
+					$this->lsx_team_scporder_install();
+		}
 
 		add_action( 'admin_init', array( $this, 'refresh' ) );
 		add_action( 'admin_init', array( $this, 'load_script_css' ) );
@@ -52,11 +53,13 @@ 
 		$objects = $this->get_lsx_team_scporder_options_objects();
 		$tags = $this->get_lsx_team_scporder_options_tags();
 
-		if ( empty( $objects ) && empty( $tags ) )
-			return false;
+		if ( empty( $objects ) && empty( $tags ) ) {
+					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.
@@ -104,8 +107,9 @@ 
 					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( "
 					SELECT ID
@@ -136,8 +140,9 @@ 
 					WHERE term_taxonomy.taxonomy = '%s'
 				", $taxonomy ) );
 
-				if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max )
-					continue;
+				if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max ) {
+									continue;
+				}
 
 				$results = $wpdb->get_results( $wpdb->prepare( "
 					SELECT terms.term_id
@@ -169,8 +174,9 @@ 
 
 		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();
 
@@ -212,8 +218,9 @@ 
 
 		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();
 
@@ -255,8 +262,9 @@ 
 		global $post;
 		$objects = $this->get_lsx_team_scporder_options_objects();
 
-		if ( empty( $objects ) )
-			return $where;
+		if ( empty( $objects ) ) {
+					return $where;
+		}
 
 		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
 			$current_menu_order = $post->menu_order;
@@ -270,8 +278,9 @@ 
 		global $post;
 		$objects = $this->get_lsx_team_scporder_options_objects();
 
-		if ( empty( $objects ) )
-			return $orderby;
+		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';
@@ -284,8 +293,9 @@ 
 		global $post;
 		$objects = $this->get_lsx_team_scporder_options_objects();
 
-		if ( empty( $objects ) )
-			return $where;
+		if ( empty( $objects ) ) {
+					return $where;
+		}
 
 		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
 			$current_menu_order = $post->menu_order;
@@ -299,8 +309,9 @@ 
 		global $post;
 		$objects = $this->get_lsx_team_scporder_options_objects();
 
-		if ( empty( $objects ) )
-			return $orderby;
+		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';
@@ -312,8 +323,9 @@ 
 	public function lsx_team_scporder_pre_get_posts( $wp_query ) {
 		$objects = $this->get_lsx_team_scporder_options_objects();
 
-		if ( empty( $objects ) )
-			return false;
+		if ( empty( $objects ) ) {
+					return false;
+		}
 
 		if ( is_admin() ) {
 			if ( isset( $wp_query->query['post_type'] ) && ! isset( $_GET['orderby'] ) ) {
@@ -337,37 +349,46 @@ 
 				}
 			}
 
-			if ( ! $active )
-				return false;
+			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' );
+				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' );
+				if ( ! $wp_query->get( 'orderby' ) ) {
+									$wp_query->set( 'orderby', 'menu_order' );
+				}
+				if ( ! $wp_query->get( 'order' ) ) {
+									$wp_query->set( 'order', 'ASC' );
+				}
 			}
 		}
 	}
 
 	public function lsx_team_scporder_get_terms_orderby( $orderby, $args ) {
-		if ( is_admin() )
-			return $orderby;
+		if ( is_admin() ) {
+					return $orderby;
+		}
 
 		$tags = $this->get_lsx_team_scporder_options_tags();
 
-		if ( ! isset( $args['taxonomy'] ) )
-			return $orderby;
+		if ( ! isset( $args['taxonomy'] ) ) {
+					return $orderby;
+		}
 
 		$taxonomy = $args['taxonomy'];
-		if ( is_array( $taxonomy ) && count( $taxonomy ) == 1 )
-			$taxonomy = $taxonomy[0];
-		if ( ! array_key_exists( $taxonomy[0], $tags ) )
-			return $orderby;
+		if ( is_array( $taxonomy ) && count( $taxonomy ) == 1 ) {
+					$taxonomy = $taxonomy[0];
+		}
+		if ( ! array_key_exists( $taxonomy[0], $tags ) ) {
+					return $orderby;
+		}
 
 		$orderby = 't.lsx_team_term_order';
 		return $orderby;
@@ -376,14 +397,16 @@ 
 	public function lsx_team_scporder_get_object_terms( $terms ) {
 		$tags = $this->get_lsx_team_scporder_options_tags();
 
-		if ( is_admin() && isset( $_GET['orderby'] ) )
-			return $terms;
+		if ( is_admin() && isset( $_GET['orderby'] ) ) {
+					return $terms;
+		}
 
 		foreach ( $terms as $key => $term ) {
 			if ( is_object( $term ) && isset( $term->taxonomy ) ) {
 				$taxonomy = $term->taxonomy;
-				if ( ! array_key_exists( $taxonomy, $tags ) )
-					return $terms;
+				if ( ! array_key_exists( $taxonomy, $tags ) ) {
+									return $terms;
+				}
 			} else {
 				return $terms;
 			}
@@ -394,8 +417,9 @@ 
 	}
 
 	public function taxcmp( $a, $b ) {
-		if ( $a->lsx_team_term_order == $b->lsx_team_term_order )
-			return 0;
+		if ( $a->lsx_team_term_order == $b->lsx_team_term_order ) {
+					return 0;
+		}
 
 		return ( $a->lsx_team_term_order < $b->lsx_team_term_order ) ? -1 : 1;
 	}

includes/functions.php

Indentation +89 added lines, -89 removed lines

@@ -13,7 +13,7 @@ 
  * Add our action to init to set up our vars first.
  */
 function lsx_team_load_plugin_textdomain() {
-	load_plugin_textdomain( 'lsx-team', false, basename( LSX_TEAM_PATH ) . '/languages' );
+     load_plugin_textdomain( 'lsx-team', false, basename( LSX_TEAM_PATH ) . '/languages' );
 }
 add_action( 'init', 'lsx_team_load_plugin_textdomain' );
 
@@ -25,23 +25,23 @@ 
  * @return mixed           Option value
  */
 function team_get_options() {
-	$options = array();
-	if ( function_exists( 'tour_operator' ) ) {
-		$options = get_option( '_lsx-to_settings', false );
-	} else {
-		$options = get_option( '_lsx_settings', false );
-
-		if ( false === $options ) {
-			$options = get_option( '_lsx_lsx-settings', false );
-		}
-	}
-
-	// If there are new CMB2 options available, then use those.
-	$new_options = get_option( 'lsx_team_options', false );
-	if ( false !== $new_options ) {
-		$options['display'] = $new_options;
-	}
-	return $options;
+     $options = array();
+     if ( function_exists( 'tour_operator' ) ) {
+          $options = get_option( '_lsx-to_settings', false );
+     } else {
+          $options = get_option( '_lsx_settings', false );
+
+          if ( false === $options ) {
+               $options = get_option( '_lsx_lsx-settings', false );
+          }
+     }
+
+     // If there are new CMB2 options available, then use those.
+     $new_options = get_option( 'lsx_team_options', false );
+     if ( false !== $new_options ) {
+          $options['display'] = $new_options;
+     }
+     return $options;
 }
 
 /**
@@ -52,44 +52,44 @@ 
  * @return mixed           Option value
  */
 function team_get_option( $key = '', $default = false ) {
-	$options = array();
-	$value   = $default;
-	if ( function_exists( 'tour_operator' ) ) {
-		$options = get_option( '_lsx-to_settings', false );
-	} else {
-		$options = get_option( '_lsx_settings', false );
-
-		if ( false === $options ) {
-			$options = get_option( '_lsx_lsx-settings', false );
-		}
-	}
-
-	// If there are new CMB2 options available, then use those.
-	$new_options = get_option( 'lsx_team_options', false );
-	if ( false !== $new_options ) {
-		$options['display'] = $new_options;
-	}
-
-	if ( isset( $options['display'] ) && isset( $options['display'][ $key ] ) ) {
-		$value = $options['display'][ $key ];
-	}
-	return $value;
+     $options = array();
+     $value   = $default;
+     if ( function_exists( 'tour_operator' ) ) {
+          $options = get_option( '_lsx-to_settings', false );
+     } else {
+          $options = get_option( '_lsx_settings', false );
+
+          if ( false === $options ) {
+               $options = get_option( '_lsx_lsx-settings', false );
+          }
+     }
+
+     // If there are new CMB2 options available, then use those.
+     $new_options = get_option( 'lsx_team_options', false );
+     if ( false !== $new_options ) {
+          $options['display'] = $new_options;
+     }
+
+     if ( isset( $options['display'] ) && isset( $options['display'][ $key ] ) ) {
+          $value = $options['display'][ $key ];
+     }
+     return $value;
 }
 
 /**
  * Wraps the output class in a function to be called in templates
  */
 function lsx_team( $args ) {
-	$lsx_team = new LSX_Team;
-	echo wp_kses_post( $lsx_team->output( $args ) );
+     $lsx_team = new LSX_Team;
+     echo wp_kses_post( $lsx_team->output( $args ) );
 }
 
 /**
  * Shortcode
  */
 function lsx_team_shortcode( $atts ) {
-	$lsx_team = new LSX_Team;
-	return $lsx_team->output( $atts );
+     $lsx_team = new LSX_Team;
+     return $lsx_team->output( $atts );
 }
 add_shortcode( 'lsx_team', 'lsx_team_shortcode' );
 
@@ -101,16 +101,16 @@ 
  * @param [type] $request request.
  */
 function lsx_team_get_images_urls( $object, $field_name, $request ) {
-	$medium     = wp_get_attachment_image_src( get_post_thumbnail_id( $object->id ), 'medium' );
-	$medium_url = $medium['0'];
+     $medium     = wp_get_attachment_image_src( get_post_thumbnail_id( $object->id ), 'medium' );
+     $medium_url = $medium['0'];
 
-	$large     = wp_get_attachment_image_src( get_post_thumbnail_id( $object->id ), 'large' );
-	$large_url = $large['0'];
+     $large     = wp_get_attachment_image_src( get_post_thumbnail_id( $object->id ), 'large' );
+     $large_url = $large['0'];
 
-	return array(
-		'medium' => $medium_url,
-		'large'  => $large_url,
-	);
+     return array(
+          'medium' => $medium_url,
+          'large'  => $large_url,
+     );
 }
 
 /**
@@ -119,15 +119,15 @@ 
  * @return void
  */
 function lsx_team_register_images_field() {
-	register_rest_field(
-		'team',
-		'images',
-		array(
-			'get_callback'    => 'lsx_team_get_images_urls',
-			'update_callback' => null,
-			'schema'          => null,
-		)
-	);
+     register_rest_field(
+          'team',
+          'images',
+          array(
+               'get_callback'    => 'lsx_team_get_images_urls',
+               'update_callback' => null,
+               'schema'          => null,
+          )
+     );
 }
 add_action( 'rest_api_init', 'lsx_team_register_images_field' );
 
@@ -139,25 +139,25 @@ 
  * @param [type] $request request.
  */
 function lsx_team_get_additional_meta( $object, $field_name, $request ) {
-	$role      = get_the_terms( get_the_ID(), 'team_role' );
-	$job_title = get_post_meta( get_the_ID(), 'lsx_job_title', true );
-	$email     = get_post_meta( get_the_ID(), 'lsx_email_contact', true );
-	$phone     = get_post_meta( get_the_ID(), 'lsx_tel', true );
-	$skype     = get_post_meta( get_the_ID(), 'lsx_skype', true );
-	$facebook  = get_post_meta( get_the_ID(), 'lsx_facebook', true );
-	$twitter   = get_post_meta( get_the_ID(), 'lsx_twitter', true );
-	$linkedin  = get_post_meta( get_the_ID(), 'lsx_linkedin', true );
-
-	return array(
-		'role'      => $role,
-		'job_title' => $job_title,
-		'email'     => $email,
-		'phone'     => $phone,
-		'skype'     => $skype,
-		'facebook'  => $facebook,
-		'twitter'   => $twitter,
-		'linkedin'  => $linkedin,
-	);
+     $role      = get_the_terms( get_the_ID(), 'team_role' );
+     $job_title = get_post_meta( get_the_ID(), 'lsx_job_title', true );
+     $email     = get_post_meta( get_the_ID(), 'lsx_email_contact', true );
+     $phone     = get_post_meta( get_the_ID(), 'lsx_tel', true );
+     $skype     = get_post_meta( get_the_ID(), 'lsx_skype', true );
+     $facebook  = get_post_meta( get_the_ID(), 'lsx_facebook', true );
+     $twitter   = get_post_meta( get_the_ID(), 'lsx_twitter', true );
+     $linkedin  = get_post_meta( get_the_ID(), 'lsx_linkedin', true );
+
+     return array(
+          'role'      => $role,
+          'job_title' => $job_title,
+          'email'     => $email,
+          'phone'     => $phone,
+          'skype'     => $skype,
+          'facebook'  => $facebook,
+          'twitter'   => $twitter,
+          'linkedin'  => $linkedin,
+     );
 }
 
 /**
@@ -166,14 +166,14 @@ 
  * @return void
  */
 function lsx_team_register_additional_meta() {
-	register_rest_field(
-		'team',
-		'additional_meta',
-		array(
-			'get_callback'    => 'lsx_team_get_additional_meta',
-			'update_callback' => null,
-			'schema'          => null,
-		)
-	);
+     register_rest_field(
+          'team',
+          'additional_meta',
+          array(
+               'get_callback'    => 'lsx_team_get_additional_meta',
+               'update_callback' => null,
+               'schema'          => null,
+          )
+     );
 }
 add_action( 'rest_api_init', 'lsx_team_register_additional_meta' );

Spacing +38 added lines, -38 removed lines

@@ -13,9 +13,9 @@ 
  * Add our action to init to set up our vars first.
  */
 function lsx_team_load_plugin_textdomain() {
-	load_plugin_textdomain( 'lsx-team', false, basename( LSX_TEAM_PATH ) . '/languages' );
+	load_plugin_textdomain('lsx-team', false, basename(LSX_TEAM_PATH).'/languages');
 }
-add_action( 'init', 'lsx_team_load_plugin_textdomain' );
+add_action('init', 'lsx_team_load_plugin_textdomain');
 
 /**
  * Wrapper function around cmb2_get_option
@@ -26,19 +26,19 @@ 
  */
 function team_get_options() {
 	$options = array();
-	if ( function_exists( 'tour_operator' ) ) {
-		$options = get_option( '_lsx-to_settings', false );
+	if (function_exists('tour_operator')) {
+		$options = get_option('_lsx-to_settings', false);
 	} else {
-		$options = get_option( '_lsx_settings', false );
+		$options = get_option('_lsx_settings', false);
 
-		if ( false === $options ) {
-			$options = get_option( '_lsx_lsx-settings', false );
+		if (false === $options) {
+			$options = get_option('_lsx_lsx-settings', false);
 		}
 	}
 
 	// If there are new CMB2 options available, then use those.
-	$new_options = get_option( 'lsx_team_options', false );
-	if ( false !== $new_options ) {
+	$new_options = get_option('lsx_team_options', false);
+	if (false !== $new_options) {
 		$options['display'] = $new_options;
 	}
 	return $options;
@@ -51,27 +51,27 @@ 
  * @param  mixed  $default Optional default value
  * @return mixed           Option value
  */
-function team_get_option( $key = '', $default = false ) {
+function team_get_option($key = '', $default = false) {
 	$options = array();
 	$value   = $default;
-	if ( function_exists( 'tour_operator' ) ) {
-		$options = get_option( '_lsx-to_settings', false );
+	if (function_exists('tour_operator')) {
+		$options = get_option('_lsx-to_settings', false);
 	} else {
-		$options = get_option( '_lsx_settings', false );
+		$options = get_option('_lsx_settings', false);
 
-		if ( false === $options ) {
-			$options = get_option( '_lsx_lsx-settings', false );
+		if (false === $options) {
+			$options = get_option('_lsx_lsx-settings', false);
 		}
 	}
 
 	// If there are new CMB2 options available, then use those.
-	$new_options = get_option( 'lsx_team_options', false );
-	if ( false !== $new_options ) {
+	$new_options = get_option('lsx_team_options', false);
+	if (false !== $new_options) {
 		$options['display'] = $new_options;
 	}
 
-	if ( isset( $options['display'] ) && isset( $options['display'][ $key ] ) ) {
-		$value = $options['display'][ $key ];
+	if (isset($options['display']) && isset($options['display'][$key])) {
+		$value = $options['display'][$key];
 	}
 	return $value;
 }
@@ -79,19 +79,19 @@ 
 /**
  * Wraps the output class in a function to be called in templates
  */
-function lsx_team( $args ) {
+function lsx_team($args) {
 	$lsx_team = new LSX_Team;
-	echo wp_kses_post( $lsx_team->output( $args ) );
+	echo wp_kses_post($lsx_team->output($args));
 }
 
 /**
  * Shortcode
  */
-function lsx_team_shortcode( $atts ) {
+function lsx_team_shortcode($atts) {
 	$lsx_team = new LSX_Team;
-	return $lsx_team->output( $atts );
+	return $lsx_team->output($atts);
 }
-add_shortcode( 'lsx_team', 'lsx_team_shortcode' );
+add_shortcode('lsx_team', 'lsx_team_shortcode');
 
 /**
  * Creates the feature images sizes for the REST API responses.
@@ -100,11 +100,11 @@ 
  * @param [type] $field_name name.
  * @param [type] $request request.
  */
-function lsx_team_get_images_urls( $object, $field_name, $request ) {
-	$medium     = wp_get_attachment_image_src( get_post_thumbnail_id( $object->id ), 'medium' );
+function lsx_team_get_images_urls($object, $field_name, $request) {
+	$medium     = wp_get_attachment_image_src(get_post_thumbnail_id($object->id), 'medium');
 	$medium_url = $medium['0'];
 
-	$large     = wp_get_attachment_image_src( get_post_thumbnail_id( $object->id ), 'large' );
+	$large     = wp_get_attachment_image_src(get_post_thumbnail_id($object->id), 'large');
 	$large_url = $large['0'];
 
 	return array(
@@ -129,7 +129,7 @@ 
 		)
 	);
 }
-add_action( 'rest_api_init', 'lsx_team_register_images_field' );
+add_action('rest_api_init', 'lsx_team_register_images_field');
 
 /**
  * Creates the Additional Meta the REST API responses.
@@ -138,15 +138,15 @@ 
  * @param [type] $field_name name.
  * @param [type] $request request.
  */
-function lsx_team_get_additional_meta( $object, $field_name, $request ) {
-	$role      = get_the_terms( get_the_ID(), 'team_role' );
-	$job_title = get_post_meta( get_the_ID(), 'lsx_job_title', true );
-	$email     = get_post_meta( get_the_ID(), 'lsx_email_contact', true );
-	$phone     = get_post_meta( get_the_ID(), 'lsx_tel', true );
-	$skype     = get_post_meta( get_the_ID(), 'lsx_skype', true );
-	$facebook  = get_post_meta( get_the_ID(), 'lsx_facebook', true );
-	$twitter   = get_post_meta( get_the_ID(), 'lsx_twitter', true );
-	$linkedin  = get_post_meta( get_the_ID(), 'lsx_linkedin', true );
+function lsx_team_get_additional_meta($object, $field_name, $request) {
+	$role      = get_the_terms(get_the_ID(), 'team_role');
+	$job_title = get_post_meta(get_the_ID(), 'lsx_job_title', true);
+	$email     = get_post_meta(get_the_ID(), 'lsx_email_contact', true);
+	$phone     = get_post_meta(get_the_ID(), 'lsx_tel', true);
+	$skype     = get_post_meta(get_the_ID(), 'lsx_skype', true);
+	$facebook  = get_post_meta(get_the_ID(), 'lsx_facebook', true);
+	$twitter   = get_post_meta(get_the_ID(), 'lsx_twitter', true);
+	$linkedin  = get_post_meta(get_the_ID(), 'lsx_linkedin', true);
 
 	return array(
 		'role'      => $role,
@@ -176,4 +176,4 @@ 
 		)
 	);
 }
-add_action( 'rest_api_init', 'lsx_team_register_additional_meta' );
+add_action('rest_api_init', 'lsx_team_register_additional_meta');

lsx-team.php

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_TEAM_PATH', plugin_dir_path( __FILE__ ) );

Spacing +12 added lines, -12 removed lines

@@ -13,35 +13,35 @@
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
-define( 'LSX_TEAM_PATH', plugin_dir_path( __FILE__ ) );
-define( 'LSX_TEAM_CORE', __FILE__ );
-define( 'LSX_TEAM_URL', plugin_dir_url( __FILE__ ) );
-define( 'LSX_TEAM_VER', '1.3.0' );
+define('LSX_TEAM_PATH', plugin_dir_path(__FILE__));
+define('LSX_TEAM_CORE', __FILE__);
+define('LSX_TEAM_URL', plugin_dir_url(__FILE__));
+define('LSX_TEAM_VER', '1.3.0');
 
 
 /* ======================= Below is the Plugin Class init ========================= */
 
 // Template Tag and functions.
-require_once LSX_TEAM_PATH . '/includes/functions.php';
+require_once LSX_TEAM_PATH.'/includes/functions.php';
 
 // Core Class.
-require_once LSX_TEAM_PATH . '/classes/class-lsx-team-core.php';
+require_once LSX_TEAM_PATH.'/classes/class-lsx-team-core.php';
 
 // Post Type and Custom Fields.
-require_once LSX_TEAM_PATH . '/classes/class-lsx-team-admin.php';
+require_once LSX_TEAM_PATH.'/classes/class-lsx-team-admin.php';
 
 // Frontend resources.
-require_once LSX_TEAM_PATH . '/classes/class-lsx-team-frontend.php';
+require_once LSX_TEAM_PATH.'/classes/class-lsx-team-frontend.php';
 
 // Shortcode.
-require_once LSX_TEAM_PATH . '/classes/class-lsx-team.php';
+require_once LSX_TEAM_PATH.'/classes/class-lsx-team.php';
 
 // Widget.
-require_once LSX_TEAM_PATH . '/classes/class-lsx-team-widget.php';
+require_once LSX_TEAM_PATH.'/classes/class-lsx-team-widget.php';
 
 // Post reorder.
-require_once LSX_TEAM_PATH . '/includes/class-lsx-team-scpo-engine.php';
+require_once LSX_TEAM_PATH.'/includes/class-lsx-team-scpo-engine.php';

templates/single-team.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_TEAM_PATH . '/templates/content-single-team.php' ); ?>
+				<?php include(LSX_TEAM_PATH.'/templates/content-single-team.php'); ?>
 
 			<?php endwhile; ?>
 

templates/content-single-team.php

Braces +8 added lines, -2 removed lines

@@ -188,13 +188,19 @@
 		<div class="entry-tabs">
 			<ul class="nav nav-tabs">
 				<?php foreach ( $tabs as $i => $tab ) : ?>
-					<li<?php if ( 0 === $i ) echo ' class="active"'; ?>><a data-toggle="tab" href="#<?php echo esc_attr( sanitize_title( $tab['title'] ) ); ?>"><?php echo esc_html( $tab['title'] ); ?></a></li>
+					<li<?php if ( 0 === $i ) {
+     echo ' class="active"';
+}
+?>><a data-toggle="tab" href="#<?php echo esc_attr( sanitize_title( $tab['title'] ) ); ?>"><?php echo esc_html( $tab['title'] ); ?></a></li>
 				<?php endforeach; ?>
 			</ul>
 
 			<div class="tab-content">
 				<?php foreach ( $tabs as $i => $tab ) : ?>
-					<div id="<?php echo esc_attr( sanitize_title( $tab['title'] ) ); ?>" class="tab-pane fade<?php if ( 0 === $i ) echo ' in active'; ?>">
+					<div id="<?php echo esc_attr( sanitize_title( $tab['title'] ) ); ?>" class="tab-pane fade<?php if ( 0 === $i ) {
+     echo ' in active';
+}
+?>">
 						<?php echo do_shortcode( $tab['shortcode'] ); ?>
 					</div>
 				<?php endforeach; ?>

Indentation +130 added lines, -130 removed lines

@@ -5,136 +5,136 @@
 ?>
 
 <?php
-	global $lsx_team;
-
-	$thumbnail = $lsx_team->get_thumbnail( get_the_ID(), 'lsx-team-single' );
-
-	$job_title = get_post_meta( get_the_ID(), 'lsx_job_title', true );
-
-	$links = array(
-		'facebook'  => get_post_meta( get_the_ID(), 'lsx_facebook', true ),
-		'twitter'   => get_post_meta( get_the_ID(), 'lsx_twitter', true ),
-		'linkedin'  => get_post_meta( get_the_ID(), 'lsx_linkedin', true ),
-		'github'    => get_post_meta( get_the_ID(), 'lsx_github', true ),
-		'wordpress' => get_post_meta( get_the_ID(), 'lsx_wordpress', true ),
-	);
-
-	foreach ( $links as $service => $link ) {
-		if ( empty( $link ) ) {
-			unset( $links[ $service ] );
-		}
-	}
-
-	$email = get_post_meta( get_the_ID(), 'lsx_email_contact', true );
-	$phone = get_post_meta( get_the_ID(), 'lsx_tel', true );
-	$skype = get_post_meta( get_the_ID(), 'lsx_skype', true );
-
-	$phone_attr = $phone;
-	$phone_attr = str_replace( ' ', '', $phone_attr );
-	$phone_attr = str_replace( '+', '', $phone_attr );
-	$phone_attr = str_replace( '(', '', $phone_attr );
-	$phone_attr = str_replace( ')', '', $phone_attr );
-	$phone_attr = str_replace( '.', '', $phone_attr );
-
-	// Tabs
-
-	$tabs = array();
-
-	// Tab Posts
-
-	$site_user = get_post_meta( get_the_ID(), 'lsx_site_user', true );
-
-	if ( ! empty( $site_user ) ) {
-		if ( is_user_member_of_blog( $site_user ) ) {
-			$user_posts = count_user_posts( $site_user, 'post' );
-
-			if ( $user_posts > 0 ) {
-				$params = array(
-					'post_type' => 'post',
-					'author' => $site_user,
-					'posts_per_page' => 9,
-					'order' => 'DESC',
-					'orderby' => 'date',
-					'fields' => 'ids',
-					'tax_query' => array(
-						array(
-							'taxonomy' => 'post_format',
-							'field' => 'slug',
-							'terms' => array(
-								'post-format-aside',
-								'post-format-audio',
-								'post-format-chat',
-								'post-format-gallery',
-								'post-format-image',
-								'post-format-link',
-								'post-format-quote',
-								'post-format-status',
-								'post-format-video',
-							),
-							'operator' => 'NOT IN',
-						),
-					),
-				);
-
-				$posts_query = new \WP_Query( $params );
-
-				if ( $posts_query->have_posts() ) {
-					$tab_post['post_type'] = 'post';
-					$tab_post['title'] = esc_html__( 'Posts', 'lsx-team' );
-					$tab_post['posts'] = $posts_query->posts;
-
-					if ( ! empty( $tab_post['posts'] ) ) {
-						$post_ids = join( ',', $tab_post['posts'] );
-						$tab_post['shortcode'] = '[lsx_posts columns="3" limit="9" include="' . $post_ids . '"]';
-						$tabs[] = $tab_post;
-					}
-				}
-			}
-		}
-	}
-
-	// Tab Projects
-
-	$tab_project['post_type'] = 'project';
-	$tab_project['title'] = esc_html__( 'Projects', 'lsx-team' );
-	$tab_project['posts'] = get_post_meta( get_the_ID(), 'project_to_team', true );
-	if ( is_plugin_active( 'lsx-projects/lsx-projects.php' ) && ( ! empty( $tab_project['posts'] ) ) ) {
-		$post_ids = join( ',', $tab_project['posts'] );
-		$tab_project['shortcode'] = '[lsx_projects columns="3" include="' . $post_ids . '"]';
-		$tabs[] = $tab_project;
-	}
-
-	// Tab Services
-
-	if ( is_plugin_active( 'lsx-services/lsx-services.php' ) ) {
-		$tab_service['post_type'] = 'service';
-		$tab_service['title'] = esc_html__( 'Services', 'lsx-team' );
-		$tab_service['posts'] = get_post_meta( get_the_ID(), 'service_to_team', true );
-
-		if ( ! empty( $tab_service['posts'] ) ) {
-			$post_ids = join( ',', $tab_service['posts'] );
-			$tab_service['shortcode'] = '[lsx_services columns="3" include="' . $post_ids . '"]';
-			$tabs[] = $tab_service;
-		}
-	}
-
-	// Tab Testimonials
-
-	$tab_testimonial['post_type'] = 'testimonial';
-	$tab_testimonial['title'] = esc_html__( 'Testimonials', 'lsx-team' );
-	$tab_testimonial['posts'] = get_post_meta( get_the_ID(), 'testimonial_to_team', true );
-
-	if ( is_plugin_active( 'lsx-testimonials/lsx-testimonials.php' ) && ( ! empty( $tab_testimonial['posts'] ) ) ) {
-		if ( count( $tab_testimonial['posts'] ) <= 2 ) {
-			$columns = count( $tab_testimonial['posts'] );
-		} else {
-			$columns = 2;
-		}
-
-		$post_ids = join( ',', $tab_testimonial['posts'] );
-		$tab_testimonial['shortcode'] = '[lsx_testimonials columns="' . $columns . '" include="' . $post_ids . '" orderby="date" order="DESC" display="excerpt"]';
-		$tabs[] = $tab_testimonial;
-	}
+     global $lsx_team;
+
+     $thumbnail = $lsx_team->get_thumbnail( get_the_ID(), 'lsx-team-single' );
+
+     $job_title = get_post_meta( get_the_ID(), 'lsx_job_title', true );
+
+     $links = array(
+          'facebook'  => get_post_meta( get_the_ID(), 'lsx_facebook', true ),
+          'twitter'   => get_post_meta( get_the_ID(), 'lsx_twitter', true ),
+          'linkedin'  => get_post_meta( get_the_ID(), 'lsx_linkedin', true ),
+          'github'    => get_post_meta( get_the_ID(), 'lsx_github', true ),
+          'wordpress' => get_post_meta( get_the_ID(), 'lsx_wordpress', true ),
+     );
+
+     foreach ( $links as $service => $link ) {
+          if ( empty( $link ) ) {
+               unset( $links[ $service ] );
+          }
+     }
+
+     $email = get_post_meta( get_the_ID(), 'lsx_email_contact', true );
+     $phone = get_post_meta( get_the_ID(), 'lsx_tel', true );
+     $skype = get_post_meta( get_the_ID(), 'lsx_skype', true );
+
+     $phone_attr = $phone;
+     $phone_attr = str_replace( ' ', '', $phone_attr );
+     $phone_attr = str_replace( '+', '', $phone_attr );
+     $phone_attr = str_replace( '(', '', $phone_attr );
+     $phone_attr = str_replace( ')', '', $phone_attr );
+     $phone_attr = str_replace( '.', '', $phone_attr );
+
+     // Tabs
+
+     $tabs = array();
+
+     // Tab Posts
+
+     $site_user = get_post_meta( get_the_ID(), 'lsx_site_user', true );
+
+     if ( ! empty( $site_user ) ) {
+          if ( is_user_member_of_blog( $site_user ) ) {
+               $user_posts = count_user_posts( $site_user, 'post' );
+
+               if ( $user_posts > 0 ) {
+                    $params = array(
+                         'post_type' => 'post',
+                         'author' => $site_user,
+                         'posts_per_page' => 9,
+                         'order' => 'DESC',
+                         'orderby' => 'date',
+                         'fields' => 'ids',
+                         'tax_query' => array(
+                              array(
+                                   'taxonomy' => 'post_format',
+                                   'field' => 'slug',
+                                   'terms' => array(
+                                        'post-format-aside',
+                                        'post-format-audio',
+                                        'post-format-chat',
+                                        'post-format-gallery',
+                                        'post-format-image',
+                                        'post-format-link',
+                                        'post-format-quote',
+                                        'post-format-status',
+                                        'post-format-video',
+                                   ),
+                                   'operator' => 'NOT IN',
+                              ),
+                         ),
+                    );
+
+                    $posts_query = new \WP_Query( $params );
+
+                    if ( $posts_query->have_posts() ) {
+                         $tab_post['post_type'] = 'post';
+                         $tab_post['title'] = esc_html__( 'Posts', 'lsx-team' );
+                         $tab_post['posts'] = $posts_query->posts;
+
+                         if ( ! empty( $tab_post['posts'] ) ) {
+                              $post_ids = join( ',', $tab_post['posts'] );
+                              $tab_post['shortcode'] = '[lsx_posts columns="3" limit="9" include="' . $post_ids . '"]';
+                              $tabs[] = $tab_post;
+                         }
+                    }
+               }
+          }
+     }
+
+     // Tab Projects
+
+     $tab_project['post_type'] = 'project';
+     $tab_project['title'] = esc_html__( 'Projects', 'lsx-team' );
+     $tab_project['posts'] = get_post_meta( get_the_ID(), 'project_to_team', true );
+     if ( is_plugin_active( 'lsx-projects/lsx-projects.php' ) && ( ! empty( $tab_project['posts'] ) ) ) {
+          $post_ids = join( ',', $tab_project['posts'] );
+          $tab_project['shortcode'] = '[lsx_projects columns="3" include="' . $post_ids . '"]';
+          $tabs[] = $tab_project;
+     }
+
+     // Tab Services
+
+     if ( is_plugin_active( 'lsx-services/lsx-services.php' ) ) {
+          $tab_service['post_type'] = 'service';
+          $tab_service['title'] = esc_html__( 'Services', 'lsx-team' );
+          $tab_service['posts'] = get_post_meta( get_the_ID(), 'service_to_team', true );
+
+          if ( ! empty( $tab_service['posts'] ) ) {
+               $post_ids = join( ',', $tab_service['posts'] );
+               $tab_service['shortcode'] = '[lsx_services columns="3" include="' . $post_ids . '"]';
+               $tabs[] = $tab_service;
+          }
+     }
+
+     // Tab Testimonials
+
+     $tab_testimonial['post_type'] = 'testimonial';
+     $tab_testimonial['title'] = esc_html__( 'Testimonials', 'lsx-team' );
+     $tab_testimonial['posts'] = get_post_meta( get_the_ID(), 'testimonial_to_team', true );
+
+     if ( is_plugin_active( 'lsx-testimonials/lsx-testimonials.php' ) && ( ! empty( $tab_testimonial['posts'] ) ) ) {
+          if ( count( $tab_testimonial['posts'] ) <= 2 ) {
+               $columns = count( $tab_testimonial['posts'] );
+          } else {
+               $columns = 2;
+          }
+
+          $post_ids = join( ',', $tab_testimonial['posts'] );
+          $tab_testimonial['shortcode'] = '[lsx_testimonials columns="' . $columns . '" include="' . $post_ids . '" orderby="date" order="DESC" display="excerpt"]';
+          $tabs[] = $tab_testimonial;
+     }
 ?>
 
 <?php lsx_entry_before(); ?>

Spacing +66 added lines, -66 removed lines

@@ -7,34 +7,34 @@ 
 <?php
 	global $lsx_team;
 
-	$thumbnail = $lsx_team->get_thumbnail( get_the_ID(), 'lsx-team-single' );
+	$thumbnail = $lsx_team->get_thumbnail(get_the_ID(), 'lsx-team-single');
 
-	$job_title = get_post_meta( get_the_ID(), 'lsx_job_title', true );
+	$job_title = get_post_meta(get_the_ID(), 'lsx_job_title', true);
 
 	$links = array(
-		'facebook'  => get_post_meta( get_the_ID(), 'lsx_facebook', true ),
-		'twitter'   => get_post_meta( get_the_ID(), 'lsx_twitter', true ),
-		'linkedin'  => get_post_meta( get_the_ID(), 'lsx_linkedin', true ),
-		'github'    => get_post_meta( get_the_ID(), 'lsx_github', true ),
-		'wordpress' => get_post_meta( get_the_ID(), 'lsx_wordpress', true ),
+		'facebook'  => get_post_meta(get_the_ID(), 'lsx_facebook', true),
+		'twitter'   => get_post_meta(get_the_ID(), 'lsx_twitter', true),
+		'linkedin'  => get_post_meta(get_the_ID(), 'lsx_linkedin', true),
+		'github'    => get_post_meta(get_the_ID(), 'lsx_github', true),
+		'wordpress' => get_post_meta(get_the_ID(), 'lsx_wordpress', true),
 	);
 
-	foreach ( $links as $service => $link ) {
-		if ( empty( $link ) ) {
-			unset( $links[ $service ] );
+	foreach ($links as $service => $link) {
+		if (empty($link)) {
+			unset($links[$service]);
 		}
 	}
 
-	$email = get_post_meta( get_the_ID(), 'lsx_email_contact', true );
-	$phone = get_post_meta( get_the_ID(), 'lsx_tel', true );
-	$skype = get_post_meta( get_the_ID(), 'lsx_skype', true );
+	$email = get_post_meta(get_the_ID(), 'lsx_email_contact', true);
+	$phone = get_post_meta(get_the_ID(), 'lsx_tel', true);
+	$skype = get_post_meta(get_the_ID(), 'lsx_skype', true);
 
 	$phone_attr = $phone;
-	$phone_attr = str_replace( ' ', '', $phone_attr );
-	$phone_attr = str_replace( '+', '', $phone_attr );
-	$phone_attr = str_replace( '(', '', $phone_attr );
-	$phone_attr = str_replace( ')', '', $phone_attr );
-	$phone_attr = str_replace( '.', '', $phone_attr );
+	$phone_attr = str_replace(' ', '', $phone_attr);
+	$phone_attr = str_replace('+', '', $phone_attr);
+	$phone_attr = str_replace('(', '', $phone_attr);
+	$phone_attr = str_replace(')', '', $phone_attr);
+	$phone_attr = str_replace('.', '', $phone_attr);
 
 	// Tabs
 
@@ -42,13 +42,13 @@ 
 
 	// Tab Posts
 
-	$site_user = get_post_meta( get_the_ID(), 'lsx_site_user', true );
+	$site_user = get_post_meta(get_the_ID(), 'lsx_site_user', true);
 
-	if ( ! empty( $site_user ) ) {
-		if ( is_user_member_of_blog( $site_user ) ) {
-			$user_posts = count_user_posts( $site_user, 'post' );
+	if (!empty($site_user)) {
+		if (is_user_member_of_blog($site_user)) {
+			$user_posts = count_user_posts($site_user, 'post');
 
-			if ( $user_posts > 0 ) {
+			if ($user_posts > 0) {
 				$params = array(
 					'post_type' => 'post',
 					'author' => $site_user,
@@ -76,16 +76,16 @@ 
 					),
 				);
 
-				$posts_query = new \WP_Query( $params );
+				$posts_query = new \WP_Query($params);
 
-				if ( $posts_query->have_posts() ) {
+				if ($posts_query->have_posts()) {
 					$tab_post['post_type'] = 'post';
-					$tab_post['title'] = esc_html__( 'Posts', 'lsx-team' );
+					$tab_post['title'] = esc_html__('Posts', 'lsx-team');
 					$tab_post['posts'] = $posts_query->posts;
 
-					if ( ! empty( $tab_post['posts'] ) ) {
-						$post_ids = join( ',', $tab_post['posts'] );
-						$tab_post['shortcode'] = '[lsx_posts columns="3" limit="9" include="' . $post_ids . '"]';
+					if (!empty($tab_post['posts'])) {
+						$post_ids = join(',', $tab_post['posts']);
+						$tab_post['shortcode'] = '[lsx_posts columns="3" limit="9" include="'.$post_ids.'"]';
 						$tabs[] = $tab_post;
 					}
 				}
@@ -96,24 +96,24 @@ 
 	// Tab Projects
 
 	$tab_project['post_type'] = 'project';
-	$tab_project['title'] = esc_html__( 'Projects', 'lsx-team' );
-	$tab_project['posts'] = get_post_meta( get_the_ID(), 'project_to_team', true );
-	if ( is_plugin_active( 'lsx-projects/lsx-projects.php' ) && ( ! empty( $tab_project['posts'] ) ) ) {
-		$post_ids = join( ',', $tab_project['posts'] );
-		$tab_project['shortcode'] = '[lsx_projects columns="3" include="' . $post_ids . '"]';
+	$tab_project['title'] = esc_html__('Projects', 'lsx-team');
+	$tab_project['posts'] = get_post_meta(get_the_ID(), 'project_to_team', true);
+	if (is_plugin_active('lsx-projects/lsx-projects.php') && (!empty($tab_project['posts']))) {
+		$post_ids = join(',', $tab_project['posts']);
+		$tab_project['shortcode'] = '[lsx_projects columns="3" include="'.$post_ids.'"]';
 		$tabs[] = $tab_project;
 	}
 
 	// Tab Services
 
-	if ( is_plugin_active( 'lsx-services/lsx-services.php' ) ) {
+	if (is_plugin_active('lsx-services/lsx-services.php')) {
 		$tab_service['post_type'] = 'service';
-		$tab_service['title'] = esc_html__( 'Services', 'lsx-team' );
-		$tab_service['posts'] = get_post_meta( get_the_ID(), 'service_to_team', true );
+		$tab_service['title'] = esc_html__('Services', 'lsx-team');
+		$tab_service['posts'] = get_post_meta(get_the_ID(), 'service_to_team', true);
 
-		if ( ! empty( $tab_service['posts'] ) ) {
-			$post_ids = join( ',', $tab_service['posts'] );
-			$tab_service['shortcode'] = '[lsx_services columns="3" include="' . $post_ids . '"]';
+		if (!empty($tab_service['posts'])) {
+			$post_ids = join(',', $tab_service['posts']);
+			$tab_service['shortcode'] = '[lsx_services columns="3" include="'.$post_ids.'"]';
 			$tabs[] = $tab_service;
 		}
 	}
@@ -121,18 +121,18 @@ 
 	// Tab Testimonials
 
 	$tab_testimonial['post_type'] = 'testimonial';
-	$tab_testimonial['title'] = esc_html__( 'Testimonials', 'lsx-team' );
-	$tab_testimonial['posts'] = get_post_meta( get_the_ID(), 'testimonial_to_team', true );
+	$tab_testimonial['title'] = esc_html__('Testimonials', 'lsx-team');
+	$tab_testimonial['posts'] = get_post_meta(get_the_ID(), 'testimonial_to_team', true);
 
-	if ( is_plugin_active( 'lsx-testimonials/lsx-testimonials.php' ) && ( ! empty( $tab_testimonial['posts'] ) ) ) {
-		if ( count( $tab_testimonial['posts'] ) <= 2 ) {
-			$columns = count( $tab_testimonial['posts'] );
+	if (is_plugin_active('lsx-testimonials/lsx-testimonials.php') && (!empty($tab_testimonial['posts']))) {
+		if (count($tab_testimonial['posts']) <= 2) {
+			$columns = count($tab_testimonial['posts']);
 		} else {
 			$columns = 2;
 		}
 
-		$post_ids = join( ',', $tab_testimonial['posts'] );
-		$tab_testimonial['shortcode'] = '[lsx_testimonials columns="' . $columns . '" include="' . $post_ids . '" orderby="date" order="DESC" display="excerpt"]';
+		$post_ids = join(',', $tab_testimonial['posts']);
+		$tab_testimonial['shortcode'] = '[lsx_testimonials columns="'.$columns.'" include="'.$post_ids.'" orderby="date" order="DESC" display="excerpt"]';
 		$tabs[] = $tab_testimonial;
 	}
 ?>
@@ -146,15 +146,15 @@ 
 	<div class="row">
 		<div class="col-xs-12 col-sm-6 col-md-4">
 			<figure class="lsx-team-avatar">
-				<?php echo wp_kses_post( $thumbnail ); ?>
+				<?php echo wp_kses_post($thumbnail); ?>
 			</figure>
 
-			<?php if ( count( $links ) > 0 ) : ?>
-				<span class="lsx-team-socials-header"><?php echo esc_html__( 'Follow', 'lsx-team' ) . ':'; ?></span>
+			<?php if (count($links) > 0) : ?>
+				<span class="lsx-team-socials-header"><?php echo esc_html__('Follow', 'lsx-team').':'; ?></span>
 
 				<ul class="lsx-team-socials list-inline">
-					<?php foreach ( $links as $service => $link ) : ?>
-						<li><a href="<?php echo esc_html( $link ); ?>" target="_blank" rel="nofollow noreferrer noopener"><i class="fa fa-<?php echo esc_html( $service ); ?>" aria-hidden="true"></i></a></li>
+					<?php foreach ($links as $service => $link) : ?>
+						<li><a href="<?php echo esc_html($link); ?>" target="_blank" rel="nofollow noreferrer noopener"><i class="fa fa-<?php echo esc_html($service); ?>" aria-hidden="true"></i></a></li>
 					<?php endforeach; ?>
 				</ul>
 			<?php endif; ?>
@@ -162,39 +162,39 @@ 
 
 		<div class="col-xs-12 col-sm-6 col-md-8">
 			<h2 class="lsx-team-name"><?php the_title(); ?></h2>
-			<h5 class="lsx-team-job-title"><?php echo esc_html( $job_title ); ?></h5>
+			<h5 class="lsx-team-job-title"><?php echo esc_html($job_title); ?></h5>
 			<div class="lsx-team-content"><?php the_content(); ?></div>
 
-			<?php if ( ! empty( $email ) || ! empty( $phone ) || ! empty( $skype ) ) : ?>
+			<?php if (!empty($email) || !empty($phone) || !empty($skype)) : ?>
 				<ul class="lsx-team-contact list-inline">
-					<?php if ( ! empty( $email ) ) : ?>
-						<li><a href="mailto:<?php echo esc_attr( $email ); ?>"><i class="fa fa-envelope-o" aria-hidden="true"></i> <?php echo esc_attr( $email ); ?></a></li>
+					<?php if (!empty($email)) : ?>
+						<li><a href="mailto:<?php echo esc_attr($email); ?>"><i class="fa fa-envelope-o" aria-hidden="true"></i> <?php echo esc_attr($email); ?></a></li>
 					<?php endif; ?>
 
-					<?php if ( ! empty( $phone ) ) : ?>
-						<li><a href="tel:<?php echo esc_attr( $phone_attr ); ?>"><i class="fa fa-phone" aria-hidden="true"></i> <?php echo esc_attr( $phone ); ?></a></li>
+					<?php if (!empty($phone)) : ?>
+						<li><a href="tel:<?php echo esc_attr($phone_attr); ?>"><i class="fa fa-phone" aria-hidden="true"></i> <?php echo esc_attr($phone); ?></a></li>
 					<?php endif; ?>
 
-					<?php if ( ! empty( $skype ) ) : ?>
-						<li><i class="fa fa-skype" aria-hidden="true"></i> <?php echo esc_attr( $skype ); ?></li>
+					<?php if (!empty($skype)) : ?>
+						<li><i class="fa fa-skype" aria-hidden="true"></i> <?php echo esc_attr($skype); ?></li>
 					<?php endif; ?>
 				</ul>
 			<?php endif; ?>
 		</div>
 	</div>
 
-	<?php if ( count( $tabs ) > 0 ) : ?>
+	<?php if (count($tabs) > 0) : ?>
 		<div class="entry-tabs">
 			<ul class="nav nav-tabs">
-				<?php foreach ( $tabs as $i => $tab ) : ?>
-					<li<?php if ( 0 === $i ) echo ' class="active"'; ?>><a data-toggle="tab" href="#<?php echo esc_attr( sanitize_title( $tab['title'] ) ); ?>"><?php echo esc_html( $tab['title'] ); ?></a></li>
+				<?php foreach ($tabs as $i => $tab) : ?>
+					<li<?php if (0 === $i) echo ' class="active"'; ?>><a data-toggle="tab" href="#<?php echo esc_attr(sanitize_title($tab['title'])); ?>"><?php echo esc_html($tab['title']); ?></a></li>
 				<?php endforeach; ?>
 			</ul>
 
 			<div class="tab-content">
-				<?php foreach ( $tabs as $i => $tab ) : ?>
-					<div id="<?php echo esc_attr( sanitize_title( $tab['title'] ) ); ?>" class="tab-pane fade<?php if ( 0 === $i ) echo ' in active'; ?>">
-						<?php echo do_shortcode( $tab['shortcode'] ); ?>
+				<?php foreach ($tabs as $i => $tab) : ?>
+					<div id="<?php echo esc_attr(sanitize_title($tab['title'])); ?>" class="tab-pane fade<?php if (0 === $i) echo ' in active'; ?>">
+						<?php echo do_shortcode($tab['shortcode']); ?>
 					</div>
 				<?php endforeach; ?>
 			</div>

templates/content-archive-team-careers-cta.php

Indentation +6 added lines, -6 removed lines

@@ -6,12 +6,12 @@
 
 <?php if ( ! empty( team_get_option( 'team_careers_cta_enable' ) ) ) : ?>
 	<?php
-		$thumbnail = '<img loading="lazy" class="img-responsive wp-post-image" src="https://www.gravatar.com/avatar/none?d=mm&s=170" width="170" />';
-		$title     = team_get_option( 'team_careers_cta_title' );
-		$tagline   = team_get_option( 'team_careers_cta_tagline' );
-		$link_text = team_get_option( 'team_careers_cta_link_text' );
-		$link      = team_get_option( 'team_careers_cta_link' );
-	?>
+          $thumbnail = '<img loading="lazy" class="img-responsive wp-post-image" src="https://www.gravatar.com/avatar/none?d=mm&s=170" width="170" />';
+          $title     = team_get_option( 'team_careers_cta_title' );
+          $tagline   = team_get_option( 'team_careers_cta_tagline' );
+          $link_text = team_get_option( 'team_careers_cta_link_text' );
+          $link      = team_get_option( 'team_careers_cta_link' );
+     ?>
 
 	<div class="col-xs-12 col-sm-6 col-md-3">
 		<article class="lsx-team-slot">

Spacing +10 added lines, -10 removed lines

@@ -4,30 +4,30 @@
  */
 ?>
 
-<?php if ( ! empty( team_get_option( 'team_careers_cta_enable' ) ) ) : ?>
+<?php if (!empty(team_get_option('team_careers_cta_enable'))) : ?>
 	<?php
 		$thumbnail = '<img loading="lazy" class="img-responsive wp-post-image" src="https://www.gravatar.com/avatar/none?d=mm&s=170" width="170" />';
-		$title     = team_get_option( 'team_careers_cta_title' );
-		$tagline   = team_get_option( 'team_careers_cta_tagline' );
-		$link_text = team_get_option( 'team_careers_cta_link_text' );
-		$link      = team_get_option( 'team_careers_cta_link' );
+		$title     = team_get_option('team_careers_cta_title');
+		$tagline   = team_get_option('team_careers_cta_tagline');
+		$link_text = team_get_option('team_careers_cta_link_text');
+		$link      = team_get_option('team_careers_cta_link');
 	?>
 
 	<div class="col-xs-12 col-sm-6 col-md-3">
 		<article class="lsx-team-slot">
 			<figure class="lsx-team-avatar">
-				<a href="<?php echo esc_attr( $link ); ?>"><?php echo wp_kses_post( $thumbnail ); ?></a>
+				<a href="<?php echo esc_attr($link); ?>"><?php echo wp_kses_post($thumbnail); ?></a>
 			</figure>
 
 			<h5 class="lsx-team-name">
-				<a href="<?php echo esc_attr( $link ); ?>"><?php echo esc_html( $title ); ?></a>
+				<a href="<?php echo esc_attr($link); ?>"><?php echo esc_html($title); ?></a>
 			</h5>
 
-			<?php if ( ! empty( $tagline ) ) : ?>
-				<small class="lsx-team-job-title"><?php echo esc_html( $tagline ); ?></small>
+			<?php if (!empty($tagline)) : ?>
+				<small class="lsx-team-job-title"><?php echo esc_html($tagline); ?></small>
 			<?php endif; ?>
 
-			<a href="<?php echo esc_attr( $link ); ?>" class="lsx-team-show-more"><?php echo esc_html( $link_text ); ?> <i class="fa fa-long-arrow-right"></i></a>
+			<a href="<?php echo esc_attr($link); ?>" class="lsx-team-show-more"><?php echo esc_html($link_text); ?> <i class="fa fa-long-arrow-right"></i></a>
 		</article>
 	</div>
 <?php endif; ?>

templates/content-archive-team.php

Indentation +4 added lines, -4 removed lines

@@ -5,11 +5,11 @@ 
 ?>
 
 <?php
-	global $lsx_team;
+     global $lsx_team;
 
-	$thumbnail = $lsx_team->get_thumbnail( get_the_ID(), 'lsx-team-archive' );
+     $thumbnail = $lsx_team->get_thumbnail( get_the_ID(), 'lsx-team-archive' );
 
-	$job_title = get_post_meta( get_the_ID(), 'lsx_job_title', true );
+     $job_title = get_post_meta( get_the_ID(), 'lsx_job_title', true );
 ?>
 
 <?php lsx_entry_before(); ?>
@@ -44,4 +44,4 @@ 
 </div>
 
 <?php
-	lsx_entry_after();
+     lsx_entry_after();

Spacing +10 added lines, -10 removed lines

@@ -7,9 +7,9 @@ 
 <?php
 	global $lsx_team;
 
-	$thumbnail = $lsx_team->get_thumbnail( get_the_ID(), 'lsx-team-archive' );
+	$thumbnail = $lsx_team->get_thumbnail(get_the_ID(), 'lsx-team-archive');
 
-	$job_title = get_post_meta( get_the_ID(), 'lsx_job_title', true );
+	$job_title = get_post_meta(get_the_ID(), 'lsx_job_title', true);
 ?>
 
 <?php lsx_entry_before(); ?>
@@ -17,28 +17,28 @@ 
 <div class="col-xs-12 col-sm-6 col-md-3">
 	<article class="lsx-team-slot">
 		<figure class="lsx-team-avatar">
-			<?php if ( empty( team_get_option( 'team_disable_single' ) ) ) : ?>
-				<a href="<?php the_permalink(); ?>"><?php echo wp_kses_post( $thumbnail ); ?></a>
+			<?php if (empty(team_get_option('team_disable_single'))) : ?>
+				<a href="<?php the_permalink(); ?>"><?php echo wp_kses_post($thumbnail); ?></a>
 			<?php else : ?>
-				<?php echo wp_kses_post( $thumbnail ); ?>
+				<?php echo wp_kses_post($thumbnail); ?>
 			<?php endif; ?>
 		</figure>
 
 		<h5 class="lsx-team-name">
-			<?php if ( empty( team_get_option( 'team_disable_single' ) ) ) : ?>
+			<?php if (empty(team_get_option('team_disable_single'))) : ?>
 				<a href="<?php the_permalink(); ?>"><?php the_title(); ?></a>
 			<?php else : ?>
 				<?php the_title(); ?>
 			<?php endif; ?>
 		</h5>
 
-		<?php if ( ! empty( $job_title ) ) : ?>
-			<small class="lsx-team-job-title"><?php echo wp_kses_post( $job_title ); ?></small>
+		<?php if (!empty($job_title)) : ?>
+			<small class="lsx-team-job-title"><?php echo wp_kses_post($job_title); ?></small>
 		<?php endif; ?>
 
-		<?php if ( empty( team_get_option( 'team_disable_single' ) ) ) : ?>
+		<?php if (empty(team_get_option('team_disable_single'))) : ?>
 		<?php	/* translators: %s: search term */ ?>
-			<a href="<?php the_permalink(); ?>" class="lsx-team-show-more"><?php printf( esc_html__( ' More about %s', 'lsx-team' ), esc_html( strtok( get_the_title(), ' ' ) ) ); ?> <i class="fa fa-long-arrow-right"></i></a>
+			<a href="<?php the_permalink(); ?>" class="lsx-team-show-more"><?php printf(esc_html__(' More about %s', 'lsx-team'), esc_html(strtok(get_the_title(), ' '))); ?> <i class="fa fa-long-arrow-right"></i></a>
 		<?php endif; ?>
 	</article>
 </div>

Braces +10 added lines, -4 removed lines

@@ -19,16 +19,22 @@
 		<figure class="lsx-team-avatar">
 			<?php if ( empty( team_get_option( 'team_disable_single' ) ) ) : ?>
 				<a href="<?php the_permalink(); ?>"><?php echo wp_kses_post( $thumbnail ); ?></a>
-			<?php else : ?>
-				<?php echo wp_kses_post( $thumbnail ); ?>
+			<?php else {
+     : ?>
+				<?php echo wp_kses_post( $thumbnail );
+}
+?>
 			<?php endif; ?>
 		</figure>
 
 		<h5 class="lsx-team-name">
 			<?php if ( empty( team_get_option( 'team_disable_single' ) ) ) : ?>
 				<a href="<?php the_permalink(); ?>"><?php the_title(); ?></a>
-			<?php else : ?>
-				<?php the_title(); ?>
+			<?php else {
+     : ?>
+				<?php the_title();
+}
+?>
 			<?php endif; ?>
 		</h5>
 

templates/archive-team.php

Indentation +6 added lines, -6 removed lines

@@ -23,13 +23,13 @@
 				<div class="row row-flex">
 
 					<?php
-						while ( have_posts() ) {
-							the_post();
-							include( LSX_TEAM_PATH . '/templates/content-archive-team.php' );
-						}
+                              while ( have_posts() ) {
+                                   the_post();
+                                   include( LSX_TEAM_PATH . '/templates/content-archive-team.php' );
+                              }
 
-						include( LSX_TEAM_PATH . '/templates/content-archive-team-careers-cta.php' );
-					?>
+                              include( LSX_TEAM_PATH . '/templates/content-archive-team-careers-cta.php' );
+                         ?>
 
 				</div>
 			</div>

Spacing +6 added lines, -6 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,18 +17,18 @@ 
 
 		<?php lsx_content_top(); ?>
 
-		<?php if ( have_posts() ) : ?>
+		<?php if (have_posts()) : ?>
 
 			<div class="lsx-team-container">
 				<div class="row row-flex">
 
 					<?php
-						while ( have_posts() ) {
+						while (have_posts()) {
 							the_post();
-							include( LSX_TEAM_PATH . '/templates/content-archive-team.php' );
+							include(LSX_TEAM_PATH.'/templates/content-archive-team.php');
 						}
 
-						include( LSX_TEAM_PATH . '/templates/content-archive-team-careers-cta.php' );
+						include(LSX_TEAM_PATH.'/templates/content-archive-team-careers-cta.php');
 					?>
 
 				</div>
@@ -38,7 +38,7 @@ 
 
 		<?php else : ?>
 
-			<?php get_template_part( 'partials/content', 'none' ); ?>
+			<?php get_template_part('partials/content', 'none'); ?>
 
 		<?php endif; ?>
 

Braces +5 added lines, -2 removed lines

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

classes/class-lsx-team-schema.php

Indentation +52 added lines, -52 removed lines

@@ -10,56 +10,56 @@
  * @since 10.2
  */
 class LSX_Team_Schema extends LSX_Schema_Graph_Piece {
-	/**
-	 * Constructor.
-	 *
-	 * @param \WPSEO_Schema_Context $context A value object with context variables.
-	 */
-	public function __construct( WPSEO_Schema_Context $context ) {
-		$this->post_type = 'team';
-		parent::__construct( $context );
-	}
-	/**
-	 * Returns Review data.
-	 *
-	 * @return array $data Review data.
-	 */
-	public function generate() {
-		$data = array(
-			'@type'            => array(
-				'Person',
-			),
-			'@id'              => $this->context->canonical . '#person',
-			'name'             => $this->post->post_title,
-			'description'      => wp_strip_all_tags( $this->post->post_content ),
-			'url'              => $this->post_url,
-			'mainEntityOfPage' => array(
-				'@id' => $this->context->canonical . WPSEO_Schema_IDs::WEBPAGE_HASH,
-			),
-		);
-		if ( $this->context->site_represents_reference ) {
-			$data['worksFor'] = $this->context->site_represents_reference;
-			$data['memberOf'] = $this->context->site_represents_reference;
-		}
-		$data = $this->add_custom_field( $data, 'jobTitle', 'lsx_job_title' );
-		$data = $this->add_custom_field( $data, 'email', 'lsx_email_contact' );
-		$data = $this->add_custom_field( $data, 'telephone', 'lsx_tel' );
-		$data = LSX_Schema_Utils::add_image( $data, $this->context );
-		return $data;
-	}
-	/**
-	 * Adds the projects and testimonials under the 'owns' parameter
-	 *
-	 * @param array $data
-	 * @return array
-	 */
-	public function add_products( $data ) {
-		$connections_array = array();
-		$connections_array = $this->add_project( $connections_array );
-		$connections_array = $this->add_testimonial( $connections_array );
-		if ( ! empty( $connections_array ) ) {
-			$data['owns'] = $connections_array;
-		}
-		return $data;
-	}
+     /**
+      * Constructor.
+      *
+      * @param \WPSEO_Schema_Context $context A value object with context variables.
+      */
+     public function __construct( WPSEO_Schema_Context $context ) {
+          $this->post_type = 'team';
+          parent::__construct( $context );
+     }
+     /**
+      * Returns Review data.
+      *
+      * @return array $data Review data.
+      */
+     public function generate() {
+          $data = array(
+               '@type'            => array(
+                    'Person',
+               ),
+               '@id'              => $this->context->canonical . '#person',
+               'name'             => $this->post->post_title,
+               'description'      => wp_strip_all_tags( $this->post->post_content ),
+               'url'              => $this->post_url,
+               'mainEntityOfPage' => array(
+                    '@id' => $this->context->canonical . WPSEO_Schema_IDs::WEBPAGE_HASH,
+               ),
+          );
+          if ( $this->context->site_represents_reference ) {
+               $data['worksFor'] = $this->context->site_represents_reference;
+               $data['memberOf'] = $this->context->site_represents_reference;
+          }
+          $data = $this->add_custom_field( $data, 'jobTitle', 'lsx_job_title' );
+          $data = $this->add_custom_field( $data, 'email', 'lsx_email_contact' );
+          $data = $this->add_custom_field( $data, 'telephone', 'lsx_tel' );
+          $data = LSX_Schema_Utils::add_image( $data, $this->context );
+          return $data;
+     }
+     /**
+      * Adds the projects and testimonials under the 'owns' parameter
+      *
+      * @param array $data
+      * @return array
+      */
+     public function add_products( $data ) {
+          $connections_array = array();
+          $connections_array = $this->add_project( $connections_array );
+          $connections_array = $this->add_testimonial( $connections_array );
+          if ( ! empty( $connections_array ) ) {
+               $data['owns'] = $connections_array;
+          }
+          return $data;
+     }
 }

Spacing +14 added lines, -14 removed lines

@@ -15,9 +15,9 @@ 
 	 *
 	 * @param \WPSEO_Schema_Context $context A value object with context variables.
 	 */
-	public function __construct( WPSEO_Schema_Context $context ) {
+	public function __construct(WPSEO_Schema_Context $context) {
 		$this->post_type = 'team';
-		parent::__construct( $context );
+		parent::__construct($context);
 	}
 	/**
 	 * Returns Review data.
@@ -29,22 +29,22 @@ 
 			'@type'            => array(
 				'Person',
 			),
-			'@id'              => $this->context->canonical . '#person',
+			'@id'              => $this->context->canonical.'#person',
 			'name'             => $this->post->post_title,
-			'description'      => wp_strip_all_tags( $this->post->post_content ),
+			'description'      => wp_strip_all_tags($this->post->post_content),
 			'url'              => $this->post_url,
 			'mainEntityOfPage' => array(
-				'@id' => $this->context->canonical . WPSEO_Schema_IDs::WEBPAGE_HASH,
+				'@id' => $this->context->canonical.WPSEO_Schema_IDs::WEBPAGE_HASH,
 			),
 		);
-		if ( $this->context->site_represents_reference ) {
+		if ($this->context->site_represents_reference) {
 			$data['worksFor'] = $this->context->site_represents_reference;
 			$data['memberOf'] = $this->context->site_represents_reference;
 		}
-		$data = $this->add_custom_field( $data, 'jobTitle', 'lsx_job_title' );
-		$data = $this->add_custom_field( $data, 'email', 'lsx_email_contact' );
-		$data = $this->add_custom_field( $data, 'telephone', 'lsx_tel' );
-		$data = LSX_Schema_Utils::add_image( $data, $this->context );
+		$data = $this->add_custom_field($data, 'jobTitle', 'lsx_job_title');
+		$data = $this->add_custom_field($data, 'email', 'lsx_email_contact');
+		$data = $this->add_custom_field($data, 'telephone', 'lsx_tel');
+		$data = LSX_Schema_Utils::add_image($data, $this->context);
 		return $data;
 	}
 	/**
@@ -53,11 +53,11 @@ 
 	 * @param array $data
 	 * @return array
 	 */
-	public function add_products( $data ) {
+	public function add_products($data) {
 		$connections_array = array();
-		$connections_array = $this->add_project( $connections_array );
-		$connections_array = $this->add_testimonial( $connections_array );
-		if ( ! empty( $connections_array ) ) {
+		$connections_array = $this->add_project($connections_array);
+		$connections_array = $this->add_testimonial($connections_array);
+		if (!empty($connections_array)) {
 			$data['owns'] = $connections_array;
 		}
 		return $data;