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' );
 }

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' );

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__ ) );

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">

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();

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>

classes/admin/class-settings.php

Indentation +179 added lines, -179 removed lines

@@ -9,184 +9,184 @@
 
 class Settings {
 
-	/**
-	 * Holds class instance
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var      object \lsx_team\classes\admin\Settings()
-	 */
-	protected static $instance = null;
-
-	/**
-	 * Option key, and option page slug
-	 *
-	 * @var string
-	 */
-	protected $screen_id = 'lsx_team_settings';
-
-	/**
-	 * Contructor
-	 */
-	public function __construct() {
-		add_action( 'cmb2_admin_init', array( $this, 'register_settings_page' ) );
-		add_action( 'lsx_team_settings_page', array( $this, 'general_settings' ), 1, 1 );
-		add_action( 'lsx_team_settings_page', array( $this, 'global_defaults' ), 3, 1 );
-	}
-
-	/**
-	 * Return an instance of this class.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return    object Settings()    A single instance of this class.
-	 */
-	public static function get_instance() {
-		// If the single instance hasn't been set, set it now.
-		if ( null === self::$instance ) {
-			self::$instance = new self();
-		}
-		return self::$instance;
-	}
-
-	/**
-	 * Hook in and register a submenu options page for the Page post-type menu.
-	 */
-	public function register_settings_page() {
-		$cmb = new_cmb2_box(
-			array(
-				'id'           => $this->screen_id,
-				'title'        => esc_html__( 'Settings', 'lsx-team' ),
-				'object_types' => array( 'options-page' ),
-				'option_key'   => 'lsx_team_options', // The option key and admin menu page slug.
-				'parent_slug'  => 'edit.php?post_type=team', // Make options page a submenu item of the themes menu.
-				'capability'   => 'manage_options', // Cap required to view options-page.
-			)
-		);
-		do_action( 'lsx_team_settings_page', $cmb );
-	}
-
-	/**
-	 * Registers the general settings.
-	 *
-	 * @param object $cmb new_cmb2_box().
-	 * @return void
-	 */
-	public function general_settings( $cmb ) {
-		$cmb->add_field(
-			array(
-				'id'      => 'settings_general_title',
-				'type'    => 'title',
-				'name'    => __( 'General', 'lsx-team' ),
-				'default' => __( 'General', 'lsx-team' ),
-			)
-		);
-		$cmb->add_field(
-			array(
-				'name'        => __( 'Disable Single Posts', 'lsx-team' ),
-				'id'          => 'team_disable_single',
-				'type'        => 'checkbox',
-				'value'       => 1,
-				'default'     => 0,
-				'description' => __( 'Disable Single Posts.', 'lsx-health-plan' ),
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'name'        => __( 'Group By Role', 'lsx-team' ),
-				'id'          => 'group_by_role',
-				'type'        => 'checkbox',
-				'value'       => 1,
-				'default'     => 0,
-				'description' => __( 'Groups the Team on the Team archive by the role assigned.', 'lsx-health-plan' ),
-			)
-		);
-		$cmb->add_field( array(
-			'name'    => 'Placeholder',
-			'desc'    => __( 'Upload an image.', 'lsx-health-plan' ),
-			'id'      => 'team_placeholder',
-			'type'    => 'file',
-			'options' => array(
-				'url' => false, // Hide the text input for the url.
-			),
-			'text'    => array(
-				'add_upload_file_text' => 'Choose Image',
-			),
-		) );
-		$cmb->add_field(
-			array(
-				'id'   => 'settings_general_closing',
-				'type' => 'tab_closing',
-			)
-		);
-	}
-
-	/**
-	 * Registers the global default settings.
-	 *
-	 * @param object $cmb new_cmb2_box().
-	 * @return void
-	 */
-	public function global_defaults( $cmb ) {
-		$cmb->add_field(
-			array(
-				'id'      => 'global_defaults_title',
-				'type'    => 'title',
-				'name'    => __( 'Careers CTA', 'lsx-team' ),
-				'default' => __( 'Careers CTA', 'lsx-team' ),
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'name'        => __( 'Enable careers CTA', 'lsx-team' ),
-				'id'          => 'team_careers_cta_enable',
-				'type'        => 'checkbox',
-				'value'       => 1,
-				'default'     => 0,
-				'description' => __( 'Displays careers CTA mystery man on team archive.', 'lsx-health-plan' ),
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'name' => __( 'Title', 'lsx-team' ),
-				'id'   => 'team_careers_cta_title',
-				'type' => 'text',
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'name' => __( 'Tagline', 'lsx-team' ),
-				'id'   => 'team_careers_cta_tagline',
-				'type' => 'text',
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'name' => __( 'Link Text', 'lsx-team' ),
-				'id'   => 'team_careers_cta_link_text',
-				'type' => 'text',
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'name' => __( 'Careers page link', 'lsx-team' ),
-				'id'   => 'team_careers_cta_link',
-				'type' => 'text',
-			)
-		);
-
-		$cmb->add_field(
-			array(
-				'id'   => 'settings_global_defaults_closing',
-				'type' => 'tab_closing',
-			)
-		);
-	}
+     /**
+      * Holds class instance
+      *
+      * @since 1.0.0
+      *
+      * @var      object \lsx_team\classes\admin\Settings()
+      */
+     protected static $instance = null;
+
+     /**
+      * Option key, and option page slug
+      *
+      * @var string
+      */
+     protected $screen_id = 'lsx_team_settings';
+
+     /**
+      * Contructor
+      */
+     public function __construct() {
+          add_action( 'cmb2_admin_init', array( $this, 'register_settings_page' ) );
+          add_action( 'lsx_team_settings_page', array( $this, 'general_settings' ), 1, 1 );
+          add_action( 'lsx_team_settings_page', array( $this, 'global_defaults' ), 3, 1 );
+     }
+
+     /**
+      * Return an instance of this class.
+      *
+      * @since 1.0.0
+      *
+      * @return    object Settings()    A single instance of this class.
+      */
+     public static function get_instance() {
+          // If the single instance hasn't been set, set it now.
+          if ( null === self::$instance ) {
+               self::$instance = new self();
+          }
+          return self::$instance;
+     }
+
+     /**
+      * Hook in and register a submenu options page for the Page post-type menu.
+      */
+     public function register_settings_page() {
+          $cmb = new_cmb2_box(
+               array(
+                    'id'           => $this->screen_id,
+                    'title'        => esc_html__( 'Settings', 'lsx-team' ),
+                    'object_types' => array( 'options-page' ),
+                    'option_key'   => 'lsx_team_options', // The option key and admin menu page slug.
+                    'parent_slug'  => 'edit.php?post_type=team', // Make options page a submenu item of the themes menu.
+                    'capability'   => 'manage_options', // Cap required to view options-page.
+               )
+          );
+          do_action( 'lsx_team_settings_page', $cmb );
+     }
+
+     /**
+      * Registers the general settings.
+      *
+      * @param object $cmb new_cmb2_box().
+      * @return void
+      */
+     public function general_settings( $cmb ) {
+          $cmb->add_field(
+               array(
+                    'id'      => 'settings_general_title',
+                    'type'    => 'title',
+                    'name'    => __( 'General', 'lsx-team' ),
+                    'default' => __( 'General', 'lsx-team' ),
+               )
+          );
+          $cmb->add_field(
+               array(
+                    'name'        => __( 'Disable Single Posts', 'lsx-team' ),
+                    'id'          => 'team_disable_single',
+                    'type'        => 'checkbox',
+                    'value'       => 1,
+                    'default'     => 0,
+                    'description' => __( 'Disable Single Posts.', 'lsx-health-plan' ),
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'name'        => __( 'Group By Role', 'lsx-team' ),
+                    'id'          => 'group_by_role',
+                    'type'        => 'checkbox',
+                    'value'       => 1,
+                    'default'     => 0,
+                    'description' => __( 'Groups the Team on the Team archive by the role assigned.', 'lsx-health-plan' ),
+               )
+          );
+          $cmb->add_field( array(
+               'name'    => 'Placeholder',
+               'desc'    => __( 'Upload an image.', 'lsx-health-plan' ),
+               'id'      => 'team_placeholder',
+               'type'    => 'file',
+               'options' => array(
+                    'url' => false, // Hide the text input for the url.
+               ),
+               'text'    => array(
+                    'add_upload_file_text' => 'Choose Image',
+               ),
+          ) );
+          $cmb->add_field(
+               array(
+                    'id'   => 'settings_general_closing',
+                    'type' => 'tab_closing',
+               )
+          );
+     }
+
+     /**
+      * Registers the global default settings.
+      *
+      * @param object $cmb new_cmb2_box().
+      * @return void
+      */
+     public function global_defaults( $cmb ) {
+          $cmb->add_field(
+               array(
+                    'id'      => 'global_defaults_title',
+                    'type'    => 'title',
+                    'name'    => __( 'Careers CTA', 'lsx-team' ),
+                    'default' => __( 'Careers CTA', 'lsx-team' ),
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'name'        => __( 'Enable careers CTA', 'lsx-team' ),
+                    'id'          => 'team_careers_cta_enable',
+                    'type'        => 'checkbox',
+                    'value'       => 1,
+                    'default'     => 0,
+                    'description' => __( 'Displays careers CTA mystery man on team archive.', 'lsx-health-plan' ),
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'name' => __( 'Title', 'lsx-team' ),
+                    'id'   => 'team_careers_cta_title',
+                    'type' => 'text',
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'name' => __( 'Tagline', 'lsx-team' ),
+                    'id'   => 'team_careers_cta_tagline',
+                    'type' => 'text',
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'name' => __( 'Link Text', 'lsx-team' ),
+                    'id'   => 'team_careers_cta_link_text',
+                    'type' => 'text',
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'name' => __( 'Careers page link', 'lsx-team' ),
+                    'id'   => 'team_careers_cta_link',
+                    'type' => 'text',
+               )
+          );
+
+          $cmb->add_field(
+               array(
+                    'id'   => 'settings_global_defaults_closing',
+                    'type' => 'tab_closing',
+               )
+          );
+     }
 
 }

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;
+     }
 }

