WordPress.org
Get WordPress

Plugin Directory

Changeset 2088935


Ignore:
Timestamp:
05/16/2019 08:16:24 AM (7 years ago)
Author:
nir0ma
Message:

1.3.0

Location:
matomo-tracker
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • matomo-tracker/trunk/README.txt

    r1957367 r2088935  
    44Tags: matomo, piwik, analytics, tracking code
    55Requires at least: 3.0.1
    6 Tested up to: 4.9.8
     6Tested up to: 5.2
    77Requires PHP: 5.6.0
    8 Stable tag: 1.2.3
     8Stable tag: 1.3.0
    99License: GPLv2 or later
    1010License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    7070* Added an option to disable logged-in users tracking
    7171
    72 = 1.2.3 =
     72= 1.3.0 =
    7373* Fixed track.js loading in header
     74
     75= 1.3.0 =
     76* Fixed tracking issue for subfolder install

  • matomo-tracker/trunk/inc/frontend/class-frontend.php

    r1957367 r2088935  
    128128        echo '<!-- MATOMO TRACKING CODE DISABLED FOR '. get_option( $this->plugin_name.'-users-auth' ) .' USERS -->';
    129129    }
    130     /*
    131     private function update_tracker_settings() {
    132         if ( get_option( $this->plugin_name.'-tracking-mode' ) != 'php' && !empty(get_option( $this->plugin_name.'-url' )) && !empty(get_option( $this->plugin_name.'-tracking-id' )) && !empty(get_option( $this->plugin_name.'-token' )) ) {
    133             $piwikJsFile = plugin_dir_url( __FILE__ ) . 'track.js';
    134             file_put_contents($piwikJsFile, $this->get_javascript_tracking_code());
    135         }
    136     }
    137     */
    138    
    139 
    140 
    141    
    142130   
    143131    private function get_javascript_tracking_code() {
    144132        $currentDomain = get_site_url();
     133        $parse = parse_url($currentDomain);
    145134        $piwikFileDir = str_replace($currentDomain, "", plugin_dir_url( __FILE__ ) );
     135        if (!empty($parse['path'])) $piwikFileDir = $parse['path'] . $piwikFileDir;
    146136        $currentDomain = preg_replace("(^https?:)", "", $currentDomain );
    147137        $piwikId = get_option( $this->plugin_name.'-tracking-id' );
    148138        update_option( $this->plugin_name.'-frontend', plugin_dir_url( __FILE__ ) );
    149         return 'var _paq = _paq || []; _paq.push(["trackPageView"]);_paq.push(["enableLinkTracking"]);(function() {var u="'. $currentDomain .'";var v= "'. $piwikFileDir .'";_paq.push(["setTrackerUrl", u+v+"piwik.php"]); _paq.push(["setSiteId", "'. $piwikId .'"]);var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0];g.type="text/javascript"; g.async=true; g.defer=true; g.src=u+v+"piwik.php";console.log(u+v+"piwik.php"); s.parentNode.insertBefore(g,s);})();';
    150         /*
    151         return 'var _paq = _paq || []; _paq.push(["trackPageView"]); _paq.push(["enableLinkTracking"]); (function() {var u="'. $piwikFileDir .'piwik.php"; _paq.push(["setTrackerUrl", u]); _paq.push(["setSiteId", "'. $piwikId .'"]); var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript"; g.async=true; g.defer=true; g.src=u; s.parentNode.insertBefore(g,s); })();';
    152         */
     139        return 'var _paq = _paq || []; _paq.push(["trackPageView"]);_paq.push(["enableLinkTracking"]);(function() {var u="'. $currentDomain .'";var v= "'. $piwikFileDir .'";_paq.push(["setTrackerUrl", u+v+"piwik.php"]); _paq.push(["setSiteId", "'. $piwikId .'"]);var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0];g.type="text/javascript"; g.async=true; g.defer=true; g.src=u+v+"piwik.php";s.parentNode.insertBefore(g,s);})();';
    153140    }
    154    
    155141   
    156142    public function disallow_javascript_tracking( $output, $public ) {

  • matomo-tracker/trunk/inc/frontend/piwik.php

    r1949242 r2088935  
    1515    define( 'WP_USE_THEMES', false );
    1616    $root = $_SERVER['DOCUMENT_ROOT'];
     17    $file = $_SERVER['REQUEST_URI'];
     18    if (strpos($file, '/wp-content') !== 0) {//CHECK FOR SUBFOLDER INSTALL
     19        $dirs = explode("/", $file);
     20        foreach ($dirs as $dir) {
     21            if($dir === 'wp-content') break;
     22            $root = rtrim($root, '/');
     23            $root .= '/'.$dir;
     24        }
     25    }
    1726    require_once($root.'/wp-load.php');
    1827    include_once($root.'/wp-admin/includes/plugin.php' );

  • matomo-tracker/trunk/matomo-tracker.php

    r1957367 r2088935  
    1616 * Plugin URI:        https://wordpress.org/plugins/matomo-tracker/
    1717 * Description:       Matomo tracker adds matomo (formerly piwik) tracking code to your website while hiding your matomo installation url
    18  * Version:           1.2.3
     18 * Version:           1.3.0
    1919 * Author:            Niroma
    2020 * Author URI:        https://www.niroma.net/
    … …  
    4040define( NS . 'PLUGIN_NAME', 'matomo-tracker' );
    4141
    42 define( NS . 'PLUGIN_VERSION', '1.2.3' );
     42define( NS . 'PLUGIN_VERSION', '1.3.0' );
    4343
    4444define( NS . 'PLUGIN_NAME_DIR', plugin_dir_path( __FILE__ ) );
Note: See TracChangeset for help on using the changeset viewer.