WordPress.org
Get WordPress

Plugin Directory

Changeset 2778337


Ignore:
Timestamp:
08/31/2022 02:06:05 PM (4 years ago)
Author:
wecantrack
Message:

1.4.1 release

Location:
wecantrack
Files:
54 added
7 edited

Legend:

Unmodified
Added
Removed

  • wecantrack/trunk/WecantrackAdmin.php

    r2622887 r2778337  
    2323        if ($api_key = get_option('wecantrack_api_key')) {
    2424            if (empty($version) || $version !== WECANTRACK_VERSION) {
    25                 $domainURL = WecantrackHelper::get_domain_of_site_url();
    26                 WecantrackHelper::update_tracking_code($api_key, $domainURL);
     25                $domainURL = home_url();
     26
     27                try {
     28                    WecantrackHelper::update_tracking_code($api_key, $domainURL);
     29                } catch (\Exception $e) {}
     30
    2731                WecantrackHelper::update_user_website_information($api_key, $domainURL);
    2832                update_option('wecantrack_version', WECANTRACK_VERSION);
    … …  
    8589        }
    8690
    87         $domainURL = WecantrackHelper::get_domain_of_site_url();
    88 
    89         WecantrackHelper::update_tracking_code($api_key, $domainURL);
     91        $domainURL = home_url();
     92
     93        try {
     94            WecantrackHelper::update_tracking_code($api_key, $domainURL);
     95            $data['has_website'] = true;
     96        } catch (\Exception $e) {
     97            $data['has_website'] = false;
     98            error_log('WCT Plugin: the_form_response() e_msg:'.$e->getMessage());
     99        }
     100
    90101        WecantrackHelper::update_user_website_information($api_key, $domainURL);
    91102
    … …  
    221232    public function enqueue_scripts()
    222233    {
    223         $site_url = WecantrackHelper::get_domain_of_site_url();
     234        $site_url = home_url();
    224235
    225236        $params = array (
    … …  
    274285            ));
    275286
    276             $code = wp_remote_retrieve_response_code($response);
    277             if ($code != 200) {
    278                 if ($code == 401) {
    279                     throw new \Exception("Unauthorised");
    280                 }
    281                 throw new \Exception("wecantrack (get_user_information) request returned error code: {$code}");
    282             }
    283287            $response = wp_remote_retrieve_body($response);
    284288            $response = json_decode($response, true);

  • wecantrack/trunk/WecantrackApp.php

    r2622887 r2778337  
    7575
    7676            $refreshed = 0;
     77            $extra = [];
     78
     79            $domainURL = home_url();
     80            $extra['home_url'] = $domainURL;
    7781
    7882            if (isset($_GET['refresh'])) {
    … …  
    8690                    }
    8791
    88                     $domainURL = WecantrackHelper::get_domain_of_site_url();
    89 
    90                     WecantrackHelper::update_tracking_code($api_key, $domainURL);
     92                    try {
     93                        WecantrackHelper::update_tracking_code($api_key, $domainURL);
     94                        $extra['update_tracking_code'] = true;
     95                    } catch (\Exception $e) {
     96                        $extra['update_tracking_code'] = false;
     97                    }
     98
    9199                    WecantrackHelper::update_user_website_information($api_key, $domainURL);
    92100                    WecantrackApp::wecantrack_get_domain_patterns($api_key, true);
    … …  
    109117                'refreshed' => $refreshed,
    110118                'patterns' => unserialize(get_option('wecantrack_domain_patterns')),
     119                'extra' => $extra
    111120            ]);
    112121
    … …  
    256265        // check if the full url matches to any regex patterns
    257266        foreach($patterns['regexOrigins'] as $pattern) {
    258             if (preg_match('~'.$pattern.'~i', $original_url)) {
     267            if (preg_match('~'.$pattern.'~', $original_url)) {
    259268                return true;
    260269            }

  • wecantrack/trunk/WecantrackHelper.php

    r2622887 r2778337  
    1111     * @param $api_key
    1212     * @param $site_url
     13     * @throws Exception
    1314     */
    1415    public static function update_tracking_code($api_key, $site_url)
    1516    {
    16         try {
    17             $tracking_code = stripslashes(self::get_user_tracking_code($api_key, urlencode($site_url)));
    18         } catch (\Exception $e) {
    19             // supress the error
    20             error_log('WCT Plugin: unable to update user tracking code');
    21         }
     17        $tracking_code = stripslashes(self::get_user_tracking_code($api_key, urlencode($site_url)));
    2218
    2319        if (!empty($tracking_code) && (!get_option('wecantrack_snippet') || get_option('wecantrack_snippet') != $tracking_code)) {
    … …  
    5854    public static function get_user_tracking_code($api_key, $site_url)
    5955    {
    60         try {
    61             $api_url = WECANTRACK_API_BASE_URL . '/api/v1/user/tracking_code?site_url=' . $site_url;
    62             $response = wp_remote_get($api_url, array(
    63                 'headers' => array(
    64                     'x-api-key' => $api_key,
    65                     'Content-Type' => 'text/plain',
    66                     'x-wp-version' => WECANTRACK_VERSION
    67                 ),
    68             ));
     56        $api_url = WECANTRACK_API_BASE_URL . '/api/v1/user/tracking_code?site_url=' . $site_url;
     57        $response = wp_remote_get($api_url, array(
     58            'timeout' => 10,
     59            'headers' => array(
     60                'x-api-key' => $api_key,
     61                'Content-Type' => 'text/plain',
     62                'x-wp-version' => WECANTRACK_VERSION,
     63            ),
     64            'sslverify' => WecantrackHelper::get_sslverify_option()
     65        ));
    6966
    70             $code = wp_remote_retrieve_response_code($response);
     67        $code = wp_remote_retrieve_response_code($response);
     68        $response = wp_remote_retrieve_body($response);
    7169
    72             if ($code != 200) {
    73                 throw new \Exception("wecantrack (get_user_tracking_code) request returned error code: {$code}");
    74             }
    75             $response = wp_remote_retrieve_body($response);
    76             $data = json_decode($response, true);
    77 
    78             if (!empty($data['error'])) {
    79                 if ($data['error'] == 'no site found') {
    80                     throw new \Exception(
    81                         esc_html__(sprintf('Website %s not found in your wecantrack account', urldecode($site_url)), 'wecantrack')
    82                     );
    83                 }
    84             }
    85 
    86         } catch (\Exception $e) {
    87             return array('error' => $e->getMessage());
     70        if ($code === 200) {
     71            return $response;
    8872        }
    8973
    90         return $response;
     74        if ($code === 404) {
     75            throw new \Exception(
     76                esc_html__(sprintf('Website `%s` not found in your We Can Track account', urldecode($site_url)), 'wecantrack')
     77            );
     78        } else {
     79            throw new \Exception(
     80                esc_html__(sprintf('Bad request when fetching website %s', urldecode($site_url)), 'wecantrack')
     81            );
     82        }
    9183    }
    9284
    … …  
    127119    }
    128120
    129     public static function get_domain_of_site_url()
    130     {
    131         $domainURL = parse_url(home_url());
    132         return $domainURL['scheme'].'://'.$domainURL['host'];
    133     }
    134 
    135121    public static function get_sslverify_option()
    136122    {

  • wecantrack/trunk/js/admin.js

    r2468797 r2778337  
    3232            typeof response.total_active_network_accounts === 'undefined'
    3333            ||
    34             typeof response.websites === 'undefined'
     34            typeof response.has_website === 'undefined'
    3535            ||
    3636            typeof response.features === 'undefined'
    … …  
    5050        }
    5151
    52         var website = false;
    53 
    54         if (typeof response.websites !== 'undefined') {
    55             for (var i = 0; response.websites.length > i; i++) {
    56                 if (response.websites[i].url.includes(params.site_url)) {
    57                     website = true;
    58                     break;
    59                 }
    60             }
    61         }
    62 
    63         if (website) {
     52        if (response.has_website) {
    6453            $('.wecantrack-prerequisites .wecantrack-preq-feature i').removeClass('dashicons-no').addClass('dashicons-yes');
    6554            $('.wecantrack-prerequisites .wecantrack-preq-feature span').text(params.lang_website_added);
    … …  
    10897            data: ajax_form_data
    10998        }).done( function( response ) { // response from the PHP action
    110             console.log(response);
    11199            response = JSON.parse(response);
    112100            if (typeof response.error !== 'undefined' && response.error.indexOf('Unauthorised') !== -1) {
    … …  
    114102                reset_form();
    115103            } else if (typeof response.error !== 'undefined' ) {
    116                 error_message(params.lang_invalid_request);
     104                error_message(response.error);
    117105                reset_form();
    118106            } else {

  • wecantrack/trunk/readme.txt

    r2654287 r2778337  
    33Tags: affiliate, publisher, analytics, conversion tracking, sale attribution, dashboard, subid, google analytics, link, google ads, facebook, data studio, we can track, wecantrack, tracking tool
    44Requires at least: 4.6
    5 Tested up to: 5.8
     5Tested up to: 5.9.2
    66Requires PHP: 5.6.20
    7 Stable tag: 1.3.0
     7Stable tag: 1.4.1
    88License: GPLv3
    99License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
    … …  
    6060
    6161== Changelog ==
     62
     63= 1.4.1 - 31st August 2022 =
     64* Improved affiliate url pattern matching
     65
     66= 1.4.0 - 16th March 2022 =
     67 * Working on supporting WP multi-site. Better error messages.
    6268
    6369= 1.3.0 - 20th December 2021 =

  • wecantrack/trunk/wecantrack.php

    r2654287 r2778337  
    77Plugin URI: https://wecantrack.com/wordpress
    88Description: Integrate all you affiliate sales in Google Analytics, Google Ads, Facebook, Data Studio and more!
    9 Version: 1.3.0
     9Version: 1.4.1
    1010Author: wecantrack.com
    1111Author URI: https://wecantrack.com
    … …  
    1717if(!defined('ABSPATH')) { die('You are not allowed to call this page directly.'); }
    1818
    19 define('WECANTRACK_VERSION', '1.3.0');
     19define('WECANTRACK_VERSION', '1.4.1');
    2020define('WECANTRACK_PLUGIN_NAME', 'wecantrack');
    2121define('WECANTRACK_PATH', WP_PLUGIN_DIR.'/'.WECANTRACK_PLUGIN_NAME);

  • wecantrack/trunk/wecantrack.pot

    r2654287 r2778337  
    33msgid ""
    44msgstr ""
    5 "Project-Id-Version: WeCanTrack 1.3.0\n"
     5"Project-Id-Version: WeCanTrack 1.4.1\n"
    66"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wecantrack\n"
    77"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    … …  
    1010"Content-Type: text/plain; charset=UTF-8\n"
    1111"Content-Transfer-Encoding: 8bit\n"
    12 "POT-Creation-Date: 2022-01-05T15:23:52+00:00\n"
     12"POT-Creation-Date: 2022-08-31T11:37:24+00:00\n"
    1313"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    1414"X-Generator: WP-CLI 2.4.0\n"
    … …  
    139139msgstr ""
    140140
    141 #: WecantrackAdmin.php:228
     141#: WecantrackAdmin.php:239
    142142msgid "Something went wrong with the request"
    143143msgstr ""
    144144
    145 #: WecantrackAdmin.php:229
     145#: WecantrackAdmin.php:240
    146146msgid "Added at least 1 active network account"
    147147msgstr ""
    148148
    149 #: WecantrackAdmin.php:230
     149#: WecantrackAdmin.php:241
    150150msgid "You have not added at least 1 active network account. To add a network, click here."
    151151msgstr ""
    152152
    153 #: WecantrackAdmin.php:233
     153#: WecantrackAdmin.php:244
    154154msgid "verified"
    155155msgstr ""
    156156
    157 #: WecantrackAdmin.php:234
     157#: WecantrackAdmin.php:245
    158158msgid "Invalid API Key"
    159159msgstr ""
    160160
    161 #: WecantrackAdmin.php:235
     161#: WecantrackAdmin.php:246
    162162msgid "Invalid Request"
    163163msgstr ""
    164164
    165 #: WecantrackAdmin.php:236
     165#: WecantrackAdmin.php:247
    166166msgid "Valid API Key"
    167167msgstr ""
    168168
    169 #: WecantrackAdmin.php:237
     169#: WecantrackAdmin.php:248
    170170msgid "Your changes have been saved"
    171171msgstr ""
    172172
    173 #: WecantrackAdmin.php:238
     173#: WecantrackAdmin.php:249
    174174msgid "Something went wrong."
    175175msgstr ""
Note: See TracChangeset for help on using the changeset viewer.