chore: bump version to 1.9.8

groq-ai-product-text.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: SitiAI Product Teksten
  * Description: Genereer productteksten met diverse AI-aanbieders rechtstreeks vanuit WooCommerce.
- * Version: 1.9.6
+ * Version: 1.9.8
  * Author: Roberto Guagliardo | SitiWeb
  * Author URI: https://sitiweb.nl/
  * Text Domain: siti-ai-product-content-generator

includes/SitiWebUpdater2.php

@@ -6,7 +6,8 @@
  * Updates plugins via the Siti Plugin Repo API instead of GitHub
  * Fully self-contained with built-in license management
  */
-class SitiWebUpdater2 {
+class SitiWebUpdater2
+{
 
     private static $instances = array();
     private static $global_settings_registered = false;
@@ -22,7 +23,8 @@ class SitiWebUpdater2 {
     private $plugin_response;
     private $option_prefix;
 
-    public function __construct( $file ) {
+    public function __construct($file)
+    {
         $this->file = $file;
         $this->option_prefix = 'siti_updater_' . sanitize_key(dirname(plugin_basename($this->file))) . '_';
         $this->set_plugin_properties();
@@ -41,7 +43,8 @@ class SitiWebUpdater2 {
         return $this;
     }
 
-    public function initialize() {
+    public function initialize()
+    {
         add_filter('pre_set_site_transient_update_plugins', array($this, 'check_for_updates'));
         add_filter('plugins_api', array($this, 'plugin_info'), 10, 3);
 
@@ -52,7 +55,8 @@ class SitiWebUpdater2 {
         }
     }
 
-    public function set_plugin_properties() {
+    public function set_plugin_properties()
+    {
         if (!function_exists('get_plugin_data')) {
             require_once ABSPATH . 'wp-admin/includes/plugin.php';
         }
@@ -62,23 +66,28 @@ class SitiWebUpdater2 {
         $this->active = is_plugin_active($this->basename);
     }
 
-    public static function get_instances() {
+    public static function get_instances()
+    {
         return self::$instances;
     }
 
-    public function get_plugin_data() {
+    public function get_plugin_data()
+    {
         return $this->plugin;
     }
 
-    public function set_owner( $owner ) {
+    public function set_owner($owner)
+    {
         $this->owner = $owner;
     }
 
-    public function set_repository( $repository ) {
+    public function set_repository($repository)
+    {
         $this->repository = $repository;
     }
 
-    public function set_license_key( $key ) {
+    public function set_license_key($key)
+    {
         $sanitized_key = sanitize_text_field((string) $key);
         $stored_key = get_option($this->option_prefix . 'license_key', '');
 
@@ -90,33 +99,57 @@ class SitiWebUpdater2 {
         update_option($this->option_prefix . 'license_key', $sanitized_key);
     }
 
-    public function get_license_key() {
+    public function get_license_key()
+    {
         if (null === $this->license_key) {
             $this->license_key = get_option($this->option_prefix . 'license_key', '');
         }
         return $this->license_key;
     }
 
-    public function get_license_data() {
+    public function get_license_data()
+    {
         return $this->get_stored_license_data();
     }
 
-    public function set_api_base_url( $api_base_url ) {
+    public function set_api_base_url($api_base_url)
+    {
         $this->api_base_url = rtrim((string) $api_base_url, '/');
     }
 
-    private function get_stored_license_data() {
+    private function normalize_version($version)
+    {
+        if (!is_string($version)) {
+            return $version;
+        }
+
+        $version = trim($version);
+        if ('' === $version) {
+            return $version;
+        }
+
+        if (0 === stripos($version, 'v')) {
+            $version = ltrim($version, 'vV');
+        }
+
+        return $version;
+    }
+
+    private function get_stored_license_data()
+    {
         $data = get_option($this->option_prefix . 'license_data', array());
 
         return is_array($data) ? $data : array();
     }
 
-    private function clear_cached_license_data() {
+    private function clear_cached_license_data()
+    {
         delete_option($this->option_prefix . 'license_data');
         delete_option($this->option_prefix . 'last_check');
     }
 
-    private function store_license_data( $body ) {
+    private function store_license_data($body)
+    {
         if (!is_array($body)) {
             $body = array();
         }
@@ -131,6 +164,8 @@ class SitiWebUpdater2 {
             $license_data['key'] = $this->get_license_key();
         }
 
+        $license_data['licenseValid'] = !empty($body['valid']);
+
         $version = null;
         if (isset($body['pluginVersion']) && $body['pluginVersion']) {
             $version = $body['pluginVersion'];
@@ -141,14 +176,15 @@ class SitiWebUpdater2 {
         }
 
         if ($version) {
-            $license_data['pluginVersion'] = $version;
+            $license_data['pluginVersion'] = $this->normalize_version($version);
         }
 
         update_option($this->option_prefix . 'license_data', $license_data);
         update_option($this->option_prefix . 'last_check', current_time('mysql'));
     }
 
-    private function get_plugin_info() {
+    private function get_plugin_info()
+    {
         if (is_null($this->plugin_response)) {
             $request_uri = sprintf('%s/api/plugins/%s/%s', $this->api_base_url, $this->owner, $this->repository);
 
@@ -166,11 +202,15 @@ class SitiWebUpdater2 {
             }
 
             $body = json_decode(wp_remote_retrieve_body($response), true);
+            if (is_array($body) && isset($body['version'])) {
+                $body['version'] = $this->normalize_version($body['version']);
+            }
             $this->plugin_response = $body;
         }
     }
 
-    public function check_for_updates( $transient ) {
+    public function check_for_updates($transient)
+    {
         if (empty($transient->checked)) {
             return $transient;
         }
@@ -181,10 +221,10 @@ class SitiWebUpdater2 {
             return $transient;
         }
 
-        $remote_version = $this->plugin_response['version'];
+        $remote_version = $this->normalize_version($this->plugin_response['version']);
-        $current_version = $this->plugin['Version'];
+        $current_version = $this->normalize_version($this->plugin['Version']);
 
-        if ( version_compare( $remote_version, $current_version, '>' ) ) {
+        if ($remote_version && version_compare($remote_version, $current_version, '>')) {
             $download_url = $this->get_download_url('latest');
 
             if (!is_wp_error($download_url)) {
@@ -201,7 +241,8 @@ class SitiWebUpdater2 {
         return $transient;
     }
 
-    public function plugin_info( $result, $action, $args ) {
+    public function plugin_info($result, $action, $args)
+    {
         if ('plugin_information' !== $action || $args->slug !== dirname($this->basename)) {
             return $result;
         }
@@ -215,7 +256,7 @@ class SitiWebUpdater2 {
         return (object) array(
             'name' => $this->plugin_response['name'] ?? $this->plugin['Name'],
             'slug' => $args->slug,
-            'version'       => $this->plugin_response['version'],
+            'version' => $this->normalize_version($this->plugin_response['version'] ?? $this->plugin['Version']),
             'author' => $this->plugin_response['author'] ?? $this->plugin['Author'],
             'author_profile' => $this->plugin_response['author_url'] ?? $this->plugin['AuthorURI'],
             'homepage' => $this->plugin_response['homepage'] ?? '',
@@ -231,7 +272,8 @@ class SitiWebUpdater2 {
         );
     }
 
-    private function get_download_url( $version = 'latest' ) {
+    private function get_download_url($version = 'latest')
+    {
         $license_key = $this->get_license_key();
         if (empty($license_key)) {
             return new WP_Error('no_license', 'Geen licentie ingesteld');
@@ -241,7 +283,8 @@ class SitiWebUpdater2 {
         return $this->api_base_url . '/api/licenses/download?key=' . urlencode($license_key) . '&hostname=' . urlencode($hostname) . '&version=' . urlencode($version);
     }
 
-    public function verify_license() {
+    public function verify_license()
+    {
         $license_key = $this->get_license_key();
         if (empty($license_key)) {
             return new WP_Error('missing_license', 'Geen licentiecode ingesteld.');
@@ -257,6 +300,8 @@ class SitiWebUpdater2 {
                 'key' => $license_key,
                 'hostname' => $hostname,
                 'currentVersion' => $current_version,
+                'owner' => $this->owner,
+                'repository' => $this->repository,
             )),
             'timeout' => 15,
         ));
@@ -301,27 +346,38 @@ class SitiWebUpdater2 {
         return $body;
     }
 
-    public function is_license_valid() {
+    public function is_license_valid()
+    {
         $data = $this->get_license_data();
-        return ! empty( $data ) && ! empty( $data['key'] );
+        if (empty($data) || empty($data['key'])) {
+            return false;
         }
 
-    public function get_latest_known_version() {
+        if (isset($data['licenseValid'])) {
+            return (bool) $data['licenseValid'];
+        }
+
+        return true;
+    }
+
+    public function get_latest_known_version()
+    {
         $this->get_plugin_info();
 
         if (!empty($this->plugin_response['version'])) {
-            return $this->plugin_response['version'];
+            return $this->normalize_version($this->plugin_response['version']);
         }
 
         $license_data = $this->get_license_data();
         if (isset($license_data['pluginVersion']) && $license_data['pluginVersion']) {
-            return $license_data['pluginVersion'];
+            return $this->normalize_version($license_data['pluginVersion']);
         }
 
         return null;
     }
 
-    public function admin_notices() {
+    public function admin_notices()
+    {
         if (!current_user_can('manage_options')) {
             return;
         }
@@ -338,14 +394,16 @@ class SitiWebUpdater2 {
         }
     }
 
-    public function daily_license_check() {
+    public function daily_license_check()
+    {
         $result = $this->verify_license();
         if (is_wp_error($result)) {
             error_log($this->plugin['Name'] . ' License check failed: ' . $result->get_error_message());
         }
     }
 
-    public function add_global_settings_page() {
+    public function add_global_settings_page()
+    {
         add_options_page(
             __('Plugin Licenties', 'siti-updater'),
             __('Plugin Licenties', 'siti-updater'),
@@ -355,7 +413,8 @@ class SitiWebUpdater2 {
         );
     }
 
-    public function render_global_settings_page() {
+    public function render_global_settings_page()
+    {
         if (!current_user_can('manage_options')) {
             return;
         }
@@ -414,10 +473,8 @@ class SitiWebUpdater2 {
                                     <small><?php echo esc_html($plugin_data['Description']); ?></small>
                                 </td>
                                 <td>
-                                    <input type="text" 
+                                    <input type="text" name="<?php echo esc_attr($prefix . 'license_key'); ?>"
-                                           name="<?php echo esc_attr( $prefix . 'license_key' ); ?>" 
+                                        value="<?php echo esc_attr($instance->get_license_key()); ?>" class="regular-text"
-                                           value="<?php echo esc_attr( $instance->get_license_key() ); ?>" 
-                                           class="regular-text" 
                                         placeholder="<?php esc_attr_e('Voer licentiecode in...', 'siti-updater'); ?>" />
                                     <p class="description">
                                         <?php printf(esc_html__('Licentie voor %s. Verkrijg je code van plugins.robert.ooo', 'siti-updater'), $plugin_data['Name']); ?>
@@ -434,7 +491,8 @@ class SitiWebUpdater2 {
                                 <td>
                                     <?php echo esc_html($latest_version); ?>
                                     <?php if ($latest_version && '-' !== $latest_version && version_compare($latest_version, $current_version, '>')): ?>
-                                        <br><small style="color: orange;"><?php esc_html_e( 'Update beschikbaar!', 'siti-updater' ); ?></small>
+                                        <br><small
+                                            style="color: orange;"><?php esc_html_e('Update beschikbaar!', 'siti-updater'); ?></small>
                                     <?php endif; ?>
                                 </td>
                             </tr>
@@ -442,7 +500,8 @@ class SitiWebUpdater2 {
                     </tbody>
                 </table>
                 <p class="submit">
-                    <input type="submit" name="siti_updater_save" class="button button-primary" value="<?php esc_attr_e( 'Licenties opslaan', 'siti-updater' ); ?>" />
+                    <input type="submit" name="siti_updater_save" class="button button-primary"
+                        value="<?php esc_attr_e('Licenties opslaan', 'siti-updater'); ?>" />
                 </p>
             </form>
         </div>

manifest.json

@@ -1,7 +1,7 @@
 {
   "plugin_name": "SitiAI Product Teksten",
   "description": "Genereer productteksten met diverse AI-aanbieders rechtstreeks vanuit WooCommerce.",
-  "version": "1.9.5",
+  "version": "1.9.7",
   "author": "Roberto Guagliardo | SitiWeb",
   "author_url": "https://sitiweb.nl/"
 }