fix #1462

inc2734 · Jan 29, 2025 · 2af5032 · 2af5032
1 parent 240179d
commit 2af5032
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 31 deletions.
diff --git a/Framework/Controller/Manager.php b/Framework/Controller/Manager.php
@@ -3,7 +3,7 @@
  * @package snow-monkey
  * @author inc2734
  * @license GPL-2.0+
- * @version 27.2.3
+ * @version 27.5.4
  */
 
 namespace Framework\Controller;
@@ -289,17 +289,15 @@ protected static function _request_license_validate( $license_key ) {
 		}
 
 		$response = wp_remote_get(
-			sprintf(
-				'https://snow-monkey.2inc.org/wp-json/snow-monkey-license-manager/v1/validate/%1$s?repository=snow-monkey',
-				$license_key
-			),
+			'https://snow-monkey.2inc.org/wp-json/snow-monkey-license-manager/v1/validate/?repository=snow-monkey',
 			array(
 				'user-agent' => 'WordPress/' . $wp_version,
 				'timeout'    => 30,
 				'headers'    => array(
-					'Accept-Encoding'       => '',
-					'X-Snow-Monkey-Version' => wp_get_theme()->get( 'Version' ),
-					'X-Snow-Monkey-URL'     => home_url(),
+					'Accept-Encoding'           => '',
+					'X-Snow-Monkey-License-key' => $license_key,
+					'X-Snow-Monkey-Version'     => wp_get_theme()->get( 'Version' ),
+					'X-Snow-Monkey-URL'         => home_url(),
 				),
 			)
 		);
@@ -351,17 +349,15 @@ protected static function _request_license_validate_xserver( $xserver_register_k
 		}
 
 		$response = wp_remote_get(
-			sprintf(
-				'https://snow-monkey.2inc.org/wp-json/snow-monkey-license-manager/v1/validate-xserver/%1$s?repository=snow-monkey',
-				$xserver_register_key
-			),
+			'https://snow-monkey.2inc.org/wp-json/snow-monkey-license-manager/v1/validate-xserver/?repository=snow-monkey',
 			array(
 				'user-agent' => 'WordPress/' . $wp_version,
 				'timeout'    => 30,
 				'headers'    => array(
-					'Accept-Encoding'       => '',
-					'X-Snow-Monkey-Version' => wp_get_theme()->get( 'Version' ),
-					'X-Snow-Monkey-URL'     => home_url(),
+					'Accept-Encoding'                    => '',
+					'X-Snow-Monkey-XServer-Register-key' => $xserver_register_key,
+					'X-Snow-Monkey-Version'              => wp_get_theme()->get( 'Version' ),
+					'X-Snow-Monkey-URL'                  => home_url(),
 				),
 			)
 		);

diff --git a/app/setup/remote-block-patterns.php b/app/setup/remote-block-patterns.php
@@ -3,7 +3,7 @@
  * @package snow-monkey
  * @author inc2734
  * @license GPL-2.0+
- * @version 27.2.6
+ * @version 27.5.4
  */
 
 use Framework\Controller\Manager;
@@ -58,18 +58,22 @@ function snow_monkey_get_remote_block_patten_categories() {
  * Get remote block patterns.
  *
  * @param string $url API URL.
+ * @param array $args An array of request arguments.
  * @return array
  */
-function _snow_monkney_get_remote_block_patterns( $url ) {
+function _snow_monkney_get_remote_block_patterns( $url, array $args = array() ) {
 	global $wp_version;
 
 	$response = wp_remote_get(
 		$url,
 		array(
 			'user-agent' => 'WordPress/' . $wp_version,
 			'timeout'    => 30,
-			'headers'    => array(
-				'Accept-Encoding' => '',
+			'headers'    => array_merge(
+				$args,
+				array(
+					'Accept-Encoding' => '',
+				),
 			),
 		)
 	);
@@ -131,14 +135,14 @@ function snow_monkey_get_free_remote_block_pattens() {
  * @return array
  */
 function snow_monkey_get_premium_remote_block_pattens() {
-	$license_key = Manager::get_option( 'license-key' );
+	$url = 'https://snow-monkey.2inc.org/wp-json/snow-monkey-license-manager/v1/patterns/';
 
-	$url = sprintf(
-		'https://snow-monkey.2inc.org/wp-json/snow-monkey-license-manager/v1/patterns/%1$s',
-		esc_attr( $license_key )
+	return _snow_monkney_get_remote_block_patterns(
+		$url,
+		array(
+			'X-Snow-Monkey-License-key' => Manager::get_option( 'license-key' ),
+		)
 	);
-
-	return _snow_monkney_get_remote_block_patterns( $url );
 }
 
 /**
@@ -147,14 +151,14 @@ function snow_monkey_get_premium_remote_block_pattens() {
  * @return array
  */
 function snow_monkey_get_premium_remote_block_pattens_xserver() {
-	$xserver_register_key = Manager::get_option( 'xserver-register-key' );
+	$url = 'https://snow-monkey.2inc.org/wp-json/snow-monkey-license-manager/v1/patterns-xserver/';
 
-	$url = sprintf(
-		'https://snow-monkey.2inc.org/wp-json/snow-monkey-license-manager/v1/patterns-xserver/%1$s',
-		esc_attr( $xserver_register_key )
+	return _snow_monkney_get_remote_block_patterns(
+		$url,
+		array(
+			'X-Snow-Monkey-XServer-Register-key' => Manager::get_option( 'xserver-register-key' ),
+		)
 	);
-
-	return _snow_monkney_get_remote_block_patterns( $url );
 }
 
 /**