Merge pull request #2 from kestrelwp/release/2.9.3

Release 2.9.3

Author: maxrice

changelog.txt

@@ -1,6 +1,13 @@
 *** WooCommerce API Manager PHP Library for Plugins and Themes Changelog ***
 
+2024.04.26 - version 2.9.3
+* Tweak: Update brand to Kestrel
+* Fix: Fix PHP warnings for certain failed update checks
+
 2024.03.18 - version 2.9.2
+* Fix: Set instance ID property after generating it
+* New: Add wc_am_api_key_field_value filter to allow setting a default API key
+* New: Add activate_new_key() method for programmatic activation of a new key
 
 2023.08.14 - version 2.9.1
  * Fix: Process custom menu array using if > elseif > else rather than switch to fix PHP notices: Undefined index, Undefined array key.

readme.txt

@@ -1,3 +1,3 @@
 See documentation at
 
-https://www.toddlahman.com/woocommerce-api-manager-php-library-for-plugins-and-themes-documentation/
+https://kestrelwp.com/docs/woocommerce-api-manager-php-library-for-plugins-and-themes-documentation/

wc-am-client.php

@@ -1,24 +1,27 @@
 <?php
-
 /**
- * The WooCommerce API Manager PHP Client Library is designed to be droppped into a WordPress plugin or theme.
- * This version is designed to be used with the WooCommerce API Manager version 2.x.
+ * WooCommerce API Manager PHP Client Library
+ *
+ * Designed to be used with WooCommerce API Manager 2.x, and dropped into a WordPress plugin or theme.
+ *
+ * This source file is subject to the GNU General Public License v3.0
+ * that is bundled with this plugin in the file license.txt
  *
- * Intellectual Property rights, and copyright, reserved by Todd Lahman, LLC as allowed by law include,
- * but are not limited to, the working concept, function, and behavior of this software,
- * the logical code structure and expression as written.
+ * Please do not modify this file if you want to upgrade the SDK to newer
+ * versions in the future. If you want to customize the SDK for your needs,
+ * please review our developer documentation at https://kestrelwp.com/docs/woocommerce-api-manager-php-library-for-plugins-and-themes-documentation/
+ * and join our developer program at https://kestrelwp.com/developers
  *
- * @version       2.9.2
- * @author        Todd Lahman LLC https://www.toddlahman.com/
- * @copyright     Copyright (c) Todd Lahman LLC ([email protected])
- * @package       WooCommerce API Manager plugin and theme library
- * @license       Copyright Todd Lahman LLC
+ * @version     2.9.3
+ * @author      Kestrel
+ * @copyright   Copyright (c) 2013-2024 Kestrel
+ * @license     http://www.gnu.org/licenses/gpl-3.0.html GNU General Public License v3.0
  */
 
 defined( 'ABSPATH' ) || exit;
 
