Merge pull request #109 from lightspeedwp/2.0.0

2.0.0 Updates

Author: krugazul

README.md

@@ -1,10 +1,10 @@
-<p align="center"><a target="_blank" href="https://www.lsdev.biz/lsx/extensions/tour-operator/team/"><img src="https://www.lsdev.biz/lsx/wp-content/uploads/2020/09/tour-operator-team-banner-1544x500-1.jpg" alt="LSX Tour Operator Team Extension"></a>
+<p align="center"><a target="_blank" href="https://touroperator.solutions/plugins/team/"><img src="https://www.lightspeedwp.agency/lsx/wp-content/uploads/2020/09/tour-operator-team-banner-1544x500-1.jpg" alt="Tour Operator Team Extension"></a>
 </p>
-<h1 align="center">LSX Tour Operator Team Extension</h1>
+<h1 align="center">Tour Operator Team Extension</h1>
 
 <p align="center">
-    <a href="https://lsdev.biz/lsx/"><img src="https://www.lsdev.biz/lsx/wp-content/uploads/2019/06/Designed-for-LSX-Theme-blue.png" alt="Made for LSX Theme"></a>
-    <a href="https://lsdev.biz/lsx/extensions/tour-operator/"><img src="https://www.lsdev.biz/lsx/wp-content/uploads/2019/06/Designed-for-Tour-Operator-plugin-1098ad.png" alt="LSX Tour Operator"></a>
+    <a href="https://lsx.design/"><img src="https://www.lightspeedwp.agency/lsx/wp-content/uploads/2019/06/Designed-for-LSX-Theme-blue.png" alt="Made for LSX Theme"></a>
+    <a href="https://lsdev.biz/lsx/extensions/tour-operator/"><img src="https://www.lightspeedwp.agency/lsx/wp-content/uploads/2019/06/Designed-for-Tour-Operator-plugin-1098ad.png" alt="Tour Operator"></a>
     <a href="https://www.gnu.org/licenses/gpl-3.0.en.html"><img src="https://poser.pugx.org/woocommerce/woocommerce/license" alt="license"></a>
     <a href="http://gulpjs.com/"><img src="https://img.shields.io/badge/built%20with-gulp.js-green.svg" alt="Built with gulp.js"></a> 
 </p>  
@@ -14,25 +14,25 @@
     <a href="https://travis-ci.org/github/lightspeeddevelopment/to-team"><img src="https://travis-ci.org/lightspeeddevelopment/to-team.svg?branch=master" alt="Build Status"></a>
 </p>
 
