Changeset 3757750

Timestamp:

10/21/2026 05:47:18 AM (3 weeks ago)

Author:

jumedeenkhan

Message:

new version

Location:

glossary-tooltip/trunk

Files:

• frontend/class-frontend.php (modified) (2 diffs)
• frontend/class-highlighter.php (modified) (1 diff)
• functions.php (modified) (1 diff)
• glossary-tooltip.php (modified) (2 diffs)
• gtt-main.php (modified) (3 diffs)
• readme.txt (modified) (3 diffs)
• uninstall.php (deleted)

glossary-tooltip/trunk/frontend/class-frontend.php

@@ -139 +139 @@
 
                 $extract = trim( (string) ( is_array( $json ) ? ( $json['extract'] ?? '' ) : '' ) );
-                $url     = is_array( $json ) && isset( $json['content_urls']['desktop']['page'] )
-                        ? $json['content_urls']['desktop']['page']
-                        : sprintf( 'https://%1$s.wikipedia.org/wiki/%2$s', rawurlencode( $lang ), rawurlencode( str_replace( ' ', '_', $term ) ) );
+
+                $fallback = sprintf( 'https://%1$s.wikipedia.org/wiki/%2$s', rawurlencode( $lang ), rawurlencode( str_replace( ' ', '_', $term ) ) );
+
+                // Serve only trusted http(s) Wikipedia URLs; anything else uses the fallback.
+                $page   = is_array( $json ) ? trim( (string) ( $json['content_urls']['desktop']['page'] ?? '' ) ) : '';
+                $scheme = strtolower( (string) wp_parse_url( $page, PHP_URL_SCHEME ) );
+                $url    = ( '' !== $page && in_array( $scheme, [ 'http', 'https' ], true ) ) ? esc_url_raw( $page ) : $fallback;
 
                 $payload = array(
@@ -178 +182 @@
 
                 if ( ! empty( $this->options['single_only'] ) ) {
-                        if ( ! is_singular() || is_front_page() || is_home() || is_archive() ) {
+                        // A static front page is a singular page, so it highlights too; only
+                        // listings (blog home, archives) are excluded.
+                        if ( ! is_singular() || is_home() || is_archive() ) {
                                 return $content;
                         }

glossary-tooltip/trunk/frontend/class-highlighter.php

@@ -74 +74 @@
                 // the normalized lookup key, which is lowercased in case-insensitive mode
                 // and must never be shown to the reader.
-                if ( ! empty( $this->options['enable_title_attribute'] ) ) {
-                        $attributes['title'] = $text;
-                }
-
                 $tooltip_enabled = gtt_is_amp_request() ? false : ( null === $tooltip_enabled
                         ? ! empty( $this->options['enable_tooltip'] )
                         : (bool) $tooltip_enabled );
+
+                // The custom tooltip already shows the term on hover, so the native title
+                // attribute is only added when no tooltip renders (avoids a double tooltip).
+                if ( ! empty( $this->options['enable_title_attribute'] ) && ! $tooltip_enabled ) {
+                        $attributes['title'] = $text;
+                }
 
                 if ( $tooltip_enabled ) {

glossary-tooltip/trunk/functions.php

@@ -545 +545 @@
         }
 
-        $fs = gtt_premium_fs();
-
-        if ( ! $fs->can_use_premium_code__premium_only() ) {
-                return false;
-        }
-
-        return $fs->is_plan( $plan );
+        return gtt_premium_fs()->is_plan__premium_only( $plan );
 }
 

glossary-tooltip/trunk/glossary-tooltip.php

@@ -4 +4 @@
  * Plugin URI: https://glossarytooltip.com
  * Description: Automatically highlight glossary terms and display tooltips with definitions.
- * Version: 3.0.5
+ * Version: 3.0.6
  * Requires at least: 6.0
  * Requires PHP: 7.4
@@ -21 +21 @@
 }
 
-define( 'GTT_VERSION', '3.0.5' );
+define( 'GTT_VERSION', '3.0.6' );
 define( 'GTT_NAME', 'Glossary Tooltip' );
 

glossary-tooltip/trunk/gtt-main.php

@@ -11 +11 @@
 if ( ! defined( 'ABSPATH' ) ) {
         exit;
+}
+
+if ( version_compare( PHP_VERSION, '7.4', '<' ) ) {
+        add_action(
+                'admin_notices',
+                function () {
+                        echo '<div class="notice notice-error"><p>' . esc_html__( 'Glossary Tooltip requires PHP 7.4 or higher.', 'glossary-tooltip' ) . '</p></div>';
+                }
+        );
+        return;
 }
 
@@ -76 +86 @@
     // Signal that SDK was initiated.
     do_action( 'gtt_fs_loaded' );
+
+    // Freemius guideline: no uninstall.php (it would swallow the uninstall
+    // event + feedback). Clean up on its after_uninstall action instead.
+    gtt_fs()->add_action( 'after_uninstall', 'gtt_uninstall_cleanup' );
 }
 
@@ -132 +146 @@
         }
 );
