WordPress.org
Get WordPress

Plugin Directory

Changeset 3388663


Ignore:
Timestamp:
11/03/2025 07:50:19 AM (4 months ago)
Author:
cartcoder
Message:

updated version to 4.0.4

Location:
accessibility-assistant/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • accessibility-assistant/trunk/accessibility_assistant.php

    r3386864 r3388663  
    55    Description: ADA, EAA, AODA & WCAG Compliance Widget for Website Accessibility
    66    Author: CartCoder
    7     Version: 4.0.3
     7    Version: 4.0.4
    88    License: GPLv2 or later
    99    License URI: https://www.gnu.org/licenses/gpl-2.0.html
    … …  
    591591      try {
    592592        var siteId = "<?php echo esc_js($site_id); ?>";
    593         var url = "<?php echo esc_url($base_url); ?>?siteId=" + encodeURIComponent(siteId);
    594593        var widgetSettings = <?php echo wp_json_encode($widgetSettings); ?>;
    595594        let loader = null;
    … …  
    976975
    977976            }
    978             // exit;
     977 
    979978          }
    980979        }
    … …  
    991990        }
    992991
    993         // ✅ Show loader initially
    994         insertLoader();
    995 
    996992        // Load the main script
    997         fetch(url, {
    998             method: 'GET',
    999             headers: {
    1000               'Content-Type': 'application/json'
    1001             }
    1002           })
    1003           .then(response => response.json())
    1004           .then(data => {
    1005             if (data.scriptUrl) {
    1006               insertLoader(); // show loader again during script injection
    1007               var script = document.createElement('script');
    1008               script.defer = true;
    1009               script.src = data.scriptUrl + '?ver=' + Math.floor(Math.random() * 1000000);
    1010               script.className = "ada-js";
    1011 
    1012               script.onload = function() {
    1013                 removeLoader();
    1014               };
    1015               script.onerror = function() {
    1016                 removeLoader();
    1017               };
    1018 
    1019               document.head.appendChild(script);
    1020             } else {
    1021               removeLoader();
    1022             }
    1023           })
    1024           .catch(error => {
     993        var scriptUrl = "<?php echo esc_url(get_option('accessibility_url')); ?>";
     994        if (scriptUrl) {
     995          insertLoader(); // show loader again during script injection
     996          var script = document.createElement('script');
     997          script.defer = true;
     998          script.src = scriptUrl + '?ver=' + Math.floor(Math.random() * 1000000);
     999          script.className = "ada-js";
     1000          script.onload = function() {
    10251001            removeLoader();
    1026             console.error("Error fetching accessibility script:", error);
    1027           });
     1002          };
     1003          script.onerror = function() {
     1004            removeLoader();
     1005          };
     1006          document.head.appendChild(script);
     1007        } else {
     1008          removeLoader();
     1009        }
    10281010      } catch (err) {
    10291011        console.error("Accessibility Assistant WP ERROR:", err);

  • accessibility-assistant/trunk/admin/accessibility_counts_dashboard.php

    r3386820 r3388663  
    1818    $access_by_admin = $content['data']['access_by_admin'];
    1919    $current_plan = $content['data']['plan'];
     20    $member_plan = $content['data']['plan_display_name'];
    2021    $is_installation_popup_shown = $content['data']['is_installation_popup_shown'];
    2122    $is_plan_select_popup_shown = $content['data']['is_plan_select_popup_shown'];
    22     if ($is_installation_popup_shown == 0 && $is_plan_select_popup_shown == 0) {
    23 
     23    if ($is_installation_popup_shown == 0 && $is_plan_select_popup_shown == 0 && (strpos(strtolower($member_plan), 'develop') !== false)) {
    2424        require_once 'installation-popup.php';
    2525    }
    26     if ($is_plan_select_popup_shown == 0 && !empty($current_plan) && $is_installation_popup_shown == 1 && $current_plan !== "free") {;
     26    if ($is_plan_select_popup_shown == 0 && !empty($current_plan) && $is_installation_popup_shown == 1 && $current_plan !== "free" && (strpos(strtolower($member_plan), 'develop') !== false)) {
    2727        require_once 'thanyou-popup.php';
    2828    }

  • accessibility-assistant/trunk/admin/languages-listing.php

    r3386820 r3388663  
    1616    update_option('accessibility_plan', $current_plan);
    1717}
    18 $member_plan = $content['data']['plan_display_name'];
     18
    1919
    2020if ($content) {
    2121    $access_by_admin = $content['data']['access_by_admin'];
    2222    $current_plan = $content['data']['plan'];
    23 
     23    $member_plan = $content['data']['plan_display_name'];
    2424    $is_installation_popup_shown = $content['data']['is_installation_popup_shown'];
    2525    $is_plan_select_popup_shown = $content['data']['is_plan_select_popup_shown'];
    … …  
    3636
    3737if (empty($accessibility_url)) {
    38     update_option('accessibility_url', sanitize_text_field($content['data']['url']));
     38    $url_data = assistant_api_call('/wordpress/script', ['siteId' => $shopid], 'get');
     39    $js_url = $url_data['scriptUrl'];
     40    update_option('accessibility_url', $js_url);
    3941}
    4042
    … …  
    5860<div class="ada-cc-languages">
    5961
    60    <div class="ada-cc-searchmain">
     62    <div class="ada-cc-searchmain">
    6163        <div class="ada-cc-left">
    6264            <div class="ada-cc-bottom">

  • accessibility-assistant/trunk/admin/menu-settings.php

    r3386820 r3388663  
    1717    update_option('accessibility_plan', $current_plan);
    1818}
    19 $member_plan = $content['data']['plan_display_name'];
     19
    2020?>
    2121
    … …  
    2323
    2424if ($content) {
    25 
     25    $member_plan = $content['data']['plan_display_name'];
    2626    $access_by_admin = $content['data']['access_by_admin'];
    2727    $current_plan = $content['data']['plan'];
    … …  
    444444
    445445
    446             // die;
    447             // echo "<pre>";
    448             // print_r($send_data);
    449             // echo "</pre>";
    450446            $returnsenddata = assistant_api_call('/updateShopData', $send_data, 'post');
    451             //  echo 'here';
    452             // echo "<pre>";
    453             // print_r($returnsenddata);
    454             // echo "</pre>";
    455             // echo 'here2';
     447
    456448            if ($returnsenddata['status'] == 200) {
    457449
    … …  
    475467
    476468if (empty($accessibility_url)) {
    477     update_option('accessibility_url', sanitize_text_field($content['data']['url']));
     469    $url_data = assistant_api_call('/wordpress/script', ['siteId' => $shopid], 'get');
     470    $js_url = $url_data['scriptUrl'];
     471    update_option('accessibility_url', $js_url);
    478472}
    479473if ($access_by_admin == '1') {
    … …  
    510504
    511505    <div class="ada-cc-plan-specific-msg">
    512       <div class="ada-cc-plan-specific-main">
     506        <div class="ada-cc-plan-specific-main">
    513507            <!--plan specific message Start-->
    514508            <?php
    … …  
    991985                                                                                                        echo "checked";
    992986                                                                                                    } ?> <?php if ($current_plan == 'basic' || $current_plan == 'pro' || $current_plan == '' || $current_plan == 'free') {
    993                                                                                                                                                 echo 'disabled';
    994                                                                                                                                             } ?> />
     987                                                                                                                echo 'disabled';
     988                                                                                                            } ?> />
    995989                                        <span class="ada-cc-span" for="hover_text"></span>
    996990                                        <label for="hover_text"><?php _e('Disable Hover Text', 'accessibility-assistant'); ?></label>

  • accessibility-assistant/trunk/admin/plan-list.php

    r3386820 r3388663  
    1515    update_option('accessibility_plan', $current_plan);
    1616}
    17 $member_plan = $content['data']['plan_display_name'];
     17
    1818$plugin_url = plugin_dir_url(__FILE__);
    1919
    2020if ($content) {
    21 
     21    $member_plan = $content['data']['plan_display_name'];
    2222    $access_by_admin = $content['data']['access_by_admin'];
    2323    $current_plan = $content['data']['plan'];
    … …  
    3737        echo "<p class='free-trial-note'>" . esc_html__('You have admin access', 'accessibility-assistant') . "</p>";
    3838    }
    39      if (!empty($current_plan) && strpos(strtolower($member_plan), 'develop') !== false) {
     39    if (!empty($current_plan) && strpos(strtolower($member_plan), 'develop') !== false) {
    4040        echo "<p class='free-trial-note'>You have member access</p>";
    4141    }
    … …  
    153153
    154154
    155    <div class="ada-cc-searchmain">
     155    <div class="ada-cc-searchmain">
    156156        <div class="ada-cc-left">
    157157            <div class="ada-cc-bottom">
    158                   <p class="ada-cc-dash-text"><?php esc_html_e('Plans', 'accessibility-assistant'); ?></p>
     158                <p class="ada-cc-dash-text"><?php esc_html_e('Plans', 'accessibility-assistant'); ?></p>
    159159            </div>
    160160        </div>
    … …  
    168168
    169169
    170  <!--plan specific message Start-->
     170    <!--plan specific message Start-->
    171171
    172172
    … …  
    175175        <div class="ada-cc-plan-specific-main">
    176176            <!--plan specific message Start-->
    177          
     177
    178178            <!--plan specific message End-->
    179179        </div>
    … …  
    284284    </div>
    285285    <!--plan specific message End-->
    286    
     286
    287287    <!-- price-plan-main-div -->
    288288    <div class="ada-cc-priceplan-main">
    … …  
    11851185    <!--cancel plan section start-->
    11861186    <?php if ((strpos(strtolower($member_plan), 'develop') !== true)) { ?>
    1187     <div class="ada-cc-price-plan cancel-sub-sec-main" <?php if ($current_plan === 'free') echo 'style="display:none;"'; ?>>
    1188         <div class="cancel-sub-sec">
    1189             <p class="cancel-plan-note">
    1190                 <strong><?php _e('Note:', 'accessibility-assistant'); ?></strong>
    1191                 <?php _e('To discontinue using this plugin, please cancel your active subscription by clicking the button below.', 'accessibility-assistant'); ?>
    1192             </p>
    1193             <button class="cancel-plan-btn" <?php if ($current_plan == '') {
    1194                                                 echo 'disabled';
    1195                                             } ?>><?php _e('Cancel Plan', 'accessibility-assistant'); ?></button>
     1187        <div class="ada-cc-price-plan cancel-sub-sec-main" <?php if ($current_plan === 'free') echo 'style="display:none;"'; ?>>
     1188            <div class="cancel-sub-sec">
     1189                <p class="cancel-plan-note">
     1190                    <strong><?php _e('Note:', 'accessibility-assistant'); ?></strong>
     1191                    <?php _e('To discontinue using this plugin, please cancel your active subscription by clicking the button below.', 'accessibility-assistant'); ?>
     1192                </p>
     1193                <button class="cancel-plan-btn" <?php if ($current_plan == '') {
     1194                                                    echo 'disabled';
     1195                                                } ?>><?php _e('Cancel Plan', 'accessibility-assistant'); ?></button>
     1196            </div>
    11961197        </div>
    1197     </div>
    11981198    <?php } ?>
    11991199    <!--cancel plan section end-->

  • accessibility-assistant/trunk/admin/scanner.php

    r3386820 r3388663  
    2222
    2323if (empty($accessibility_url)) {
    24     update_option('accessibility_url', sanitize_text_field($content['data']['url']));
     24    $url_data = assistant_api_call('/wordpress/script', ['siteId' => $shopid], 'get');
     25    $js_url = $url_data['scriptUrl'];
     26    update_option('accessibility_url', $js_url);
    2527}
    2628
    … …  
    6264    <!--plan specific message Start-->
    6365    <div class="ada-cc-plan-specific-msg">
    64          <div class="ada-cc-plan-specific-main">
     66        <div class="ada-cc-plan-specific-main">
    6567            <!--plan specific message Start-->
    6668            <?php

  • accessibility-assistant/trunk/admin/widget-settings.php

    r3386820 r3388663  
    1616    update_option('accessibility_plan', $current_plan);
    1717}
    18 $member_plan = $content['data']['plan_display_name'];
     18
    1919
    2020?>
    … …  
    2424if ($content) {
    2525    $access_by_admin = $content['data']['access_by_admin'];
    26 
     26    $member_plan = $content['data']['plan_display_name'];
    2727    $current_plan = $content['data']['plan'];
    2828
    … …  
    155155
    156156if (empty($accessibility_url)) {
    157     update_option('accessibility_url', sanitize_text_field($content['data']['url']));
     157    $url_data = assistant_api_call('/wordpress/script', ['siteId' => $shopid], 'get');
     158    $js_url = $url_data['scriptUrl'];
     159    update_option('accessibility_url', $js_url);
    158160}
    159161

  • accessibility-assistant/trunk/readme.txt

    r3386832 r3388663  
    320320*API domain changed
    321321
     322= 4.0.4 =
     323*Load cdn directly on website
     324
    322325**Explore More Accessibility Options:**
    323326[Accessibility Assistant Website](https://accessibilityassistant.com/)
Note: See TracChangeset for help on using the changeset viewer.