Merge branch 'develop' into filip/delete-redirect-meta

ilicfilip · web-flow · commit dd2c40810325 · 2025-12-16T08:31:38.000+01:00
diff --git a/classes/admin/widgets/class-challenge.php b/classes/admin/widgets/class-challenge.php
@@ -90,7 +90,7 @@ public function get_cache_key() {
 	public function get_remote_api_url() {
 		return \add_query_arg(
 			[
-				'license_key' => \get_option( 'progress_planner_license_key' ),
+				'license_key' => \progress_planner()->get_license_key(),
 				'site'        => \get_site_url(),
 			],
 			\progress_planner()->get_remote_server_root_url() . '/wp-json/progress-planner-saas/v1/challenges'
diff --git a/classes/class-base.php b/classes/class-base.php
@@ -98,6 +98,14 @@ public function init() {
 			$this->get_utils__playground();
 		}
 
+		$prpl_license_key = $this->get_license_key();
+		if ( ! $prpl_license_key && 0 !== (int) \progress_planner()->get_ui__branding()->get_branding_id() ) {
+			$prpl_license_key = \progress_planner()->get_utils__onboard()->make_remote_onboarding_request();
+			if ( '' !== $prpl_license_key ) {
+				\update_option( 'progress_planner_license_key', $prpl_license_key, false );
+			}
+		}
+
 		// Basic classes.
 		if ( \is_admin() && \current_user_can( 'edit_others_posts' ) ) {
 			$this->get_admin__page();
@@ -301,7 +309,16 @@ public function get_activation_date() {
 	 * @return bool
 	 */
 	public function is_privacy_policy_accepted() {
-		return false !== \get_option( 'progress_planner_license_key', false );
+		return false !== $this->get_license_key();
+	}
+
+	/**
+	 * Get the license key.
+	 *
+	 * @return string|false
+	 */
+	public function get_license_key() {
+		return \get_option( 'progress_planner_license_key', false );
 	}
 
 	/**
diff --git a/classes/class-lessons.php b/classes/class-lessons.php
@@ -57,7 +57,7 @@ public function get_remote_api_items() {
 		$url = \add_query_arg(
 			[
 				'site'        => \get_site_url(),
-				'license_key' => \get_option( 'progress_planner_license_key' ),
+				'license_key' => \progress_planner()->get_license_key(),
 			],
 			$url
 		);
diff --git a/classes/rest/class-base.php b/classes/rest/class-base.php
@@ -86,7 +86,7 @@ public function validate_token( $token ) {
 			return true;
 		}
 
-		$license_key = \get_option( 'progress_planner_license_key', false );
+		$license_key = \progress_planner()->get_license_key();
 		if ( ! $license_key || 'no-license' === $license_key ) {
 			// Increment failed attempts counter.
 			\set_transient( $rate_limit_key, $failed_attempts + 1, HOUR_IN_SECONDS );
diff --git a/classes/utils/class-debug-tools.php b/classes/utils/class-debug-tools.php
@@ -515,7 +515,7 @@ protected function add_more_info_submenu_item( $admin_bar ) {
 		);
 
 		// Free license info.
-		$prpl_free_license_key = \get_option( 'progress_planner_license_key', false );
+		$prpl_free_license_key = \progress_planner()->get_license_key();
 		$admin_bar->add_node(
 			[
 				'id'     => 'prpl-free-license',
diff --git a/classes/utils/class-onboard.php b/classes/utils/class-onboard.php
@@ -29,7 +29,7 @@ public function __construct() {
 		// Detect domain changes.
 		\add_action( 'shutdown', [ $this, 'detect_site_url_changes' ] );
 
-		if ( \get_option( 'progress_planner_license_key' ) ) {
+		if ( \progress_planner()->get_license_key() ) {
 			return;
 		}
 
@@ -194,7 +194,7 @@ public function detect_site_url_changes() {
 			return;
 		}
 
-		$saved_license_key = \get_option( 'progress_planner_license_key', false );
+		$saved_license_key = \progress_planner()->get_license_key();
 
 		// Bail early if the license key is not set, or if the site URL has not changed.
 		if ( ! $saved_license_key || $saved_site_url === $current_site_url ) {
diff --git a/classes/utils/class-playground.php b/classes/utils/class-playground.php
@@ -28,7 +28,7 @@ public function __construct() {
 	 * @return void
 	 */
 	public function register_hooks() {
-		if ( ! \get_option( 'progress_planner_license_key', false ) && ! \get_option( 'progress_planner_demo_data_generated', false ) ) {
+		if ( ! \progress_planner()->get_license_key() && ! \get_option( 'progress_planner_demo_data_generated', false ) ) {
 			$this->generate_data();
 			\update_option( 'progress_planner_license_key', \str_replace( ' ', '-', $this->create_random_string( 20 ) ) );
 			\update_option( 'progress_planner_force_show_onboarding', false );
diff --git a/tests/phpunit/test-class-api-get-stats.php b/tests/phpunit/test-class-api-get-stats.php
@@ -72,7 +72,7 @@ public static function set_lessons_cache() {
 		$url = \add_query_arg(
 			[
 				'site'        => \get_site_url(),
-				'license_key' => \get_option( 'progress_planner_license_key' ),
+				'license_key' => \progress_planner()->get_license_key(),
 			],
 			$url
 		);
diff --git a/tests/phpunit/test-class-page-types.php b/tests/phpunit/test-class-page-types.php
@@ -73,7 +73,7 @@ public static function set_lessons_cache() {
 		$url = \add_query_arg(
 			[
 				'site'        => \get_site_url(),
-				'license_key' => \get_option( 'progress_planner_license_key' ),
+				'license_key' => \progress_planner()->get_license_key(),
 			],
 			$url
 		);
diff --git a/views/admin-page-header.php b/views/admin-page-header.php
@@ -25,7 +25,7 @@
 		<?php
 
 		// Render the subscribe form button and popover if the license key is not set.
-		if ( 'no-license' === \get_option( 'progress_planner_license_key', 'no-license' ) ) {
+		if ( 'no-license' === \progress_planner()->get_license_key() ) {
 			\progress_planner()->get_ui__popover()->the_popover( 'subscribe-form' )->render_button(
 				'',
 				\progress_planner()->get_asset( 'images/register_icon.svg' ) . '<span class="screen-reader-text">' . \esc_html__( 'Subscribe', 'progress-planner' ) . '</span>'
diff --git a/views/admin-page.php b/views/admin-page.php
@@ -11,14 +11,6 @@
 }
 
 $prpl_privacy_policy_accepted = \progress_planner()->is_privacy_policy_accepted();
-
-if ( 0 !== (int) \progress_planner()->get_ui__branding()->get_branding_id() ) {
-	$prpl_license_key = \progress_planner()->get_utils__onboard()->make_remote_onboarding_request();
-	if ( '' !== $prpl_license_key ) {
-		\update_option( 'progress_planner_license_key', $prpl_license_key );
-		$prpl_privacy_policy_accepted = true;
-	}
-}
 ?>
 
 <div class="wrap prpl-wrap <?php echo \esc_attr( $prpl_privacy_policy_accepted ? '' : 'prpl-pp-not-accepted' ); ?>">
diff --git a/views/welcome.php b/views/welcome.php
@@ -12,7 +12,7 @@
 	exit;
 }
 
-if ( false !== \get_option( 'progress_planner_license_key', false ) ) {
+if ( false !== \progress_planner()->get_license_key() ) {
 	return;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public function get_cache_key() {`
`90`	`90`	`public function get_remote_api_url() {`
`91`	`91`	`return \add_query_arg(`
`92`	`92`	`[`
`93`		`- 'license_key' => \get_option( 'progress_planner_license_key' ),`
	`93`	`+ 'license_key' => \progress_planner()->get_license_key(),`
`94`	`94`	`'site' => \get_site_url(),`
`95`	`95`	`],`
`96`	`96`	`\progress_planner()->get_remote_server_root_url() . '/wp-json/progress-planner-saas/v1/challenges'`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function get_remote_api_items() {`
`57`	`57`	`$url = \add_query_arg(`
`58`	`58`	`[`
`59`	`59`	`'site' => \get_site_url(),`
`60`		`- 'license_key' => \get_option( 'progress_planner_license_key' ),`
	`60`	`+ 'license_key' => \progress_planner()->get_license_key(),`
`61`	`61`	`],`
`62`	`62`	`$url`
`63`	`63`	`);`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function validate_token( $token ) {`
`86`	`86`	`return true;`
`87`	`87`	`}`
`88`	`88`
`89`		`- $license_key = \get_option( 'progress_planner_license_key', false );`
	`89`	`+ $license_key = \progress_planner()->get_license_key();`
`90`	`90`	`if ( ! $license_key \|\| 'no-license' === $license_key ) {`
`91`	`91`	`// Increment failed attempts counter.`
`92`	`92`	`\set_transient( $rate_limit_key, $failed_attempts + 1, HOUR_IN_SECONDS );`
Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ protected function add_more_info_submenu_item( $admin_bar ) {`
`515`	`515`	`);`
`516`	`516`
`517`	`517`	`// Free license info.`
`518`		`- $prpl_free_license_key = \get_option( 'progress_planner_license_key', false );`
	`518`	`+ $prpl_free_license_key = \progress_planner()->get_license_key();`
`519`	`519`	`$admin_bar->add_node(`
`520`	`520`	`[`
`521`	`521`	`'id' => 'prpl-free-license',`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function __construct() {`
`29`	`29`	`// Detect domain changes.`
`30`	`30`	`\add_action( 'shutdown', [ $this, 'detect_site_url_changes' ] );`
`31`	`31`
`32`		`- if ( \get_option( 'progress_planner_license_key' ) ) {`
	`32`	`+ if ( \progress_planner()->get_license_key() ) {`
`33`	`33`	`return;`
`34`	`34`	`}`
`35`	`35`
`@@ -194,7 +194,7 @@ public function detect_site_url_changes() {`
`194`	`194`	`return;`
`195`	`195`	`}`
`196`	`196`
`197`		`- $saved_license_key = \get_option( 'progress_planner_license_key', false );`
	`197`	`+ $saved_license_key = \progress_planner()->get_license_key();`
`198`	`198`
`199`	`199`	`// Bail early if the license key is not set, or if the site URL has not changed.`
`200`	`200`	`if ( ! $saved_license_key \|\| $saved_site_url === $current_site_url ) {`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public static function set_lessons_cache() {`
`72`	`72`	`$url = \add_query_arg(`
`73`	`73`	`[`
`74`	`74`	`'site' => \get_site_url(),`
`75`		`- 'license_key' => \get_option( 'progress_planner_license_key' ),`
	`75`	`+ 'license_key' => \progress_planner()->get_license_key(),`
`76`	`76`	`],`
`77`	`77`	`$url`
`78`	`78`	`);`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public static function set_lessons_cache() {`
`73`	`73`	`$url = \add_query_arg(`
`74`	`74`	`[`
`75`	`75`	`'site' => \get_site_url(),`
`76`		`- 'license_key' => \get_option( 'progress_planner_license_key' ),`
	`76`	`+ 'license_key' => \progress_planner()->get_license_key(),`
`77`	`77`	`],`
`78`	`78`	`$url`
`79`	`79`	`);`