-if ( ! class_exists( 'WC_AM_Client_2_9_2' ) ) {
-	class WC_AM_Client_2_9_2 {
+if ( ! class_exists( 'WC_AM_Client_2_9_3' ) ) {
+	class WC_AM_Client_2_9_3 {
 
 		/**
 		 * Class args
@@ -718,14 +721,14 @@ public function wc_am_activation_info() {
 			$live_status  = json_decode( $this->status(), true );
 			$line_break   = wp_kses_post( '<br>' );
 
-			if ( ! empty( $live_status ) && $live_status[ 'success' ] == false ) {
+			if ( ! empty( $live_status ) && isset( $live_status['success'] ) && $live_status[ 'success' ] == false ) {
 				echo esc_html( 'Error: ' . $live_status[ 'data' ][ 'error' ] );
 			}
 
 			if ( $this->get_api_key_status() ) {
 				$result_success = get_option( 'wc_am_' . $this->product_id . '_activate_success' );
 
-				if ( ! empty( $live_status ) && $live_status[ 'status_check' ] == 'active' ) {
+				if ( ! empty( $live_status ) && isset( $live_status['status_check'] ) && $live_status[ 'success' ] == 'active' ) {
 					echo esc_html( 'Activations purchased: ' . $live_status[ 'data' ][ 'total_activations_purchased' ] );
 					echo $line_break;
 					echo esc_html( 'Total Activations: ' . $live_status[ 'data' ][ 'total_activations' ] );
@@ -736,7 +739,7 @@ public function wc_am_activation_info() {
 				} else {
 					echo '';
 				}
-			} elseif ( ! $this->get_api_key_status() && ! empty( $live_status ) && $live_status[ 'status_check' ] == 'inactive' ) {
+			} elseif ( ! $this->get_api_key_status() && ! empty( $live_status ) && isset( $live_status['status_check'] ) && $live_status[ 'status_check' ] == 'inactive' ) {
 				echo esc_html( 'Activations purchased: ' . $live_status[ 'data' ][ 'total_activations_purchased' ] );
 				echo $line_break;
 				echo esc_html( 'Total Activations: ' . $live_status[ 'data' ][ 'total_activations' ] );
@@ -1181,7 +1184,7 @@ public function update_check( $transient ) {
 				add_settings_error( 'wc_am_client_error_text', 'wc_am_client_error', "{$response['data']['error']}", 'error' );
 			}
 
-			if ( $response !== false && $response[ 'success' ] === true ) {
+			if ( $response !== false && isset( $response['success'] ) && $response['success'] === true ) {
 				// New plugin version from the API
 				$new_ver = (string) $response[ 'data' ][ 'package' ][ 'new_version' ];
 				// Current installed plugin version
@@ -1216,7 +1219,7 @@ public function update_check( $transient ) {
 		}
 
 		/**
-		 * API request for informatin.
+		 * API request for information.
 		 *
 		 * If `$action` is 'query_plugins' or 'plugin_information', an object MUST be passed.
 		 * If `$action` is 'hot_tags` or 'hot_categories', an array should be passed.

wc-api-manager-php-library.php

@@ -2,21 +2,18 @@
 
 /**
  * Plugin Name: WooCommerce API Manager PHP Library for Plugins and Themes Example
- * Plugin URI: https://toddlahman.com/shop/woocommerce-api-manager-php-library-for-plugins-and-themes/
+ * Plugin URI: https://kestrelwp.com/product/woocommerce-api-manager-php-library-for-plugins-and-themes/
  * Description: Drop the wc-am-client.php library into a plugin or theme, and use the example code below after line 26.
- * Version: 2.9.1
- * Author: Todd Lahman LLC
- * Author URI: https://www.toddlahman.com/
- * License: Copyright Todd Lahman LLC
+ * Version: 2.9.3
+ * Author: Kestrel
+ * Author URI: https://kestrelwp.com
  *
- *    Intellectual Property rights, and copyright, reserved by Todd Lahman, LLC as allowed by law include,
- *    but are not limited to, the working concept, function, and behavior of this library,
- *    the logical code structure and expression as written.
+ * Copyright: (c) 2023-2024 Kestrel [[email protected]]
  *
  * @package     WooCommerce API Manager Library for plugin or theme
- * @author      Todd Lahman LLC
+ * @author      Kestrel
  * @category    Plugin/Theme/library
- * @copyright   Copyright (c) Todd Lahman LLC
+ * @license     http://www.gnu.org/licenses/gpl-3.0.html GNU General Public License v3.0
  */
 
 // Exit if accessed directly
@@ -29,7 +26,7 @@
  */
 
 // Load WC_AM_Client class if it exists.
-if ( ! class_exists( 'WC_AM_Client_2_9_1' ) ) {
+if ( ! class_exists( 'WC_AM_Client_2_9_3' ) ) {
 	/*
 	 * |---------------------------------------------------------------------
 	 * | This must be exactly the same for both plugins and themes.
@@ -39,7 +36,7 @@
 }
 
 // Instantiate WC_AM_Client class object if the WC_AM_Client class is loaded.
-if ( class_exists( 'WC_AM_Client_2_9_1' ) ) {
+if ( class_exists( 'WC_AM_Client_2_9_3' ) ) {
 	/**
 	 * This file is only an example that includes a plugin header, and this code used to instantiate the client object. The variable $wcam_lib
 	 * can be used to access the public properties from the WC_AM_Client class, but $wcam_lib must have a unique name. To find data saved by
@@ -57,17 +54,17 @@
 	 * @param int    $product_id       (Optional, can be an empty string) Must match the Product ID number (integer) in the product if set.
 	 * @param string $software_version This product's current software version.
 	 * @param string $plugin_or_theme  'plugin' or 'theme'
-	 * @param string $api_url          The URL to the site that is running the API Manager. Example: https://www.toddlahman.com/ Must be the root URL.
+	 * @param string $api_url          The URL to the site that is running the API Manager. Example: https://kestrelwp.com/ Must be the root URL.
 	 * @param string $software_title   The name, or title, of the product. The title is not sent to the API Manager APIs, but is used for menu titles.
 	 * @param string $text             Text Domain.
 	 *
 	 * Example:
 	 *
-	 * $wcam_lib = new WC_AM_Client_2_9_1( $file, $product_id, $software_version, $plugin_or_theme, $api_url, $software_title );
+	 * $wcam_lib = new WC_AM_Client_2_9_3( $file, $product_id, $software_version, $plugin_or_theme, $api_url, $software_title );
 	 */
 
 	// Default menu Theme example.
-	//$wcam_lib = new WC_AM_Client_2_9_1( __FILE__, 234, '1.0', 'theme', 'http://wc/', 'WooCommerce API Manager PHP Library for Plugins and Themes' );
+	//$wcam_lib = new WC_AM_Client_2_9_3( __FILE__, 234, '1.0', 'theme', 'http://wc/', 'WooCommerce API Manager PHP Library for Plugins and Themes' );
 
 	/*
 	 * Default Menu Plugin example.
@@ -83,13 +80,13 @@
 	 * with a different Product ID, then do not set the Product ID here.
 	 */
 
-	//$wcam_lib = new WC_AM_Client_2_9_1( __FILE__, 32960, '1.2', 'plugin', 'http://wc/', 'WooCommerce API Manager PHP Library for Plugins and Themes' );
-	$wcam_lib = new WC_AM_Client_2_9_1( __FILE__, '', '1.2', 'plugin', 'http://wc/', 'WooCommerce API Manager PHP Library for Plugins and Themes', 'wc-am-text' );
+	//$wcam_lib = new WC_AM_Client_2_9_3( __FILE__, 32960, '1.2', 'plugin', 'http://wc/', 'WooCommerce API Manager PHP Library for Plugins and Themes' );
+	$wcam_lib = new WC_AM_Client_2_9_3( __FILE__, '', '1.2', 'plugin', 'http://wc/', 'WooCommerce API Manager PHP Library for Plugins and Themes', 'wc-am-text' );
 
 	/**
 	 * Custom top level or top level submenu.
 	 *
-	 * Last argument to the WC_AM_Client_2_9_1 class is to prevent the not activated yet admin message from being displayed, which may not be necessary with a custom menu.
+	 * Last argument to the WC_AM_Client_2_9_3 class is to prevent the not activated yet admin message from being displayed, which may not be necessary with a custom menu.
 	 *
 	 * Example using add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, $menu_slug, $callback = '', $position = null );
 	 *
@@ -108,5 +105,5 @@
 
 	// $wcam_lib_custom_menu = array( 'menu_type' => 'add_submenu_page', 'parent_slug' => 'my-plugin.php', 'page_title' => 'My Plugin License Activation', 'menu_title' => 'API Key' );
 
-	// $wcam_lib = new WC_AM_Client_2_9_1( __FILE__, 168804, '1.2', 'plugin', 'http://wc/', 'WooCommerce API Manager PHP Library for Plugins and Themes', 'wc-am-text', $wcam_lib_custom_menu, false );
+	// $wcam_lib = new WC_AM_Client_2_9_3( __FILE__, 168804, '1.2', 'plugin', 'http://wc/', 'WooCommerce API Manager PHP Library for Plugins and Themes', 'wc-am-text', $wcam_lib_custom_menu, false );
 }