4.9.1 Release

Author: flschaves

all_in_one_seo_pack.php

@@ -5,7 +5,7 @@
  * Description: SEO for WordPress. Features like XML Sitemaps, SEO for custom post types, SEO for blogs, business sites, ecommerce sites, and much more. More than 100 million downloads since 2007.
  * Author:      All in One SEO Team
  * Author URI:  https://aioseo.com/
- * Version:     4.9.0
+ * Version:     4.9.1
  * Text Domain: all-in-one-seo-pack
  * Domain Path: /languages
  * License:     GPL-3.0+

app/AIOSEO.php

@@ -306,6 +306,7 @@ public function load() {
 			$this->thirdParty         = new Common\ThirdParty\ThirdParty();
 			$this->writingAssistant   = new Common\WritingAssistant\WritingAssistant();
 			$this->llms               = $this->pro ? new Pro\Llms\Llms() : new Common\Llms\Llms();
+			$this->redirects          = $this->pro ? new Pro\Redirects\Redirects() : null;
 
 			if ( ! wp_doing_ajax() && ! wp_doing_cron() ) {
 				$this->rss       = new Common\Rss();

app/AIOSEOAbstract.php

@@ -616,4 +616,13 @@ abstract class AIOSEOAbstract {
 	 * @var \AIOSEO\Plugin\Common\Llms\Llms|\AIOSEO\Plugin\Pro\Llms\Llms
 	 */
 	public $llms = null;
+
+	/**
+	 * Redirects class instance.
+	 *
+	 * @since 4.9.1
+	 *
+	 * @var \AIOSEO\Plugin\Pro\Redirects\Redirects
+	 */
+	public $redirects = null;
 }

app/Common/Admin/Admin.php

@@ -204,7 +204,6 @@ public function init() {
 	 * @return void
 	 */
 	public function setPages() {
-		// TODO: Remove this after a couple months.
 		$newIndicator = '<span class="aioseo-menu-new-indicator">&nbsp;NEW!</span>';
 
 		$this->pages = [
@@ -239,6 +238,11 @@ public function setPages() {
 				'menu_title' => esc_html__( 'Redirects', 'all-in-one-seo-pack' ),
 				'parent'     => $this->pageSlug
 			],
+			'aioseo-ai-insights'       => [
+				'menu_title' => esc_html__( 'AI Insights', 'all-in-one-seo-pack' ) . $newIndicator,
+				'page_title' => esc_html__( 'AI Insights', 'all-in-one-seo-pack' ),
+				'parent'     => $this->pageSlug
+			],
 			'aioseo-local-seo'         => [
 				'menu_title' => esc_html__( 'Local SEO', 'all-in-one-seo-pack' ),
 				'parent'     => $this->pageSlug
@@ -248,8 +252,7 @@ public function setPages() {
 				'parent'     => $this->pageSlug
 			],
 			'aioseo-search-statistics' => [
-				'menu_title' => esc_html__( 'Search Statistics', 'all-in-one-seo-pack' ) . $newIndicator,
-				'page_title' => esc_html__( 'Search Statistics', 'all-in-one-seo-pack' ),
+				'menu_title' => esc_html__( 'Search Statistics', 'all-in-one-seo-pack' ),
 				'parent'     => $this->pageSlug
 			],
 			'aioseo-tools'             => [
@@ -844,6 +847,7 @@ public function hooks() {
 			'sitemaps',
 			'link-assistant',
 			'redirects',
+			'ai-insights',
 			'local-seo',
 			'seo-analysis',
 			'search-statistics',
@@ -1194,11 +1198,11 @@ public function appendTrashedMessage( $messages ) {
 			return $messages;
 		}
 
-		if ( function_exists( 'aioseoRedirects' ) && aioseoRedirects()->options->monitor->trash ) {
+		if ( ! empty( aioseo()->redirects->options ) && aioseo()->redirects->options->monitor->trash ) {
 			return $messages;
 		}
 
-		if ( empty( $_GET['ids'] ) ) { // phpcs:ignore HM.Security.NonceVerification.Recommended, WordPress.Security.NonceVerification.Recommended  
+		if ( empty( $_GET['ids'] ) ) { // phpcs:ignore HM.Security.NonceVerification.Recommended, WordPress.Security.NonceVerification.Recommended
 			return $messages;
 		}
 

app/Common/Admin/Notices/ConflictingPlugins.php

@@ -30,12 +30,13 @@ public function __construct() {
 	 * @return void
 	 */
 	public function maybeShowNotice() {
-		$dismissed = get_option( '_aioseo_conflicting_plugins_dismissed', true );
+		$userId    = get_current_user_id();
+		$dismissed = get_user_meta( $userId, '_aioseo_conflicting_plugins_dismissed', true );
 		if ( '1' === $dismissed ) {
 			return;
 		}
 
-		if ( ! current_user_can( 'activate_plugins' ) ) {
+		if ( ! current_user_can( 'deactivate_plugins' ) ) {
 			return;
 		}
 
@@ -168,7 +169,8 @@ public function dismissNotice() {
 
 		check_ajax_referer( 'aioseo-dismiss-conflicting-plugins', 'nonce' );
 
-		update_option( '_aioseo_conflicting_plugins_dismissed', true );
+		$userId = get_current_user_id();
+		update_user_meta( $userId, '_aioseo_conflicting_plugins_dismissed', true );
 
 		return wp_send_json_success();
 	}

app/Common/Admin/Notices/WpNotices.php

@@ -251,6 +251,10 @@ public function adminNotices() {
 		}
 
 		$notices = $this->getNoticesInContext();
+		$notices = array_filter( $notices, function( $notice ) {
+			return is_array( $notice );
+		} );
+
 		foreach ( $notices as $notice ) {
 			// Hide snackbar notices on classic editor.
 			if ( ! empty( $notice['options']['type'] ) && 'snackbar' === $notice['options']['type'] ) {
@@ -270,8 +274,8 @@ class="notice notice-<?php echo esc_attr( $status ) ?> <?php echo esc_attr( $cla
 						if ( ! empty( $action['url'] ) ) {
 							$class  = ! empty( $action['class'] ) ? $action['class'] : '';
 							$target = ! empty( $action['target'] ) ? $action['target'] : '';
-							echo '<a 
-								href="' . esc_attr( $action['url'] ) . '" 
+							echo '<a
+								href="' . esc_attr( $action['url'] ) . '"
 								class="' . esc_attr( $class ) . '"
 								target="' . esc_attr( $target ) . '"
 							>';

app/Common/Admin/SlugMonitor.php

@@ -119,18 +119,11 @@ public function postUpdated( $postId, $post = null, $postBefore = null ) {
 
 		// Default notice redirecting to the Redirects screen.
 		$action = [
-			'url'    => $redirectUrl,
-			'label'  => __( 'Add Redirect to improve SEO', 'all-in-one-seo-pack' ),
-			'target' => '_blank',
-			'class'  => 'aioseo-redirects-slug-changed'
+			'url'   => $redirectUrl,
+			'label' => __( 'Add Redirect to improve SEO', 'all-in-one-seo-pack' ),
+			'class' => 'aioseo-redirects-slug-changed'
 		];
 
-		// If redirects is active we'll show add-redirect in a modal.
-		if ( aioseo()->addons->getLoadedAddon( 'redirects' ) ) {
-			// We need to remove the target here so the action keeps the url used by the add-redirect modal.
-			unset( $action['target'] );
-		}
-
 		aioseo()->wpNotices->addNotice( $message, 'warning', [ 'actions' => [ $action ] ], [ 'posts' ] );
 	}
 
@@ -173,11 +166,11 @@ private function canMonitorPost( $post, $postBefore ) {
 	 * @return bool             True if an automatic redirect was added.
 	 */
 	private function automaticRedirect( $postType, $before, $after ) {
-		if ( ! aioseo()->addons->getLoadedAddon( 'redirects' ) ) {
+		if ( empty( aioseo()->redirects->isActive ) ) {
 			return false;
 		}
 
-		return aioseoRedirects()->monitor->automaticRedirect( $postType, $before, $after );
+		return aioseo()->redirects->monitor->automaticRedirect( $postType, $before, $after );
 	}
 
 	/**
@@ -189,10 +182,10 @@ private function automaticRedirect( $postType, $before, $after ) {
 	 * @return string       The redirect link.
 	 */
 	public function manualRedirectUrl( $urls ) {
-		if ( ! aioseo()->addons->getLoadedAddon( 'redirects' ) ) {
+		if ( empty( aioseo()->redirects->isActive ) ) {
 			return admin_url( 'admin.php?page=aioseo-redirects' );
 		}
 
-		return aioseoRedirects()->helpers->manualRedirectUrl( $urls );
+		return aioseo()->redirects->helpers->manualRedirectUrl( $urls );
 	}
 }

app/Common/Admin/Usage.php

@@ -46,6 +46,8 @@ abstract public function getType();
 	 */
 	public function __construct() {
 		add_action( 'init', [ $this, 'init' ], 2 );
+
+		add_action( 'aioseo_send_usage_data', [ $this, 'process' ] );
 	}
 
 	/**
@@ -64,9 +66,6 @@ public function init() {
 				return;
 			}
 
-			// Register the action handler.
-			add_action( $action, [ $this, 'process' ] );
-
 			if ( ! as_next_scheduled_action( $action ) ) {
 				as_schedule_recurring_action( $this->generateStartDate(), WEEK_IN_SECONDS, $action, [], 'aioseo' );
 

app/Common/Ai/Ai.php

@@ -13,6 +13,15 @@
  * @since 4.8.4
  */
 class Ai {
+	/**
+	 * The assistant class.
+	 *
+	 * @since 4.9.1
+	 *
+	 * @var Assistant|null
+	 */
+	public $assistant = null;
+
 	/**
 	 * The image class.
 	 *
@@ -41,6 +50,15 @@ class Ai {
 	 */
 	private $aiGeneratorApiUrl = 'https://ai-generator.aioseo.com/v1/';
 
+	/**
+	 * The action name for getting the access token.
+	 *
+	 * @since 4.9.1
+	 *
+	 * @var string
+	 */
+	protected $getAccessTokenAction = 'aioseo_ai_get_access_token';
+
 	/**
 	 * The action name for fetching credits.
 	 *
@@ -56,9 +74,10 @@ class Ai {
 	 * @since 4.8.4
 	 */
 	public function __construct() {
-		add_action( 'init', [ $this, 'getAccessToken' ] );
-
+		add_action( 'init', [ $this, 'scheduleGetAccessToken' ] );
 		add_action( 'init', [ $this, 'scheduleCreditFetchAction' ] );
+
+		add_action( $this->getAccessTokenAction, [ $this, 'getAccessToken' ] );
 		add_action( $this->creditFetchAction, [ $this, 'updateCredits' ] );
 
 		// If param is set, fetch credits but just once per 5 minutes to prevent abuse.
@@ -71,7 +90,25 @@ public function __construct() {
 			aioseo()->core->cache->update( 'ai_get_credits', true, 5 * MINUTE_IN_SECONDS );
 		}
 
-		$this->image = new Image();
+		$this->assistant = new Assistant();
+		$this->image     = new Image();
+	}
+
+	/**
+	 * Schedules the initial access token fetch action if no access token is set.
+	 *
+	 * @since 4.9.1
+	 *
+	 * @return void
+	 */
+	public function scheduleGetAccessToken() {
+		if ( aioseo()->internalOptions->internal->ai->accessToken ) {
+			return;
+		}
+
+		if ( ! aioseo()->actionScheduler->isScheduled( $this->getAccessTokenAction ) ) {
+			aioseo()->actionScheduler->scheduleSingle( $this->getAccessTokenAction, 0, [], true );
+		}
 	}
 
 	/**
@@ -219,6 +256,10 @@ public function updateCredits( $refresh = false ) {
 		} else {
 			aioseo()->internalOptions->internal->ai->credits->license->reset();
 		}
+
+		if ( ! empty( $data->costPerFeature ) ) {
+			aioseo()->internalOptions->internal->ai->costPerFeature = json_decode( wp_json_encode( $data->costPerFeature ), true );
+		}
 	}
 
 	/**

app/Common/Ai/Assistant.php

@@ -0,0 +1,32 @@
+<?php
+namespace AIOSEO\Plugin\Common\Ai;
+
+// Exit if accessed directly.
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * AI Assistant handler for managing AI Assistant blocks.
+ *
+ * @since 4.9.1
+ */
+class Assistant {
+	/**
+	 * Returns the data for Vue.
+	 *
+	 * @since 4.9.1
+	 *
+	 * @param  int|null $objectId The object ID.
+	 * @return array              The data.
+	 */
+	public function getVueDataEdit( $objectId = null ) {
+		$objectId = $objectId ?: absint( get_the_ID() );
+
+		return [
+			'extend' => [
+				'blockEditorInserterButton' => apply_filters( 'aioseo_ai_assistant_extend_block_editor_inserter_button', true, $objectId ),
+			]
+		];
+	}
+}