+
+/**
+ * Removes every option, transient and leftover post meta for one site, but
+ * only if the user opted in via the "Delete data on uninstall" setting.
+ *
+ * @return void
+ */
+function gtt_uninstall_site() {
+
+        $glossary_options = get_option( 'glossary_options' );
+
+        if ( empty( $glossary_options['delete_data_on_uninstall'] ) ) {
+                return;
+        }
+
+        global $wpdb;
+
+        $options = [
+                'glossary_options',
+                'gtt_welcome_completed',
+                'gtt_cache_salt',
+                'gtt_flush_rewrites',
+                'gtt_feedback_state',
+                'gtt_multisite_upgrade_notice',
+                'widget_gtt_search_widget',
+                'widget_gtt_latest_terms_widget',
+                'widget_gtt_categories_widget',
+        ];
+
+        foreach ( $options as $option ) {
+                delete_option( $option );
+        }
+
+        $transients = [
+                'gtt_terms_cache_cs_v3',
+                'gtt_terms_cache_ci_v3',
+                'gtt_terms_cache_cs_v5',
+                'gtt_terms_cache_ci_v5',
+                'gtt_terms_cache_cs_v6',
+                'gtt_terms_cache_ci_v6',
+                'gtt_welcome_message',
+        ];
+
+        foreach ( $transients as $transient ) {
+                delete_transient( $transient );
+        }
+
+        // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching -- one-off cleanup, no cache applies.
+        $wpdb->query(
+                $wpdb->prepare(
+                        "DELETE FROM {$wpdb->options} WHERE option_name LIKE %s OR option_name LIKE %s",
+                        $wpdb->esc_like( '_transient_gtt_parsed_' ) . '%',
+                        $wpdb->esc_like( '_transient_timeout_gtt_parsed_' ) . '%'
+                )
+        );
+
+        // The post type/taxonomies may not be registered during uninstall --
+        // register them just enough for wp_delete_term()/wp_delete_post() to work.
+        register_taxonomy( 'glossary-cat', 'glossary' );
+        register_taxonomy( 'glossary-tag', 'glossary' );
+
+        foreach ( [ 'glossary-cat', 'glossary-tag' ] as $taxonomy ) {
+                $term_ids = get_terms(
+                        [
+                                'taxonomy'   => $taxonomy,
+                                'fields'     => 'ids',
+                                'hide_empty' => false,
+                        ]
+                );
+
+                foreach ( $term_ids as $term_id ) {
+                        wp_delete_term( $term_id, $taxonomy );
+                }
+        }
+
+        $glossary_post_ids = get_posts(
+                [
+                        'post_type'      => 'glossary',
+                        'post_status'    => 'any',
+                        'posts_per_page' => -1,
+                        'fields'         => 'ids',
+                ]
+        );
+
+        foreach ( $glossary_post_ids as $post_id ) {
+                wp_delete_post( $post_id, true );
+        }
+
+        // Per-post overrides live on regular posts and pages, so deleting the
+        // glossary post type is not enough to clean them up.
+        $meta_keys = [
+                'glossary_highlight_override',
+                'glossary_tooltip_override',
+                'glossary_disable_highlight',
+                'glossary_highlighting',
+                'glossary_index',
+                'glossary_synonyms',
+                'glossary_abbreviation',
+                'glossary_custom_url',
+        ];
+
+        foreach ( $meta_keys as $meta_key ) {
+                delete_post_meta_by_key( $meta_key );
+        }
+
+        wp_cache_flush();
+}
+
+/**
+ * Freemius after_uninstall handler: runs gtt_uninstall_site() across every
+ * site on a network, mirroring what the removed uninstall.php did.
+ *
+ * @return void
+ */
+function gtt_uninstall_cleanup() {
+        if ( is_multisite() ) {
+                $site_ids = get_sites(
+                        [
+                                'fields'                 => 'ids',
+                                'number'                 => 0,
+                                'update_site_meta_cache' => false,
+                        ]
+                );
+
+                foreach ( $site_ids as $site_id ) {
+                        switch_to_blog( $site_id );
+                        gtt_uninstall_site();
+                        restore_current_blog();
+                }
+        } else {
+                gtt_uninstall_site();
+        }
+}

glossary-tooltip/trunk/readme.txt

@@ -6 +6 @@
 Requires PHP: 7.4
 Tested up to: 7.1
-Stable tag: 3.0.5
+Stable tag: 3.0.6
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.txt
@@ -214 +214 @@
 == Upgrade Notice ==
 
+= 3.0.6 =
+
+* Fixes static front pages not highlighting terms.
+* Removes the double tooltip when the title attribute is enabled.
+* Validates double-click Wikipedia links to http/https only.
+
 = 3.0.5 =
 
@@ -239 +245 @@
 
 == Changelog ==
+
+= 3.0.6 =
+
+* Fixed: glossary terms now highlight on a static front page.
+* Fixed: native title attribute no longer adds a second tooltip.
+* Fixed: double-click Wikipedia URLs are restricted to http/https.
 
 = 3.0.5 =