Merge pull request #774 from bluehost/release/3.5.1

Release/3.5.1

bluehost-wordpress-plugin.php

@@ -12,7 +12,7 @@
  * Plugin URI:        https://bluehost.com
  * Update URI:        https://github.com/bluehost/bluehost-wordpress-plugin
  * Description:       WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features.
- * Version:           3.5.0
+ * Version:           3.5.1
  * Requires at least: 6.0
  * Requires PHP:      7.1
  * Tested up to:      6.3.2
@@ -32,7 +32,7 @@
 }
 
 // Define constants
-define( 'BLUEHOST_PLUGIN_VERSION', '3.5.0' );
+define( 'BLUEHOST_PLUGIN_VERSION', '3.5.1' );
 define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
 define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );

bootstrap.php

@@ -24,50 +24,6 @@
 	return;
 }
 
-/**
- * Check if platform is Jarvis
- *
- * @return bool
- */
-function bluehost_is_jarvis() {
-	$is_jarvis = false;
-	$host      = array(
-		'dirs'      => explode( '/', ABSPATH ),
-		'user'      => get_current_user(),
-		'homedir'   => null,
-		'info_file' => null,
-	);
-
-	// Build host's home directory
-	foreach ( $host['dirs'] as $dir ) {
-		if ( ! empty( $dir ) ) {
-			$host['homedir'] = $host['homedir'] . '/' . $dir;
-
-			if ( $dir === $host['user'] ) {
-				break;
-			}
-		}
-	}
-
-	// Check for Jarvis .host-info file
-	if ( file_exists( $host['homedir'] . '/.host-info' ) ) {
-		$host['info_file'] = file_get_contents( $host['homedir'] . '/.host-info' );
-	}
-
-	// Check for Jarvis platform
-	if (
-		null !== $host['info_file']
-		&& (
-			false !== stripos( $host['info_file'], 'platform = jarvis' )
-			|| false !== stripos( $host['info_file'], 'platform=jarvis' )
-		)
-	) {
-		$is_jarvis = true;
-	}
-
-	return $is_jarvis;
-}
-
 /*
  * Initialize coming soon module via container
  */
@@ -100,15 +56,6 @@ function () {
 	'bluehost'
 );
 
-$bluehost_module_container->set(
-	'isJarvis',
-	$bluehost_module_container->computed(
-		function () {
-			return bluehost_is_jarvis();
-		}
-	)
-);
-
 // properly get branding links depending on market
 $wordpress_hosting_page = ( get_option( 'mm_brand' ) === 'Bluehost_India' ) ? 'https://www.bluehost.in?utm_source=coming-soon-template&utm_medium=bluehost_plugin' : 'https://bluehost.com?utm_source=coming-soon-template&utm_medium=bluehost_plugin';
 $my_panel               = ( get_option( 'mm_brand' ) === 'Bluehost_India' ) ? 'https://my.bluehost.in/web-hosting/cplogin' : 'https://my.bluehost.com/web-hosting/cplogin';
@@ -199,7 +146,6 @@ function () {
 require BLUEHOST_PLUGIN_DIR . '/inc/jetpack.php';
 require BLUEHOST_PLUGIN_DIR . '/inc/LoginRedirect.php';
 require BLUEHOST_PLUGIN_DIR . '/inc/partners.php';
-require BLUEHOST_PLUGIN_DIR . '/inc/performance.php';
 require BLUEHOST_PLUGIN_DIR . '/inc/RestApi/CachingController.php';
 require BLUEHOST_PLUGIN_DIR . '/inc/RestApi/SettingsController.php';
 require BLUEHOST_PLUGIN_DIR . '/inc/RestApi/rest-api.php';

composer.json

@@ -62,14 +62,14 @@
     "newfold-labs/wp-module-data": "^2.4.9",
     "newfold-labs/wp-module-deactivation": "^1.0.2",
     "newfold-labs/wp-module-ecommerce": "^1.3.5",
-    "newfold-labs/wp-module-global-ctb": "^1.0.7",
+    "newfold-labs/wp-module-global-ctb": "^1.0.8",
     "newfold-labs/wp-module-help-center": "1.0.21",
     "newfold-labs/wp-module-loader": "^1.0.10",
     "newfold-labs/wp-module-marketplace": "^2.0.2",
     "newfold-labs/wp-module-notifications": "^1.1.6",
     "newfold-labs/wp-module-onboarding": "^1.11.5",
     "newfold-labs/wp-module-patterns": "^0.1.8",
-    "newfold-labs/wp-module-performance": "^1.2.1",
+    "newfold-labs/wp-module-performance": "^1.2.2",
     "newfold-labs/wp-module-runtime": "^1.0.7",
     "newfold-labs/wp-module-secure-passwords": "^1.1",
     "newfold-labs/wp-module-sso": "^1.0.4",

inc/Data.php

@@ -22,7 +22,6 @@ public static function runtime() {
 		global $bluehost_module_container;
 
 		$runtime = array(
-			'isJarvis' => $bluehost_module_container->get('isJarvis'),
 			'plugin'   => array(
 				'url'     => BLUEHOST_BUILD_URL,
 				'version' => BLUEHOST_PLUGIN_VERSION,