-Welcome to the [LSX Tour Operator Team extension](https://www.lsdev.biz/lsx/extensions/tour-operator/team/).
+Welcome to the [Tour Operator Team extension](https://touroperator.solutions/plugins/team/).
 
-If you haven't yet had the chance to [install and configure the Tour Operator Plugin](https://www.lsdev.biz/lsx/extensions/tour-operator/), you should do that before proceeding here! 
+If you haven't yet had the chance to [install and configure the Tour Operator Plugin](https://touroperator.solutions/), you should do that before proceeding here! 
 
 People like to see a face behind a business, it gives you a more personal, approachable relationship with your users.
 
 The to Team plugin allows you to display your team profiles beautifully on your website.
 
 ## Works with the LSX Theme
 
-The [Tour Operator Plugin](https://tour-operator.lsdev.biz) and [Extensions](https://www.lsdev.biz/lsx/extensions/tour-operator/team/) are designed to work seamlessly with the LSX theme. 
+The [Tour Operator Plugin](https://touroperator.solutions/) and [Extensions](https://touroperator.solutions/plugins/team/) are designed to work seamlessly with the LSX theme. 
 
 We are always updating our software to add functionality, and maintain latest security protocols. 
 
 ## Gutenberg Compatible 
 
 Have you updated to the new WordPress Gutenberg editor? We've got you covered! The Tour Operator Team Plugin has been optimized for the Gutenberg update. 
 
-Check out our [Tour Operator dedicated website](https://tour-operator.lsdev.biz/) to check out all our available extensions and features.
+Check out our [Tour Operator dedicated website](https://touroperator.solutions/) to check out all our available extensions and features.
 
 ## It's free, and always will be.
 We’re firm believers in open source - that’s why this extension is free, and that won't change. 
@@ -41,15 +41,15 @@ We are constantly maintaining and updating our extension so you have the latest
 
 ## Documentation
 
-Anything you need to double check, or simply need a walkthrough for setting up the extension? Visit the [Tour Operator Team documentation](https://lsdev.biz/lsx/documentation/lsx-tour-operator/team/).
+Anything you need to double check, or simply need a walkthrough for setting up the extension? Visit the [Tour Operator Team documentation](https://touroperator.solutions/docs/team/).
 
 ## Support
 
-We offer premium support for this plugin. Premium support that can be purchased [via our website](https://www.lsdev.biz/services/support/).
+We offer premium support for this plugin. Premium support that can be purchased [via our website](https://touroperator.solutions/support/).
 
 If you are experiencing issues with the Tour Operator Team Plugin & have experience with Github, please log any bug issues you are having on the [Tour Operator Team Github Issues](https://github.com/lightspeeddevelopment/to-team/issues/) page.
 
-You can also send an email to our Support Team at [support@lsdev.biz](mailto:support@lsdev.biz) if you have a request for the LightSpeed Development team.
+You can also send an email to our Support Team at [support@lightspeedwp.agency](mailto:support@lightspeedwp.agency) if you have a request for the LightSpeed Development team.
 
 ## Contributing
 
@@ -61,11 +61,11 @@ Visit the [Tour Operator Team Plugin on Github](https://github.com/lightspeeddev
 
 ---
 <p align="center">
-  <a href="https://www.lsdev.biz/contact/"><img src="https://www.lsdev.biz/wp-content/uploads/2020/02/work-with-lightspeed.png" width="850" alt="Work with us at LightSpeed"></a>
+  <a href="https://lightspeedwp.agency/contact/"><img src="https://lightspeedwp.agency/wp-content/uploads/2020/02/work-with-lightspeed.png" width="850" alt="Work with us at LightSpeed"></a>
 </p>
 <p align="center">
-  <a href="https://www.lsdev.biz">LightSpeed's Company Website</a> &nbsp;&middot;&nbsp;
-  <a href="https://www.lsdev.biz/lsx/">LSX Product Website</a>
+  <a href="https://lightspeedwp.agency/">LightSpeed's Company Website</a> &nbsp;&middot;&nbsp;
+  <a href="https://lsx.design/">LSX Design Product Website</a>
 </p>
 <p align="center">
   <a href="https://github.com/lightspeeddevelopment">GitHub</a> &nbsp;&middot;&nbsp;

changelog.txt renamed to changelog.md

@@ -1,5 +1,24 @@
 # Change log
 
+## [[2.0.0]](https://github.com/lightspeeddevelopment/to-reviews/releases/tag/2.0.0) - 2025-05-09
+
+### Description
+The following PR contains the code for the block updates and the removal of the legacy code.
+
+### Added
+- WordPress block editor support
+- Tour Operator 2.0 Support.
+
+### Updated
+- Custom fields to CMB2 and its add-ons.
+- WPCS warnings notices fixed.
+
+### Removed
+- Old PHP Templates, function and legacy template code.
+
+### Security
+- Tested with WordPress 6.8.1
+
 ## [[1.2.7]](https://github.com/lightspeeddevelopment/to-team/releases/tag/1.2.7) - 2023-08-09
 
 ### Security

classes/class-lsx-to-team-admin.php

@@ -17,16 +17,23 @@
  */
 class LSX_TO_Team_Admin extends LSX_TO_Team {
 
+	/**
+	 * The post type slug
+	 *
+	 * @var string
+	 */
+	public $post_type = 'team';
+
 	/**
 	 * Constructor
 	 */
 	public function __construct() {
 		$this->set_vars();
 
 		add_action( 'init', array( $this, 'init' ), 20 );
+		add_action( 'init', array( $this, 'register_post_type' ), 100 );
+		add_action( 'cmb2_admin_init', array( $this, 'register_cmb2_fields' ) );
 
-		add_filter( 'lsx_get_post-types_configs', array( $this, 'post_type_config' ), 10, 1 );
-		add_filter( 'lsx_get_metaboxes_configs', array( $this, 'meta_box_config' ), 10, 1 );
 		add_filter( 'lsx_get_taxonomies_configs', array( $this, 'taxonomy_config' ), 10, 1 );
 
 		add_filter( 'lsx_to_destination_custom_fields', array( $this, 'custom_fields' ) );
@@ -36,30 +43,6 @@ public function __construct() {
 		add_filter( 'lsx_to_special_custom_fields', array( $this, 'custom_fields' ) );
 		add_filter( 'lsx_to_review_custom_fields', array( $this, 'custom_fields' ) );
 		add_filter( 'lsx_to_activity_custom_fields', array( $this, 'custom_fields' ) );
-
-		add_filter( 'lsx_to_taxonomies', array( $this, 'to_register_taxonomy' ), 10, 1 );
-		add_filter( 'lsx_to_framework_taxonomies', array( $this, 'to_register_taxonomy' ), 10, 1 );
-		add_filter( 'lsx_to_framework_taxonomies_plural', array( $this, 'to_register_taxonomy_plural' ), 10, 1 );
-	}
-
-	/**
-	 * Register the taxonomy with the TO plugin
-	 *
-	 * @since 0.1.0
-	 */
-	public function to_register_taxonomy( $taxonomies ) {
-		$taxonomies['role'] = esc_attr__( 'Role', 'to-team' );
-		return $taxonomies;
-	}
-
-	/**
-	 * Register the taxonomy with the TO plugin
-	 *
-	 * @since 0.1.0
-	 */
-	public function to_register_taxonomy_plural( $taxonomies ) {
-		$taxonomies['role'] = esc_attr__( 'Roles', 'to-team' );
-		return $taxonomies;
 	}
 
 	/**
@@ -72,8 +55,6 @@ public function init() {
 			$this->taxonomies = array_keys( lsx_to_get_taxonomies() );
 		}
 
-		add_filter( 'lsx_to_taxonomy_widget_taxonomies', array( $this, 'widget_taxonomies' ), 10, 1 );
-
 		if ( false !== $this->taxonomies ) {
 			add_action( 'create_term', array( $this, 'save_meta' ), 10, 2 );
 			add_action( 'edit_term', array( $this, 'save_meta' ), 10, 2 );
@@ -82,41 +63,18 @@ public function init() {
 				add_action( "{$taxonomy}_edit_form_fields", array( $this, 'add_expert_form_field' ), 3, 1 );
 			}
 		}
-
-		add_action( 'lsx_to_framework_team_tab_content', array( $this, 'general_settings' ), 10, 2 );
-		add_action( 'lsx_to_framework_team_tab_content', array( $this, 'archive_settings' ), 10, 2 );
-	}
-
-	/**
-	 * Register the activity post type config
-	 *
-	 * @param  $objects
-	 * @return   array
-	 */
-	public function post_type_config( $objects ) {
-		foreach ( $this->post_types as $key => $label ) {
-			if ( file_exists( LSX_TO_TEAM_PATH . 'includes/post-types/config-' . $key . '.php' ) ) {
-				$objects[ $key ] = include LSX_TO_TEAM_PATH . 'includes/post-types/config-' . $key . '.php';
-			}
-		}
-
-		return	$objects;
 	}
 
 	/**
-	 * Register the activity metabox config
+	 * Registers the custom post type for the content model.
 	 *
-	 * @param  $meta_boxes
-	 * @return   array
+	 * @return void
 	 */
-	public function meta_box_config( $meta_boxes ) {
-		foreach ( $this->post_types as $key => $label ) {
-			if ( file_exists( LSX_TO_TEAM_PATH . 'includes/metaboxes/config-' . $key . '.php' ) ) {
-				$meta_boxes[ $key ] = include LSX_TO_TEAM_PATH . 'includes/metaboxes/config-' . $key . '.php';
-			}
-		}
-
-		return 	$meta_boxes;
+	public function register_post_type() {
+		register_post_type(
+			'team',
+			require_once LSX_TO_TEAM_PATH . '/includes/post-types/config-' . $this->post_type . '.php'
+		);
 	}
 
 	/**
@@ -139,6 +97,7 @@ public function taxonomy_config( $taxonomies ) {
 	public function custom_fields( $fields ) {
 		global $post, $typenow, $current_screen;
 
+		// @phpcs:disable WordPress.Security.NonceVerification.Recommended
 		if ( $post && $post->post_type ) {
 			$post_type = $post->post_type;
 		} elseif ( $typenow ) {
@@ -152,30 +111,19 @@ public function custom_fields( $fields ) {
 		} else {
 			$post_type = false;
 		}
+		// @phpcs:enable WordPress.Security.NonceVerification.Recommended
 
 		if ( false !== $post_type ) {
-			$fields[] = array(
-				'id' => 'team_title',
-				'name' => 'Teams',
-				'type' => 'title',
-				'cols' => 12,
-			);
-
 			$fields[] = array(
 				'id' => 'team_to_' . $post_type,
 				'name' => 'Team members related to this ' . $post_type,
-				'type' => 'post_select',
+				'type' => 'pw_multiselect',
 				'use_ajax' => false,
-				'query' => array(
-					'post_type' => 'team',
-					'nopagin' => true,
-					'posts_per_page' => '-1',
-					'orderby' => 'title',
-					'order' => 'ASC',
-				),
-				'repeatable' => true,
+				'repeatable' => false,
 				'allow_none' => true,
-				'cols' => 12,
+				'options'  => array(
+					'post_type_args' => 'team',
+				),
 			);
 		}
 
@@ -253,65 +201,51 @@ public function save_meta( $term_id = 0, $taxonomy = '' ) {
 	}
 
 	/**
-	 * Adds the team specific options
+	 * Registers the CMB2 custom fields
+	 *
+	 * @return void
 	 */
-	public function general_settings( $post_type = false, $tab = false ) {
-		if ( 'general' !== $tab ) {
-			return false;
-		}
+	public function register_cmb2_fields() {
+		/**
+		 * Initiate the metabox
+		 */
+		$cmb = [];
+		$fields = include( LSX_TO_TEAM_PATH . 'includes/metaboxes/config-' . $this->post_type . '.php' );
+
+		$metabox_counter = 1;
+		$cmb[ $metabox_counter ] = new_cmb2_box( array(
+			'id'            => 'lsx_to_metabox_' . $this->post_type . '_' . $metabox_counter,
+			'title'         => $fields['title'],
+			'object_types'  => array( $this->post_type ), // Post type
+			'context'       => 'normal',
+			'priority'      => 'high',
+			'show_names'    => true,
+		) );
+
+		foreach ( $fields['fields'] as $field ) {
+
+			if ( 'title' === $field['type'] ) {
+				$metabox_counter++;
+				$cmb[ $metabox_counter ] = new_cmb2_box( array(
+					'id'            => 'lsx_to_metabox_' . $this->post_type . '_' . $metabox_counter,
+					'title'         => $field['name'],
+					'object_types'  => array( $this->post_type ), // Post type
+					'context'       => 'normal',
+					'priority'      => 'high',
+					'show_names'    => true,
+				) );
+				continue;
+			}
 
-		$experts = get_posts(
-			array(
-				'post_type' => 'team',
-				'posts_per_page' => -1,
-				'orderby' => 'menu_order',
-				'order' => 'ASC',
-			)
-		);
-		?>
-		<tr class="form-field">
-			<th scope="row">
-				<label for="disable_team_panel"><?php esc_html_e( 'Disable Team Panel', 'to-team' ); ?></label>
-			</th>
-			<td>
-				<input type="checkbox" {{#if disable_team_panel}} checked="checked" {{/if}} name="disable_team_panel" />
-				<small><?php esc_html_e( 'This disables the team member panel on all post types.', 'to-team' ); ?></small>
-			</td>
-		</tr>
-		<tr class="form-field-wrap">
-			<th scope="row">
-				<label> Select your consultants</label>
-			</th>
-			<td>
-				<?php foreach ( $experts as $expert ) : ?>
-					<label for="expert-<?php echo esc_attr( $expert->ID ) ?>">
-						<input type="checkbox" {{#if expert-<?php echo esc_attr( $expert->ID ) ?>}} checked="checked" {{/if}} name="expert-<?php echo esc_attr( $expert->ID ) ?>" id="expert-<?php echo esc_attr( $expert->ID ) ?>" value="<?php echo esc_attr( $expert->ID ) ?>" /> <?php echo esc_html( $expert->post_title ) ?>
-					</label>
-					<br>
-				<?php endforeach ?>
-			</td>
-		</tr>
-		<?php
-	}
+			/**
+			 * Fixes for the extensions
+			 */
+			if ( 'post_select' === $field['type'] || 'post_ajax_search' === $field['type'] ) {
+				$field['type'] = 'pw_multiselect';
+			}
 
-	/**
-	 * Adds the team specific options
-	 */
-	public function archive_settings( $post_type = false, $tab = false ) {
-		if ( 'archives' !== $tab ) {
-			return false;
+			$cmb[ $metabox_counter ]->add_field( $field );
 		}
-		?>
-		<tr class="form-field">
-			<th scope="row">
-				<label for="group_items_by_role"><?php esc_html_e( 'Group by Role', 'to-team' ); ?></label>
-			</th>
-			<td>
-				<input type="checkbox" {{#if group_items_by_role}} checked="checked" {{/if}} name="group_items_by_role" />
-				<small><?php esc_html_e( 'This groups archive items by role taxonomy and display the role title.', 'to-team' ); ?></small>
-			</td>
-		</tr>
-		<?php
 	}
 }