classes/class-lsx-team.php

Indentation +279 added lines, -279 removed lines

@@ -10,268 +10,268 @@ 
  */
 class LSX_Team {
 
-	public $options;
-
-	public function __construct() {
-		$this->options = team_get_options();
-
-		add_action( 'init', array( $this, 'custom_image_sizes' ) );
-		add_filter( 'lsx_banner_allowed_post_types', array( $this, 'lsx_banner_allowed_post_types' ) );
-
-	}
-
-	/**
-	 * Enable project custom post type on LSX Banners.
-	 */
-	public function custom_image_sizes( $post_types ) {
-		add_image_size( 'lsx-team-archive', 170, 170, true );
-		add_image_size( 'lsx-team-single', 320, 320, true );
-	}
-
-	/**
-	 * Enable project custom post type on LSX Banners.
-	 */
-	public function lsx_banner_allowed_post_types( $post_types ) {
-		$post_types[] = 'team';
-		return $post_types;
-	}
-
-	/**
-	 * Return the team thumbnail.
-	 */
-	public function get_thumbnail( $post_id, $size ) {
-		add_filter( 'lsx_placeholder_url', array( $this, 'placeholder' ), 10, 1 );
-		add_filter( 'lsx_to_placeholder_url', array( $this, 'placeholder' ), 10, 1 );
-
-		if ( is_numeric( $size ) ) {
-			$thumb_size = array( $size, $size );
-		} else {
-			$thumb_size = $size;
-		}
-
-		$thumbnail_class = 'img-responsive';
-
-		if ( ! empty( get_the_post_thumbnail( $post_id ) ) || ! empty( get_post_meta( $post_id, 'lsx_email_gravatar', true ) ) ) {
-			if ( ! empty( get_the_post_thumbnail( $post_id ) ) ) {
-				$thumbnail = get_the_post_thumbnail( $post_id, $thumb_size, array(
-					'class' => $thumbnail_class,
-				) );
-			} else {
-				$thumbnail = get_avatar( get_post_meta( $post_id, 'lsx_email_gravatar', true ), $size, $this->options['display']['team_placeholder'], false, array(
-					'class' => $thumbnail_class,
-				) );
-			}
-		}
-		if ( empty( $thumbnail ) ) {
-			if ( $this->options['display'] && ! empty( $this->options['display']['team_placeholder'] ) ) {
-				$thumbnail = '<img loading="lazy" class="img-responsive wp-post-image" src="' . $this->options['display']['team_placeholder'] . '" width="' . $size . '" />';
-			} else {
-				$thumbnail = '<img loading="lazy" class="img-responsive wp-post-image" src="https://www.gravatar.com/avatar/none?d=mm&s=' . $size . '" width="' . $size . '" />';
-			}
-		}
-
-		remove_filter( 'lsx_placeholder_url', array( $this, 'placeholder' ), 10, 1 );
-		remove_filter( 'lsx_to_placeholder_url', array( $this, 'placeholder' ), 10, 1 );
-
-		return $thumbnail;
-	}
-
-	/**
-	 * Replaces the widget with Mystery Man
-	 */
-	public function placeholder( $image ) {
-		$image = array(
-			LSX_TEAM_URL . 'assets/img/mystery-man-square.png',
-			512,
-			512,
-			true,
-		);
-
-		return $image;
-	}
-
-	/**
-	 * Returns the shortcode output markup
-	 */
-	public function output( $atts ) {
-		extract( shortcode_atts(array(
-			'columns' => 4,
-			'orderby' => 'name',
-			'order' => 'ASC',
-			'role' => '',
-			'limit' => '99',
-			'include' => '',
-			'display' => 'excerpt',
-			'size' => 'lsx-team-archive',
-			'show_link' => false,
-			'show_email' => false,
-			'show_image' => true,
-			'show_roles' => false,
-			'show_job_title' => true,
-			'show_desc' => true,
-			'show_social' => true,
-			'carousel' => true,
-			'featured' => false,
-		), $atts ) );
-
-		$output = '';
-
-		if ( ! empty( $include ) ) {
-			$include = explode( ',', $include );
-
-			$args = array(
-				'post_type' => 'team',
-				'posts_per_page' => $limit,
-				'post__in' => $include,
-				'orderby' => 'post__in',
-				'order' => $order,
-			);
-		} else {
-			$args = array(
-				'post_type' => 'team',
-				'posts_per_page' => $limit,
-				'orderby' => $orderby,
-				'order' => $order,
-			);
-
-			if ( 'true' === $featured || true === $featured ) {
-				$args['meta_key'] = 'lsx_featured';
-				$args['meta_value'] = 1;
-			}
-		}
-
-		if ( ! empty( $role ) ) {
-			$args['tax_query'] = array(
-				array(
-					'taxonomy' => 'team_role',
-					'field' => 'id',
-					'terms' => $role,
-				),
-			);
-		}
-
-		$team = new \WP_Query( $args );
-
-		if ( $team->have_posts() ) {
-			global $post;
-
-			$count = 0;
-			$count_global = 0;
-
-			$column_size = intval( 12 / $columns );
-
-			$carousel = true === $carousel || 'true' === $carousel ? true : false;
-
-			if ( $carousel ) {
-				$output .= "<div class='lsx-team-shortcode' id='lsx-team-slider' data-slick='{\"slidesToShow\": $columns, \"slidesToScroll\": $columns }'>";
-			} else {
-				$output .= "<div class='lsx-team-shortcode'><div class='row'>";
-			}
-
-			while ( $team->have_posts() ) {
-				$team->the_post();
-
-				// Count
-				$count++;
-				$count_global++;
-
-				$member_name = apply_filters( 'the_title', $post->post_title );
-				$member_roles = '';
-				$member_description = '';
-				$member_avatar = '';
-				$member_socials = '';
-				$member_job_title = '';
-				$member_email = '';
-				$bottom_link = '';
-				$facebook = get_post_meta( $post->ID, 'lsx_facebook', true );
-				$twitter = get_post_meta( $post->ID, 'lsx_twitter', true );
-				$linkedin = get_post_meta( $post->ID, 'lsx_linkedin', true );
-
-				// Link to single
-				if ( ( true === $show_link || 'true' === $show_link ) && ( empty( team_get_option( 'team_disable_single' ) ) ) ) {
-					$bottom_link = '<a href="' . get_permalink( $post->ID ) . '" class="lsx-team-show-more">More about ' . strtok( $member_name, ' ' ) . '<i class="fa fa-long-arrow-right" aria-hidden="true"></i></a>';
-				}
-
-				if ( true === $show_email || 'true' === $show_email ) {
-					$email = get_post_meta( $post->ID, 'lsx_email_contact', true );
-
-					$member_email = '<a href="mailto:' . sanitize_email( $email ) . '" class="lsx-team-email">' . sanitize_email( $email ) . '</a>';
-				}
-
-				if ( ( true === $show_link || 'true' === $show_link ) && ( empty( team_get_option( 'team_disable_single' ) ) ) ) {
-					$member_name = '<h5 class="lsx-team-name"><a href="' . get_permalink() . '">' . $member_name . '</a></h5>';
-				} else {
-					$member_name = '<h5 class="lsx-team-name">' . $member_name . '</h5>';
-				}
-
-				// Member roles
-				if ( true === $show_roles || 'true' === $show_roles ) {
-					$roles = '';
-					$terms = get_the_terms( $post->ID, 'team_role' );
-
-					if ( $terms && ! is_wp_error( $terms ) ) {
-						$roles = array();
-
-						foreach ( $terms as $term ) {
-							$roles[] = $term->name;
-						}
-
-						$roles = join( ', ', $roles );
-					}
-
-					$member_roles = '' !== $roles ? "<small class='lsx-team-roles'>$roles</small>" : '';
-				}
-
-				if ( true === $show_job_title || 'true' === $show_job_title ) {
-					$job_title = get_post_meta( $post->ID, 'lsx_job_title', true );
-					$member_job_title = ! empty( $job_title ) ? "<small class='lsx-team-job-title'>$job_title</small>" : '';
-				}
-
-				// Member description
-				if ( true === $show_desc || 'true' === $show_desc ) {
-					if ( 'full' === $display ) {
-						$member_description = apply_filters( 'the_content', get_the_content( esc_html__( 'Read More', 'lsx-team' ) ) );
-						$member_description = str_replace( ']]>', ']]&gt;', $member_description );
-					} elseif ( 'excerpt' === $display ) {
-						$member_description = apply_filters( 'the_excerpt', get_the_excerpt() );
-					}
-
-					$member_description = ! empty( $member_description ) ? "<div class='lsx-team-description'>$member_description</div>" : '';
-				}
-
-				// Member avatar
-				if ( true === $show_image || 'true' === $show_image ) {
-					$member_avatar = $this->get_thumbnail( $post->ID, $size );
-
-					if ( ( true === $show_link || 'true' === $show_link ) && ( empty( $this->options['display'] ) || empty( team_get_option( 'team_disable_single' ) ) ) ) {
-						$member_avatar = "<figure class='lsx-team-avatar'><a href='" . get_permalink() . "'>$member_avatar</a></figure>";
-					} else {
-						$member_avatar = "<figure class='lsx-team-avatar'>$member_avatar</figure>";
-					}
-				}
-
-				// Member socials
-				if ( true === $show_social || 'true' === $show_social ) {
-					$links = array(
-						'facebook' => $facebook,
-						'twitter' => $twitter,
-						'linkedin' => $linkedin,
-					);
-
-					foreach ( $links as $sm => $sm_link ) {
-						if ( ! empty( $sm_link ) ) {
-							$member_socials .= "<li><a href='$sm_link' target='_blank'><i class='fa fa-$sm' aria-hidden='true'></i></a></li>";
-						}
-					}
-
-					$member_socials = ! empty( $member_socials ) ? "<ul class='lsx-team-socials list-inline'>$member_socials</ul>" : '';
-				}
-
-				if ( ! $carousel ) {
-					$output .= "<div class='col-xs-12 col-md-$column_size'>";
-				}
-
-				$output .= "
+     public $options;
+
+     public function __construct() {
+          $this->options = team_get_options();
+
+          add_action( 'init', array( $this, 'custom_image_sizes' ) );
+          add_filter( 'lsx_banner_allowed_post_types', array( $this, 'lsx_banner_allowed_post_types' ) );
+
+     }
+
+     /**
+      * Enable project custom post type on LSX Banners.
+      */
+     public function custom_image_sizes( $post_types ) {
+          add_image_size( 'lsx-team-archive', 170, 170, true );
+          add_image_size( 'lsx-team-single', 320, 320, true );
+     }
+
+     /**
+      * Enable project custom post type on LSX Banners.
+      */
+     public function lsx_banner_allowed_post_types( $post_types ) {
+          $post_types[] = 'team';
+          return $post_types;
+     }
+
+     /**
+      * Return the team thumbnail.
+      */
+     public function get_thumbnail( $post_id, $size ) {
+          add_filter( 'lsx_placeholder_url', array( $this, 'placeholder' ), 10, 1 );
+          add_filter( 'lsx_to_placeholder_url', array( $this, 'placeholder' ), 10, 1 );
+
+          if ( is_numeric( $size ) ) {
+               $thumb_size = array( $size, $size );
+          } else {
+               $thumb_size = $size;
+          }
+
+          $thumbnail_class = 'img-responsive';
+
+          if ( ! empty( get_the_post_thumbnail( $post_id ) ) || ! empty( get_post_meta( $post_id, 'lsx_email_gravatar', true ) ) ) {
+               if ( ! empty( get_the_post_thumbnail( $post_id ) ) ) {
+                    $thumbnail = get_the_post_thumbnail( $post_id, $thumb_size, array(
+                         'class' => $thumbnail_class,
+                    ) );
+               } else {
+                    $thumbnail = get_avatar( get_post_meta( $post_id, 'lsx_email_gravatar', true ), $size, $this->options['display']['team_placeholder'], false, array(
+                         'class' => $thumbnail_class,
+                    ) );
+               }
+          }
+          if ( empty( $thumbnail ) ) {
+               if ( $this->options['display'] && ! empty( $this->options['display']['team_placeholder'] ) ) {
+                    $thumbnail = '<img loading="lazy" class="img-responsive wp-post-image" src="' . $this->options['display']['team_placeholder'] . '" width="' . $size . '" />';
+               } else {
+                    $thumbnail = '<img loading="lazy" class="img-responsive wp-post-image" src="https://www.gravatar.com/avatar/none?d=mm&s=' . $size . '" width="' . $size . '" />';
+               }
+          }
+
+          remove_filter( 'lsx_placeholder_url', array( $this, 'placeholder' ), 10, 1 );
+          remove_filter( 'lsx_to_placeholder_url', array( $this, 'placeholder' ), 10, 1 );
+
+          return $thumbnail;
+     }
+
+     /**
+      * Replaces the widget with Mystery Man
+      */
+     public function placeholder( $image ) {
+          $image = array(
+               LSX_TEAM_URL . 'assets/img/mystery-man-square.png',
+               512,
+               512,
+               true,
+          );
+
+          return $image;
+     }
+
+     /**
+      * Returns the shortcode output markup
+      */
+     public function output( $atts ) {
+          extract( shortcode_atts(array(
+               'columns' => 4,
+               'orderby' => 'name',
+               'order' => 'ASC',
+               'role' => '',
+               'limit' => '99',
+               'include' => '',
+               'display' => 'excerpt',
+               'size' => 'lsx-team-archive',
+               'show_link' => false,
+               'show_email' => false,
+               'show_image' => true,
+               'show_roles' => false,
+               'show_job_title' => true,
+               'show_desc' => true,
+               'show_social' => true,
+               'carousel' => true,
+               'featured' => false,
+          ), $atts ) );
+
+          $output = '';
+
+          if ( ! empty( $include ) ) {
+               $include = explode( ',', $include );
+
+               $args = array(
+                    'post_type' => 'team',
+                    'posts_per_page' => $limit,
+                    'post__in' => $include,
+                    'orderby' => 'post__in',
+                    'order' => $order,
+               );
+          } else {
+               $args = array(
+                    'post_type' => 'team',
+                    'posts_per_page' => $limit,
+                    'orderby' => $orderby,
+                    'order' => $order,
+               );
+
+               if ( 'true' === $featured || true === $featured ) {
+                    $args['meta_key'] = 'lsx_featured';
+                    $args['meta_value'] = 1;
+               }
+          }
+
+          if ( ! empty( $role ) ) {
+               $args['tax_query'] = array(
+                    array(
+                         'taxonomy' => 'team_role',
+                         'field' => 'id',
+                         'terms' => $role,
+                    ),
+               );
+          }
+
+          $team = new \WP_Query( $args );
+
+          if ( $team->have_posts() ) {
+               global $post;
+
+               $count = 0;
+               $count_global = 0;
+
+               $column_size = intval( 12 / $columns );
+
+               $carousel = true === $carousel || 'true' === $carousel ? true : false;
+
+               if ( $carousel ) {
+                    $output .= "<div class='lsx-team-shortcode' id='lsx-team-slider' data-slick='{\"slidesToShow\": $columns, \"slidesToScroll\": $columns }'>";
+               } else {
+                    $output .= "<div class='lsx-team-shortcode'><div class='row'>";
+               }
+
+               while ( $team->have_posts() ) {
+                    $team->the_post();
+
+                    // Count
+                    $count++;
+                    $count_global++;
+
+                    $member_name = apply_filters( 'the_title', $post->post_title );
+                    $member_roles = '';
+                    $member_description = '';
+                    $member_avatar = '';
+                    $member_socials = '';
+                    $member_job_title = '';
+                    $member_email = '';
+                    $bottom_link = '';
+                    $facebook = get_post_meta( $post->ID, 'lsx_facebook', true );
+                    $twitter = get_post_meta( $post->ID, 'lsx_twitter', true );
+                    $linkedin = get_post_meta( $post->ID, 'lsx_linkedin', true );
+
+                    // Link to single
+                    if ( ( true === $show_link || 'true' === $show_link ) && ( empty( team_get_option( 'team_disable_single' ) ) ) ) {
+                         $bottom_link = '<a href="' . get_permalink( $post->ID ) . '" class="lsx-team-show-more">More about ' . strtok( $member_name, ' ' ) . '<i class="fa fa-long-arrow-right" aria-hidden="true"></i></a>';
+                    }
+
+                    if ( true === $show_email || 'true' === $show_email ) {
+                         $email = get_post_meta( $post->ID, 'lsx_email_contact', true );
+
+                         $member_email = '<a href="mailto:' . sanitize_email( $email ) . '" class="lsx-team-email">' . sanitize_email( $email ) . '</a>';
+                    }
+
+                    if ( ( true === $show_link || 'true' === $show_link ) && ( empty( team_get_option( 'team_disable_single' ) ) ) ) {
+                         $member_name = '<h5 class="lsx-team-name"><a href="' . get_permalink() . '">' . $member_name . '</a></h5>';
+                    } else {
+                         $member_name = '<h5 class="lsx-team-name">' . $member_name . '</h5>';
+                    }
+
+                    // Member roles
+                    if ( true === $show_roles || 'true' === $show_roles ) {
+                         $roles = '';
+                         $terms = get_the_terms( $post->ID, 'team_role' );
+
+                         if ( $terms && ! is_wp_error( $terms ) ) {
+                              $roles = array();
+
+                              foreach ( $terms as $term ) {
+                                   $roles[] = $term->name;
+                              }
+
+                              $roles = join( ', ', $roles );
+                         }
+
+                         $member_roles = '' !== $roles ? "<small class='lsx-team-roles'>$roles</small>" : '';
+                    }
+
+                    if ( true === $show_job_title || 'true' === $show_job_title ) {
+                         $job_title = get_post_meta( $post->ID, 'lsx_job_title', true );
+                         $member_job_title = ! empty( $job_title ) ? "<small class='lsx-team-job-title'>$job_title</small>" : '';
+                    }
+
+                    // Member description
+                    if ( true === $show_desc || 'true' === $show_desc ) {
+                         if ( 'full' === $display ) {
+                              $member_description = apply_filters( 'the_content', get_the_content( esc_html__( 'Read More', 'lsx-team' ) ) );
+                              $member_description = str_replace( ']]>', ']]&gt;', $member_description );
+                         } elseif ( 'excerpt' === $display ) {
+                              $member_description = apply_filters( 'the_excerpt', get_the_excerpt() );
+                         }
+
+                         $member_description = ! empty( $member_description ) ? "<div class='lsx-team-description'>$member_description</div>" : '';
+                    }
+
+                    // Member avatar
+                    if ( true === $show_image || 'true' === $show_image ) {
+                         $member_avatar = $this->get_thumbnail( $post->ID, $size );
+
+                         if ( ( true === $show_link || 'true' === $show_link ) && ( empty( $this->options['display'] ) || empty( team_get_option( 'team_disable_single' ) ) ) ) {
+                              $member_avatar = "<figure class='lsx-team-avatar'><a href='" . get_permalink() . "'>$member_avatar</a></figure>";
+                         } else {
+                              $member_avatar = "<figure class='lsx-team-avatar'>$member_avatar</figure>";
+                         }
+                    }
+
+                    // Member socials
+                    if ( true === $show_social || 'true' === $show_social ) {
+                         $links = array(
+                              'facebook' => $facebook,
+                              'twitter' => $twitter,
+                              'linkedin' => $linkedin,
+                         );
+
+                         foreach ( $links as $sm => $sm_link ) {
+                              if ( ! empty( $sm_link ) ) {
+                                   $member_socials .= "<li><a href='$sm_link' target='_blank'><i class='fa fa-$sm' aria-hidden='true'></i></a></li>";
+                              }
+                         }
+
+                         $member_socials = ! empty( $member_socials ) ? "<ul class='lsx-team-socials list-inline'>$member_socials</ul>" : '';
+                    }
+
+                    if ( ! $carousel ) {
+                         $output .= "<div class='col-xs-12 col-md-$column_size'>";
+                    }
+
+                    $output .= "
 					<div class='lsx-team-slot'>
 						$member_avatar
 						$member_name
@@ -284,28 +284,28 @@ 
 					</div>
 				";
 
-				if ( ! $carousel ) {
-					$output .= '</div>';
+                    if ( ! $carousel ) {
+                         $output .= '</div>';
 
-					if ( $count == $columns && $team->post_count > $count_global ) {
-						$output .= '</div>';
-						$output .= '<div class="row">';
-						$count = 0;
-					}
-				}
+                         if ( $count == $columns && $team->post_count > $count_global ) {
+                              $output .= '</div>';
+                              $output .= '<div class="row">';
+                              $count = 0;
+                         }
+                    }
 
-				wp_reset_postdata();
-			}
+                    wp_reset_postdata();
+               }
 
-			if ( ! $carousel ) {
-				$output .= '</div>';
-			}
+               if ( ! $carousel ) {
+                    $output .= '</div>';
+               }
 
-			$output .= '</div>';
+               $output .= '</div>';
 
-			return $output;
-		}
-	}
+               return $output;
+          }
+     }
 
 }