アップデートチェック前にもライセンス認証をするように変更

inc2734 · Sep 22, 2024 · cb34347 · cb34347
1 parent 68b7e3a
commit cb34347
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 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.0
+ * @version 27.2.1
  */
 
 namespace Framework\Controller;
@@ -359,7 +359,9 @@ protected static function _request_license_validate_xserver( $xserver_register_k
 				'user-agent' => 'WordPress/' . $wp_version,
 				'timeout'    => 30,
 				'headers'    => array(
-					'Accept-Encoding' => '',
+					'Accept-Encoding'       => '',
+					'X-Snow-Monkey-Version' => wp_get_theme()->get( 'Version' ),
+					'X-Snow-Monkey-URL'     => home_url(),
 				),
 			)
 		);

diff --git a/app/constructor/updater.php b/app/constructor/updater.php
@@ -3,10 +3,11 @@
  * @package snow-monkey
  * @author inc2734
  * @license GPL-2.0+
- * @version 25.4.6
+ * @version 27.2.1
  */
 
 use Inc2734\WP_GitHub_Theme_Updater\Bootstrap;
+use Framework\Controller\Manager;
 
 new Bootstrap(
 	get_template(),
@@ -42,23 +43,29 @@ function ( $url ) {
 add_filter(
 	'inc2734_github_theme_updater_request_url_inc2734/snow-monkey',
 	function ( $url, $user_name, $repository, $version ) {
-		$xserver_register_key = \Framework\Controller\Manager::get_option( 'xserver-register-key' );
+		$xserver_register_key    = Manager::get_option( 'xserver-register-key' );
+		$xserver_register_status = Manager::get_xserver_register_status( $xserver_register_key );
 
-		if ( $xserver_register_key ) {
+		if ( 'true' === $xserver_register_key ) {
 			return sprintf(
 				'https://snow-monkey.2inc.org/wp-json/snow-monkey-license-manager/v1/update-xserver/%1$s?repository=snow-monkey&version=%2$s',
 				esc_attr( $xserver_register_key ),
 				esc_attr( $version )
 			);
 		}
 
-		$license_key = \Framework\Controller\Manager::get_option( 'license-key' );
+		$license_key    = Manager::get_option( 'license-key' );
+		$license_status = Manager::get_license_status( $license_key );
 
-		return sprintf(
-			'https://snow-monkey.2inc.org/wp-json/snow-monkey-license-manager/v1/update/%1$s?repository=snow-monkey&version=%2$s',
-			esc_attr( $license_key ),
-			esc_attr( $version )
-		);
+		if ( 'true' === $license_status ) {
+			return sprintf(
+				'https://snow-monkey.2inc.org/wp-json/snow-monkey-license-manager/v1/update/%1$s?repository=snow-monkey&version=%2$s',
+				esc_attr( $license_key ),
+				esc_attr( $version )
+			);
+		}
+
+		return '';
 	},
 	10,
 	4