Google Analytics for WordPress by MonsterInsights - Version 6.1.7

Version Description

= 6.0.0 =

This is a major release. Please back up your site before upgrading.

Download this release

Release Info

Developer chriscct7
Plugin Icon 128x128 Google Analytics for WordPress by MonsterInsights
Version 6.1.7
Comparing to
See all releases

Code changes from version 6.1.6 to 6.1.7

assets/js/frontend.js CHANGED
@@ -117,7 +117,7 @@ var MonsterInsights = function(){
117
  return inbound_paths;
118
  }
119
 
120
- function __gaTrackerTrackedClickType() {
121
  if ( event.which == 1 ) {
122
  return 'event.which=1';
123
  } else if ( event.which == 2 ) {
@@ -196,7 +196,7 @@ var MonsterInsights = function(){
196
  // Start Values Array
197
  valuesArray.el = el;
198
  valuesArray.ga_loaded = __gaTrackerLoaded();
199
- valuesArray.click_type = __gaTrackerTrackedClickType();
200
 
201
  /* If GA is blocked or not loaded, or not main|middle|touch click then don't track */
202
  if ( ! __gaTrackerLoaded() || ! __gaTrackerTrackedClick() ) {
117
  return inbound_paths;
118
  }
119
 
120
+ function __gaTrackerTrackedClickType( event ) {
121
  if ( event.which == 1 ) {
122
  return 'event.which=1';
123
  } else if ( event.which == 2 ) {
196
  // Start Values Array
197
  valuesArray.el = el;
198
  valuesArray.ga_loaded = __gaTrackerLoaded();
199
+ valuesArray.click_type = __gaTrackerTrackedClickType( event );
200
 
201
  /* If GA is blocked or not loaded, or not main|middle|touch click then don't track */
202
  if ( ! __gaTrackerLoaded() || ! __gaTrackerTrackedClick() ) {
assets/js/frontend.min.js CHANGED
@@ -1,15 +1,15 @@
1
  ;var MonsterInsights=function(){var e=[];this.setLastClicked=function(t,n,i){t=typeof t!=='undefined'?t:[];n=typeof n!=='undefined'?n:[];i=typeof i!=='undefined'?i:!1;e.valuesArray=t;e.fieldsArray=n};this.getLastClicked=function(){return e};function r(){if(monsterinsights_frontend.is_debug_mode==='true'||window.monsterinsights_debug_mode){return!0}
2
  else{return!1}};function t(t,n){t=typeof t!=='undefined'?t:[];n=typeof n!=='undefined'?n:{};__gaTracker('send',n);e.valuesArray=t;e.fieldsArray=n;e.tracked=!0;i('Tracked: '+t.type);i(e)};function n(t){t=typeof t!=='undefined'?t:[];e.valuesArray=t;e.fieldsArray=[];e.tracked=!1;i('Not Tracked: '+t.exit);i(e)};function i(e){if(r()){console.dir(e)}};function l(e){return e.replace(/^\s+|\s+$/gm,'')};function s(){var n=0,e=document.domain,i=e.split('.'),t='_gd'+(new Date()).getTime();while(n<(i.length-1)&&document.cookie.indexOf(t+'='+t)==-1){e=i.slice(-1-(++n)).join('.');document.cookie=t+'='+t+';domain='+e+';'};document.cookie=t+'=;expires=Thu, 01 Jan 1970 00:00:01 GMT;domain='+e+';';return e};function f(e){e=e.substring(0,(e.indexOf('#')==-1)?e.length:e.indexOf('#'));e=e.substring(0,(e.indexOf('?')==-1)?e.length:e.indexOf('?'));e=e.substring(e.lastIndexOf('/')+1,e.length);if(e.length>0&&e.indexOf('.')!==-1){e=e.substring(e.indexOf('.')+1);return e}
3
- else{return''}};function h(){return __gaTracker.hasOwnProperty('loaded')&&__gaTracker.loaded==!0};function v(){return event.which==1||event.which==2||event.metaKey||event.ctrlKey||event.shiftKey||event.altKey};function d(){var e=[];if(typeof monsterinsights_frontend.download_extensions=='string'){e=monsterinsights_frontend.download_extensions.split(',')};return e};function u(){var e=[];if(typeof monsterinsights_frontend.inbound_paths=='string'){e=monsterinsights_frontend.inbound_paths.split(',')};return e};function p(){if(event.which==1){return'event.which=1'}
4
- else if(event.which==2){return'event.which=2'}
5
- else if(event.metaKey){return'metaKey'}
6
- else if(event.ctrlKey){return'ctrlKey'}
7
- else if(event.shiftKey){return'shiftKey'}
8
- else if(event.altKey){return'altKey'}
9
- else{return''}};function y(e){var i=d(),o=u(),n='unknown',r=e.href,p=f(e.href),h=s(),c=e.hostname,g=e.protocol,v=e.pathname,t,a;if(r.match(/^javascript\:/i)){n='internal'}
10
  else if(l(g)=='mailto'||l(g)=='mailto:'){n='mailto'}
11
  else if(c.length>0&&h.length>0&&!c.endsWith(h)){n='external'}
12
- else if(o.length>0&&v.length>0){for(t=0,a=o.length;t<a;++t){if(o[t].length>0&&v.startsWith(o[t])){n='internal-as-outbound';break}}};if(n==='unknown'&&i.length>0&&p.length>0){for(t=0,a=i.length;t<a;++t){if(i[t].length>0&&r.endsWith(i[t])){n='download';break}}};if(n==='unknown'){n='internal'};return n};function m(e,t){var n=(e.target&&!e.target.match(/^_(self|parent|top)$/i))?e.target:!1;if(t.ctrlKey||t.shiftKey||t.metaKey||t.which==2){n='_blank'};return n};function c(i){var o=i.srcElement||i.target,e=[],a;e.el=o;e.ga_loaded=h();e.click_type=p();if(!h()||!v()){e.exit='loaded';n(e);return}
13
  while(o&&(typeof o.tagName=='undefined'||o.tagName.toLowerCase()!='a'||!o.href)){o=o.parentNode};if(o&&o.href){var c=o.href,C=f(o.href),K=d(),O=u(),L=monsterinsights_frontend.home_url,w=monsterinsights_frontend.track_download_as,b='outbound-link-'+monsterinsights_frontend.internal_label,E=s(),l=y(o),x=m(o,i);e.el=o;e.el_href=o.href;e.el_protocol=o.protocol;e.el_hostname=o.hostname;e.el_port=o.port;e.el_pathname=o.pathname;e.el_search=o.search;e.el_hash=o.hash;e.el_host=o.host;e.debug_mode=r();e.download_extensions=K;e.inbound_paths=O;e.home_url=L;e.track_download_as=w;e.internal_label=b;e.link=c;e.extension=C;e.type=l;e.target=x;e.title=o.title||o.textContent||o.innerText;if(l!=='internal'&&l!=='javascript'){var k=!1,g=function(){if(k){return};k=!0;window.location.href=c},T=function(){e.exit='external';n(e)},A=function(){e.exit='internal-as-outbound';n(e)};if(x||l=='mailto'){if(l=='download'){if(w=='pageview'){a={hitType:'pageview',page:c,};t(e,a)}
14
  else{a={hitType:'event',eventCategory:'download',eventAction:c,eventLabel:e.title,};t(e,a)}}
15
  else if(l=='mailto'){a={hitType:'event',eventCategory:'mailto',eventAction:c,eventLabel:e.title,};t(e,a)}
1
  ;var MonsterInsights=function(){var e=[];this.setLastClicked=function(t,n,i){t=typeof t!=='undefined'?t:[];n=typeof n!=='undefined'?n:[];i=typeof i!=='undefined'?i:!1;e.valuesArray=t;e.fieldsArray=n};this.getLastClicked=function(){return e};function r(){if(monsterinsights_frontend.is_debug_mode==='true'||window.monsterinsights_debug_mode){return!0}
2
  else{return!1}};function t(t,n){t=typeof t!=='undefined'?t:[];n=typeof n!=='undefined'?n:{};__gaTracker('send',n);e.valuesArray=t;e.fieldsArray=n;e.tracked=!0;i('Tracked: '+t.type);i(e)};function n(t){t=typeof t!=='undefined'?t:[];e.valuesArray=t;e.fieldsArray=[];e.tracked=!1;i('Not Tracked: '+t.exit);i(e)};function i(e){if(r()){console.dir(e)}};function l(e){return e.replace(/^\s+|\s+$/gm,'')};function s(){var n=0,e=document.domain,i=e.split('.'),t='_gd'+(new Date()).getTime();while(n<(i.length-1)&&document.cookie.indexOf(t+'='+t)==-1){e=i.slice(-1-(++n)).join('.');document.cookie=t+'='+t+';domain='+e+';'};document.cookie=t+'=;expires=Thu, 01 Jan 1970 00:00:01 GMT;domain='+e+';';return e};function f(e){e=e.substring(0,(e.indexOf('#')==-1)?e.length:e.indexOf('#'));e=e.substring(0,(e.indexOf('?')==-1)?e.length:e.indexOf('?'));e=e.substring(e.lastIndexOf('/')+1,e.length);if(e.length>0&&e.indexOf('.')!==-1){e=e.substring(e.indexOf('.')+1);return e}
3
+ else{return''}};function h(){return __gaTracker.hasOwnProperty('loaded')&&__gaTracker.loaded==!0};function p(){return event.which==1||event.which==2||event.metaKey||event.ctrlKey||event.shiftKey||event.altKey};function d(){var e=[];if(typeof monsterinsights_frontend.download_extensions=='string'){e=monsterinsights_frontend.download_extensions.split(',')};return e};function u(){var e=[];if(typeof monsterinsights_frontend.inbound_paths=='string'){e=monsterinsights_frontend.inbound_paths.split(',')};return e};function v(e){if(e.which==1){return'event.which=1'}
4
+ else if(e.which==2){return'event.which=2'}
5
+ else if(e.metaKey){return'metaKey'}
6
+ else if(e.ctrlKey){return'ctrlKey'}
7
+ else if(e.shiftKey){return'shiftKey'}
8
+ else if(e.altKey){return'altKey'}
9
+ else{return''}};function y(e){var i=d(),o=u(),n='unknown',r=e.href,v=f(e.href),h=s(),c=e.hostname,g=e.protocol,p=e.pathname,t,a;if(r.match(/^javascript\:/i)){n='internal'}
10
  else if(l(g)=='mailto'||l(g)=='mailto:'){n='mailto'}
11
  else if(c.length>0&&h.length>0&&!c.endsWith(h)){n='external'}
12
+ else if(o.length>0&&p.length>0){for(t=0,a=o.length;t<a;++t){if(o[t].length>0&&p.startsWith(o[t])){n='internal-as-outbound';break}}};if(n==='unknown'&&i.length>0&&v.length>0){for(t=0,a=i.length;t<a;++t){if(i[t].length>0&&r.endsWith(i[t])){n='download';break}}};if(n==='unknown'){n='internal'};return n};function m(e,t){var n=(e.target&&!e.target.match(/^_(self|parent|top)$/i))?e.target:!1;if(t.ctrlKey||t.shiftKey||t.metaKey||t.which==2){n='_blank'};return n};function c(i){var o=i.srcElement||i.target,e=[],a;e.el=o;e.ga_loaded=h();e.click_type=v(i);if(!h()||!p()){e.exit='loaded';n(e);return}
13
  while(o&&(typeof o.tagName=='undefined'||o.tagName.toLowerCase()!='a'||!o.href)){o=o.parentNode};if(o&&o.href){var c=o.href,C=f(o.href),K=d(),O=u(),L=monsterinsights_frontend.home_url,w=monsterinsights_frontend.track_download_as,b='outbound-link-'+monsterinsights_frontend.internal_label,E=s(),l=y(o),x=m(o,i);e.el=o;e.el_href=o.href;e.el_protocol=o.protocol;e.el_hostname=o.hostname;e.el_port=o.port;e.el_pathname=o.pathname;e.el_search=o.search;e.el_hash=o.hash;e.el_host=o.host;e.debug_mode=r();e.download_extensions=K;e.inbound_paths=O;e.home_url=L;e.track_download_as=w;e.internal_label=b;e.link=c;e.extension=C;e.type=l;e.target=x;e.title=o.title||o.textContent||o.innerText;if(l!=='internal'&&l!=='javascript'){var k=!1,g=function(){if(k){return};k=!0;window.location.href=c},T=function(){e.exit='external';n(e)},A=function(){e.exit='internal-as-outbound';n(e)};if(x||l=='mailto'){if(l=='download'){if(w=='pageview'){a={hitType:'pageview',page:c,};t(e,a)}
14
  else{a={hitType:'event',eventCategory:'download',eventAction:c,eventLabel:e.title,};t(e,a)}}
15
  else if(l=='mailto'){a={hitType:'event',eventCategory:'mailto',eventAction:c,eventLabel:e.title,};t(e,a)}
googleanalytics.php CHANGED
@@ -6,7 +6,7 @@
6
  * Author: MonsterInsights
7
  * Author URI: https://www.monsterinsights.com/
8
  *
9
- * Version: 6.1.6
10
  * Requires at least: 3.9.0
11
  * Tested up to: 4.7.4
12
  *
@@ -69,7 +69,7 @@ final class MonsterInsights_Lite {
69
  * @access public
70
  * @var string $version Plugin version.
71
  */
72
- public $version = '6.1.6';
73
 
74
  /**
75
  * Plugin file.
6
  * Author: MonsterInsights
7
  * Author URI: https://www.monsterinsights.com/
8
  *
9
+ * Version: 6.1.7
10
  * Requires at least: 3.9.0
11
  * Tested up to: 4.7.4
12
  *
69
  * @access public
70
  * @var string $version Plugin version.
71
  */
72
+ public $version = '6.1.7';
73
 
74
  /**
75
  * Plugin file.
includes/admin/common.php CHANGED
@@ -60,8 +60,8 @@ function monsterinsights_admin_styles() {
60
  wp_register_style( MONSTERINSIGHTS_PLUGIN_SLUG . '-pro-admin-style', plugins_url( 'pro/assets/css/admin.css', MONSTERINSIGHTS_PLUGIN_FILE ), array(), monsterinsights_get_asset_version() );
61
  wp_enqueue_style( MONSTERINSIGHTS_PLUGIN_SLUG . '-pro-admin-style' );
62
  } else if ( file_exists( MONSTERINSIGHTS_PLUGIN_DIR . 'lite/assets/css/admin.css' ) ) {
63
- wp_register_style( MONSTERINSIGHTS_PLUGIN_SLUG . '-only-admin-style', plugins_url( 'lite/assets/css/admin.css', MONSTERINSIGHTS_PLUGIN_FILE ), array(), monsterinsights_get_asset_version() );
64
- wp_enqueue_style( MONSTERINSIGHTS_PLUGIN_SLUG . '-only-admin-style' );
65
  }
66
  }
67
  add_action( 'admin_enqueue_scripts', 'monsterinsights_admin_styles' );
@@ -89,25 +89,25 @@ function monsterinsights_admin_scripts() {
89
 
90
  // Load necessary admin scripts
91
  // Clipboard.js
92
- wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-clipboard-script', plugins_url( 'assets/js/clipboard/clipboard.js', MONSTERINSIGHTS_PLUGIN_FILE ), array( 'jquery' ), monsterinsights_get_asset_version(), true );
93
  wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-clipboard-script' );
94
 
95
  // List.js
96
- wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-list-script', plugins_url( 'assets/js/list/list.js', MONSTERINSIGHTS_PLUGIN_FILE ), array( 'jquery' ), monsterinsights_get_asset_version(), true );
97
  wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-list-script' );
98
 
99
  // Charts.js
100
- wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-chartjs-script', plugins_url( 'assets/js/chartjs/Chart.bundle.js', MONSTERINSIGHTS_PLUGIN_FILE ), array( 'jquery' ), monsterinsights_get_asset_version(), true );
101
  wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-chartjs-script' );
102
 
103
  // Maps
104
- wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-jvectormap-script', plugins_url( 'assets/js/jvectormap/jquery-jvectormap-2.0.3.min.js', MONSTERINSIGHTS_PLUGIN_FILE ), array( 'jquery' ), monsterinsights_get_asset_version(), true );
105
  wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-jvectormap-script' );
106
- wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-jvectormap-world-script', plugins_url( 'assets/js/jvectormap/jquery-jvectormap-world-mill.js', MONSTERINSIGHTS_PLUGIN_FILE ), array( 'jquery', MONSTERINSIGHTS_PLUGIN_SLUG . '-jvectormap-script' ), monsterinsights_get_asset_version(), true );
107
  wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-jvectormap-world-script' );
108
 
109
  // Select300
110
- wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-select300-script', plugins_url( 'assets/js/select300/select300.full.js', MONSTERINSIGHTS_PLUGIN_FILE ), array( 'jquery' ), time() );
111
  wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-select300-script' );
112
 
113
  // Our Admin JS
@@ -124,7 +124,7 @@ function monsterinsights_admin_scripts() {
124
  MONSTERINSIGHTS_PLUGIN_SLUG . '-list-script'
125
  );
126
 
127
- wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-admin-script', plugins_url( 'assets/js/admin' . $suffix . '.js', MONSTERINSIGHTS_PLUGIN_FILE ), $deps, time() );
128
  wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-admin-script' );
129
  wp_localize_script(
130
  MONSTERINSIGHTS_PLUGIN_SLUG . '-admin-script',
@@ -176,10 +176,10 @@ function monsterinsights_admin_scripts() {
176
  )
177
  );
178
  } else if ( file_exists( MONSTERINSIGHTS_PLUGIN_DIR . 'lite/assets/js/admin.js' ) ) {
179
- wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-only-admin-script', plugins_url( 'only/assets/js/admin.js', MONSTERINSIGHTS_PLUGIN_FILE ), $deps, monsterinsights_get_asset_version() );
180
- wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-only-admin-script' );
181
  wp_localize_script(
182
- MONSTERINSIGHTS_PLUGIN_SLUG . '-only-admin-script',
183
  'monsterinsights_admin',
184
  array(
185
  'ajax' => admin_url( 'admin-ajax.php' )
@@ -227,6 +227,7 @@ function monsterinsights_remove_conflicting_asset_files() {
227
 
228
  $scripts = array(
229
  'kad_admin_js', // Pinnacle theme
 
230
  );
231
 
232
  foreach ( $styles as $style ) {
60
  wp_register_style( MONSTERINSIGHTS_PLUGIN_SLUG . '-pro-admin-style', plugins_url( 'pro/assets/css/admin.css', MONSTERINSIGHTS_PLUGIN_FILE ), array(), monsterinsights_get_asset_version() );
61
  wp_enqueue_style( MONSTERINSIGHTS_PLUGIN_SLUG . '-pro-admin-style' );
62
  } else if ( file_exists( MONSTERINSIGHTS_PLUGIN_DIR . 'lite/assets/css/admin.css' ) ) {
63
+ wp_register_style( MONSTERINSIGHTS_PLUGIN_SLUG . '-lite-admin-style', plugins_url( 'lite/assets/css/admin.css', MONSTERINSIGHTS_PLUGIN_FILE ), array(), monsterinsights_get_asset_version() );
64
+ wp_enqueue_style( MONSTERINSIGHTS_PLUGIN_SLUG . '-lite-admin-style' );
65
  }
66
  }
67
  add_action( 'admin_enqueue_scripts', 'monsterinsights_admin_styles' );
89
 
90
  // Load necessary admin scripts
91
  // Clipboard.js
92
+ wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-clipboard-script', plugins_url( 'assets/js/clipboard/clipboard.js', MONSTERINSIGHTS_PLUGIN_FILE ), array( 'jquery' ), monsterinsights_get_asset_version() );
93
  wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-clipboard-script' );
94
 
95
  // List.js
96
+ wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-list-script', plugins_url( 'assets/js/list/list.js', MONSTERINSIGHTS_PLUGIN_FILE ), array( 'jquery' ), monsterinsights_get_asset_version() );
97
  wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-list-script' );
98
 
99
  // Charts.js
100
+ wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-chartjs-script', plugins_url( 'assets/js/chartjs/Chart.bundle.js', MONSTERINSIGHTS_PLUGIN_FILE ), array( 'jquery' ), monsterinsights_get_asset_version() );
101
  wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-chartjs-script' );
102
 
103
  // Maps
104
+ wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-jvectormap-script', plugins_url( 'assets/js/jvectormap/jquery-jvectormap-2.0.3.min.js', MONSTERINSIGHTS_PLUGIN_FILE ), array( 'jquery' ), monsterinsights_get_asset_version() );
105
  wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-jvectormap-script' );
106
+ wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-jvectormap-world-script', plugins_url( 'assets/js/jvectormap/jquery-jvectormap-world-mill.js', MONSTERINSIGHTS_PLUGIN_FILE ), array( 'jquery', MONSTERINSIGHTS_PLUGIN_SLUG . '-jvectormap-script' ), monsterinsights_get_asset_version() );
107
  wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-jvectormap-world-script' );
108
 
109
  // Select300
110
+ wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-select300-script', plugins_url( 'assets/js/select300/select300.full.js', MONSTERINSIGHTS_PLUGIN_FILE ), array( 'jquery' ), monsterinsights_get_asset_version() );
111
  wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-select300-script' );
112
 
113
  // Our Admin JS
124
  MONSTERINSIGHTS_PLUGIN_SLUG . '-list-script'
125
  );
126
 
127
+ wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-admin-script', plugins_url( 'assets/js/admin' . $suffix . '.js', MONSTERINSIGHTS_PLUGIN_FILE ), $deps, monsterinsights_get_asset_version() );
128
  wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-admin-script' );
129
  wp_localize_script(
130
  MONSTERINSIGHTS_PLUGIN_SLUG . '-admin-script',
176
  )
177
  );
178
  } else if ( file_exists( MONSTERINSIGHTS_PLUGIN_DIR . 'lite/assets/js/admin.js' ) ) {
179
+ wp_register_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-lite-admin-script', plugins_url( 'lite/assets/js/admin.js', MONSTERINSIGHTS_PLUGIN_FILE ), $deps, monsterinsights_get_asset_version() );
180
+ wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-lite-admin-script' );
181
  wp_localize_script(
182
+ MONSTERINSIGHTS_PLUGIN_SLUG . '-lite-admin-script',
183
  'monsterinsights_admin',
184
  array(
185
  'ajax' => admin_url( 'admin-ajax.php' )
227
 
228
  $scripts = array(
229
  'kad_admin_js', // Pinnacle theme
230
+ 'dt-chart', // DesignThemes core features plugin
231
  );
232
 
233
  foreach ( $styles as $style ) {
includes/admin/settings/register-settings.php CHANGED
@@ -274,7 +274,7 @@ function monsterinsights_get_registered_settings() {
274
  array()
275
  ),
276
  /** Dimensions Tracking Settings */
277
- 'memberships' => apply_filters('monsterinsights_settings_dimensions',
278
  array()
279
  ),
280
  /** Performance Tracking Settings */
274
  array()
275
  ),
276
  /** Dimensions Tracking Settings */
277
+ 'dimensions' => apply_filters('monsterinsights_settings_dimensions',
278
  array()
279
  ),
280
  /** Performance Tracking Settings */
includes/admin/settings/settings-api.php CHANGED
@@ -43,7 +43,7 @@ function monsterinsights_get_section_settings( $section, $page = 'tracking' ) {
43
  'field_class' => '',
44
  'multiple' => false,
45
  'allowclear' => true,
46
- 'notice_type' => '',
47
  ) );
48
  $output .= monsterinsights_render_field( $args );
49
  }
@@ -133,7 +133,7 @@ function monsterinsights_save_settings() {
133
  'field_class' => '',
134
  'multiple' => false,
135
  'allowclear' => true,
136
- 'notice_type' => '',
137
  ) );
138
 
139
  // Sanitize settings
@@ -142,7 +142,10 @@ function monsterinsights_save_settings() {
142
  $value = apply_filters( 'monsterinsights_settings_sanitize' , $value, $id, $args, $previous_value );
143
 
144
  // Save
145
- monsterinsights_update_option( $id, $value );
 
 
 
146
  }
147
  add_action( 'monsterinsights_tracking_' . $tab . '_tab_notice', 'monsterinsights_updated_settings' );
148
  }
@@ -866,6 +869,23 @@ function monsterinsights_notice_callback( $args ) {
866
  return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
867
  }
868
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
869
  /**
870
  * Hook Callback
871
  *
@@ -912,7 +932,7 @@ function monsterinsights_render_submit_field( $section, $page = 'tracking' ) {
912
  $non_setting_types = monsterinsights_get_non_setting_types();
913
  $submit_button = false;
914
  foreach ( $settings[$section] as $setting ) {
915
- if ( ! empty( $non_setting_types ) && !in_array( $setting['type'], $non_setting_types ) ) {
916
  $submit_button = true;
917
  break;
918
  }
43
  'field_class' => '',
44
  'multiple' => false,
45
  'allowclear' => true,
46
+ 'notice_type' => 'info',
47
  ) );
48
  $output .= monsterinsights_render_field( $args );
49
  }
133
  'field_class' => '',
134
  'multiple' => false,
135
  'allowclear' => true,
136
+ 'notice_type' => 'info',
137
  ) );
138
 
139
  // Sanitize settings
142
  $value = apply_filters( 'monsterinsights_settings_sanitize' , $value, $id, $args, $previous_value );
143
 
144
  // Save
145
+ do_action( 'monsterinsights_settings_save_' . $args['type'], $value, $id, $args, $previous_value );
146
+ if ( ! has_action( 'monsterinsights_settings_save_' . $args['type'] ) ) {
147
+ monsterinsights_update_option( $id, $value );
148
+ }
149
  }
150
  add_action( 'monsterinsights_tracking_' . $tab . '_tab_notice', 'monsterinsights_updated_settings' );
151
  }
869
  return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
870
  }
871
 
872
+ /**
873
+ * Upgrade Notice Callback
874
+ *
875
+ * Renders upgrade notice fields.
876
+ *
877
+ * @since 6.1.7
878
+ * @param array $args Arguments passed by the setting
879
+ *
880
+ * @return void
881
+ */
882
+ function monsterinsights_upgrade_notice_callback( $args ) {
883
+ $html = '<div class="monsterinsights-upsell-box"><h2>' . esc_html( $args['name' ] ) . '</h2>'
884
+ . '<p class="upsell-lite">' . $args['desc'] . '</p>'
885
+ . '</div>';
886
+ return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
887
+ }
888
+
889
  /**
890
  * Hook Callback
891
  *
932
  $non_setting_types = monsterinsights_get_non_setting_types();
933
  $submit_button = false;
934
  foreach ( $settings[$section] as $setting ) {
935
+ if ( ! empty( $non_setting_types ) && ! empty( $setting['type'] ) && ! in_array( $setting['type'], $non_setting_types ) ) {
936
  $submit_button = true;
937
  break;
938
  }
includes/admin/settings/tab-general.php CHANGED
@@ -155,8 +155,10 @@ function monsterinsights_settings_general_tab() {
155
  ?>
156
  <label><input type="radio" name="tracking_mode" value="ga" <?php checked( $tracking_mode, 'ga' ); ?> ><?php esc_html_e('GA.js (Deprecated)', 'google-analytics-for-wordpress'); ?> </label>
157
  <label><input type="radio" name="tracking_mode" value="analytics" <?php checked( $tracking_mode, 'analytics' ); ?> ><?php esc_html_e( 'Analytics.js (Universal Analytics)', 'google-analytics-for-wordpress'); ?> </label>
 
158
  <?php echo monsterinsights_get_message( 'error', sprintf( esc_html__( 'Warning: You\'re currently using deprecated ga.js tracking. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ) );
159
- ?>
 
160
  </td>
161
  </tr>
162
  <?php } ?>
155
  ?>
156
  <label><input type="radio" name="tracking_mode" value="ga" <?php checked( $tracking_mode, 'ga' ); ?> ><?php esc_html_e('GA.js (Deprecated)', 'google-analytics-for-wordpress'); ?> </label>
157
  <label><input type="radio" name="tracking_mode" value="analytics" <?php checked( $tracking_mode, 'analytics' ); ?> ><?php esc_html_e( 'Analytics.js (Universal Analytics)', 'google-analytics-for-wordpress'); ?> </label>
158
+ <?php if ($tracking_mode === 'ga' ) { ?>
159
  <?php echo monsterinsights_get_message( 'error', sprintf( esc_html__( 'Warning: You\'re currently using deprecated ga.js tracking. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ) );
160
+ ?>
161
+ <?php } ?>
162
  </td>
163
  </tr>
164
  <?php } ?>
includes/admin/settings/tab-tracking.php CHANGED
@@ -73,45 +73,34 @@ function monsterinsights_settings_tracking_tab() {
73
  $class = ( 0 === $i ? ' monsterinsights-active' : '' );
74
  ?>
75
  <div id="monsterinsights-sub-tab-<?php echo esc_attr( $id ); ?>" class="monsterinsights-sub-nav-tab monsterinsights-nav-tab<?php echo esc_attr( $class ); ?>">
76
- <?php
77
- if ( has_action( 'monsterinsights_tab_settings_tracking_' . $id ) ) {
 
 
78
  /**
79
  * Developer Alert:
80
  *
81
- * This internal use action will be removed soon. DO NOT USE.
 
 
82
  */
83
- do_action( 'monsterinsights_tab_settings_tracking_' . $id );
84
- } else {
85
  ?>
86
- <?php echo '<h2 class="monsterinsights-sub-tab-header">' . esc_html( $item['title'] ) . '</h2>'; ?>
87
- <div class="monsterinsights-subtab-settings-notices">
88
- <?php
89
- // Output any notices now
90
- /**
91
- * Developer Alert:
92
- *
93
- * Per the README, this is considered an internal hook and should
94
- * not be used by other developers. This hook's behavior may be modified
95
- * or the hook may be removed at any time, without warning.
96
- */
97
- do_action( 'monsterinsights_tracking_' . $id . '_tab_notice' );
98
- ?>
99
- </div>
100
- <!-- Settings Form -->
101
- <form id="monsterinsights-tracking-<?php echo esc_attr( $id );?>-tab" method="post">
102
- <table class="form-table">
103
- <tbody>
104
- <?php
105
- //do_action( 'monsterinsights_settings_tab_top_' . $id );
106
- echo monsterinsights_get_section_settings( $id, 'tracking' );
107
- //do_action( 'monsterinsights_settings_tab_bottom_' . $id );
108
- ?>
109
- </tbody>
110
- </table>
111
- <?php echo monsterinsights_render_submit_field( $id, 'tracking' ); ?>
112
- </form>
113
- <?php } ?>
114
  </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
115
  <?php
116
  $i++;
117
  }
73
  $class = ( 0 === $i ? ' monsterinsights-active' : '' );
74
  ?>
75
  <div id="monsterinsights-sub-tab-<?php echo esc_attr( $id ); ?>" class="monsterinsights-sub-nav-tab monsterinsights-nav-tab<?php echo esc_attr( $class ); ?>">
76
+ <?php echo '<h2 class="monsterinsights-sub-tab-header">' . esc_html( $item['title'] ) . '</h2>'; ?>
77
+ <div class="monsterinsights-subtab-settings-notices">
78
+ <?php
79
+ // Output any notices now
80
  /**
81
  * Developer Alert:
82
  *
83
+ * Per the README, this is considered an internal hook and should
84
+ * not be used by other developers. This hook's behavior may be modified
85
+ * or the hook may be removed at any time, without warning.
86
  */
87
+ do_action( 'monsterinsights_tracking_' . $id . '_tab_notice' );
 
88
  ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
89
  </div>
90
+ <!-- Settings Form -->
91
+ <form id="monsterinsights-tracking-<?php echo esc_attr( $id );?>-tab" method="post">
92
+ <table class="form-table">
93
+ <tbody>
94
+ <?php
95
+ //do_action( 'monsterinsights_settings_tab_top_' . $id );
96
+ echo monsterinsights_get_section_settings( $id, 'tracking' );
97
+ //do_action( 'monsterinsights_settings_tab_bottom_' . $id );
98
+ ?>
99
+ </tbody>
100
+ </table>
101
+ <?php echo monsterinsights_render_submit_field( $id, 'tracking' ); ?>
102
+ </form>
103
+ </div>
104
  <?php
105
  $i++;
106
  }
includes/frontend/tracking/class-tracking-analytics.php CHANGED
@@ -188,18 +188,18 @@ class MonsterInsights_Tracking_Analytics extends MonsterInsights_Tracking_Abstra
188
  <!-- This site uses the Google Analytics by MonsterInsights plugin v<?php echo MONSTERINSIGHTS_VERSION; ?> - Using Analytics tracking - https://www.monsterinsights.com/ -->
189
  <?php if ( monsterinsights_get_ua() ) { ?>
190
  <script type="text/javascript" data-cfasync="false">
191
- // Function to detect opted out users
192
  function __gaTrackerIsOptedOut() {
193
  return document.cookie.indexOf(disableStr + '=true') > -1;
194
  }
195
 
196
- // Disable tracking if the opt-out cookie exists.
197
  var disableStr = 'ga-disable-<?php echo monsterinsights_get_ua(); ?>';
198
  if ( __gaTrackerIsOptedOut() ) {
199
  window[disableStr] = true;
200
  }
201
 
202
- // Opt-out function
203
  function __gaTrackerOptout() {
204
  document.cookie = disableStr + '=true; expires=Thu, 31 Dec 2099 23:59:59 UTC; path=/';
205
  window[disableStr] = true;
188
  <!-- This site uses the Google Analytics by MonsterInsights plugin v<?php echo MONSTERINSIGHTS_VERSION; ?> - Using Analytics tracking - https://www.monsterinsights.com/ -->
189
  <?php if ( monsterinsights_get_ua() ) { ?>
190
  <script type="text/javascript" data-cfasync="false">
191
+ /* Function to detect opted out users */
192
  function __gaTrackerIsOptedOut() {
193
  return document.cookie.indexOf(disableStr + '=true') > -1;
194
  }
195
 
196
+ /* Disable tracking if the opt-out cookie exists. */
197
  var disableStr = 'ga-disable-<?php echo monsterinsights_get_ua(); ?>';
198
  if ( __gaTrackerIsOptedOut() ) {
199
  window[disableStr] = true;
200
  }
201
 
202
+ /* Opt-out function */
203
  function __gaTrackerOptout() {
204
  document.cookie = disableStr + '=true; expires=Thu, 31 Dec 2099 23:59:59 UTC; path=/';
205
  window[disableStr] = true;
languages/google-analytics-for-wordpress.pot CHANGED
@@ -5,7 +5,7 @@ msgstr ""
5
  "Project-Id-Version: MonsterInsights Lite\n"
6
  "Report-Msgid-Bugs-To: https://github.com/awesomemotive/monsterinsights/"
7
  "issues\n"
8
- "POT-Creation-Date: 2017-03-28 12:15-0400\n"
9
  "PO-Revision-Date: 2016-07-21 17:01-0400\n"
10
  "Last-Translator: Chris Christoff <support@monsterinsights.com>\n"
11
  "Language-Team: Chris Christoff <support@monsterinsights.com>\n"
@@ -246,7 +246,7 @@ msgstr ""
246
  msgid "Imported!"
247
  msgstr ""
248
 
249
- #: includes/admin/common.php:366
250
  #, php-format
251
  msgid ""
252
  "MonsterInsights has detected that it's files are being blocked. This is "
@@ -259,7 +259,7 @@ msgid ""
259
  "happy to help diagnose the issue."
260
  msgstr ""
261
 
262
- #: includes/admin/google.php:316 includes/admin/google.php:365
263
  msgid ""
264
  "MonsterInsights requires WordPress version 4.6 or newer to use oAuth. Please "
265
  "update your WordPress version."
@@ -272,52 +272,82 @@ msgid ""
272
  msgstr ""
273
 
274
  #: includes/admin/google.php:371
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
275
  #, php-format
276
- msgid "Google Analytics had a connection error. Error code: %s."
277
  msgstr ""
278
 
279
- #: includes/admin/google.php:481 includes/admin/google.php:588
280
  msgid "Permission Denied"
281
  msgstr ""
282
 
283
- #: includes/admin/google.php:494
284
  msgid "Cannot connect to Google"
285
  msgstr ""
286
 
287
- #: includes/admin/google.php:520
288
  msgid "No profiles viewable for that account. Please use another account."
289
  msgstr ""
290
 
291
- #: includes/admin/google.php:527
292
  msgid "Bad Google Code. Please try again."
293
  msgstr ""
294
 
295
- #: includes/admin/google.php:534
296
  msgid "Please paste in your Google code."
297
  msgstr ""
298
 
299
- #: includes/admin/google.php:560
300
  msgid "Invalid profile selected."
301
  msgstr ""
302
 
303
- #: includes/admin/google.php:566
304
  msgid "Please select a profile."
305
  msgstr ""
306
 
307
- #: includes/admin/google.php:626
308
  msgid "Analytics profile"
309
  msgstr ""
310
 
311
- #: includes/admin/google.php:627
312
  msgid "Select a profile"
313
  msgstr ""
314
 
315
- #: includes/admin/google.php:737
316
  #, php-format
317
  msgid "Please configure your %1$sGoogle Analytics settings%2$s!"
318
  msgstr ""
319
 
320
- #: includes/admin/google.php:750
321
  #, php-format
322
  msgid ""
323
  "It seems the authentication for the plugin has expired or the connection to "
@@ -325,7 +355,7 @@ msgid ""
325
  "Google Analytics to allow the plugin to fetch data."
326
  msgstr ""
327
 
328
- #: includes/admin/google.php:763
329
  #, php-format
330
  msgid ""
331
  "It seems the authentication for the plugin is missing permissions. Please "
@@ -333,7 +363,7 @@ msgid ""
333
  "data."
334
  msgstr ""
335
 
336
- #: includes/admin/google.php:776 includes/admin/pages/dashboard.php:121
337
  #: includes/admin/pages/reports.php:164
338
  #, php-format
339
  msgid ""
@@ -1311,29 +1341,29 @@ msgid ""
1311
  msgstr ""
1312
 
1313
  #: includes/admin/settings/register-settings.php:340
1314
- #: includes/admin/settings/tab-general.php:181
1315
  msgid "Allow Usage Tracking"
1316
  msgstr ""
1317
 
1318
  #: includes/admin/settings/register-settings.php:341
1319
- #: includes/admin/settings/tab-general.php:182
1320
  msgid ""
1321
  "By allowing us to track usage data we can better help you, because we know "
1322
  "with which WordPress configurations, themes and plugins we should test."
1323
  msgstr ""
1324
 
1325
- #: includes/admin/settings/settings-api.php:722
1326
  #, php-format
1327
  msgid "You must have the %s capability to view/edit this setting"
1328
  msgstr ""
1329
 
1330
- #: includes/admin/settings/settings-api.php:894
1331
  #, php-format
1332
  msgid "The callback function used for the %s setting is missing."
1333
  msgstr ""
1334
 
1335
- #: includes/admin/settings/settings-api.php:924
1336
- #: includes/admin/settings/tab-general.php:202
1337
  msgid "Save Changes"
1338
  msgstr ""
1339
 
@@ -1398,7 +1428,7 @@ msgstr ""
1398
  msgid "Analytics.js (Universal Analytics)"
1399
  msgstr ""
1400
 
1401
- #: includes/admin/settings/tab-general.php:158
1402
  #, php-format
1403
  msgid ""
1404
  "Warning: You're currently using deprecated ga.js tracking. We recommend "
@@ -1410,11 +1440,11 @@ msgid ""
1410
  "(analytics.js) %1$sclick here%2$s."
1411
  msgstr ""
1412
 
1413
- #: includes/admin/settings/tab-general.php:167
1414
  msgid "Switch to JS events tracking"
1415
  msgstr ""
1416
 
1417
- #: includes/admin/settings/tab-general.php:173
1418
  #, php-format
1419
  msgid ""
1420
  "Warning: You're currently using deprecated PHP based events tracking. We "
@@ -2492,160 +2522,160 @@ msgstr ""
2492
  msgid "Zimbabwe"
2493
  msgstr ""
2494
 
2495
- #: lite/includes/admin/addons.php:9
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2496
  msgid "Want to setup Social Tracking?"
2497
  msgstr ""
2498
 
2499
- #: lite/includes/admin/addons.php:10
2500
  #, php-format
2501
  msgid ""
2502
  "To setup social tracking, please %1$supgrade your MonsterInsights account"
2503
  "%2$s to unlock this feature."
2504
  msgstr ""
2505
 
2506
- #: lite/includes/admin/addons.php:10 lite/includes/admin/addons.php:18
2507
- #: lite/includes/admin/addons.php:26 lite/includes/admin/addons.php:35
2508
- #: lite/includes/admin/addons.php:43 lite/includes/admin/addons.php:51
2509
- #: lite/includes/admin/addons.php:59 lite/includes/admin/addons.php:67
2510
- #: lite/includes/admin/addons.php:75 lite/includes/admin/addons.php:83
2511
  msgid "Learn more about MonsterInsights Pro"
2512
  msgstr ""
2513
 
2514
- #: lite/includes/admin/addons.php:17
2515
  msgid "Want to setup Ad Tracking?"
2516
  msgstr ""
2517
 
2518
- #: lite/includes/admin/addons.php:18
2519
  #, php-format
2520
  msgid ""
2521
  "To setup ad tracking, please %1$supgrade your MonsterInsights account%2$s to "
2522
  "unlock this feature."
2523
  msgstr ""
2524
 
2525
- #: lite/includes/admin/addons.php:25
2526
- msgid "Want to setup Form Tracking?"
2527
  msgstr ""
2528
 
2529
- #: lite/includes/admin/addons.php:26
2530
  #, php-format
2531
  msgid ""
2532
  "To setup form tracking, please %1$supgrade your MonsterInsights account%2$s "
2533
  "to unlock this feature."
2534
  msgstr ""
2535
 
2536
- #: lite/includes/admin/addons.php:34
2537
  msgid "Want to setup Media Tracking?"
2538
  msgstr ""
2539
 
2540
- #: lite/includes/admin/addons.php:35
2541
  #, php-format
2542
  msgid ""
2543
  "To setup media tracking, please %1$supgrade your MonsterInsights account%2$s "
2544
  "to unlock this feature."
2545
  msgstr ""
2546
 
2547
- #: lite/includes/admin/addons.php:42
2548
  msgid "Want to setup Membership Tracking?"
2549
  msgstr ""
2550
 
2551
- #: lite/includes/admin/addons.php:43
2552
  #, php-format
2553
  msgid ""
2554
  "To setup membership tracking, please %1$supgrade your MonsterInsights account"
2555
  "%2$s to unlock this feature."
2556
  msgstr ""
2557
 
2558
- #: lite/includes/admin/addons.php:50
2559
  msgid "Want to setup Custom Dimensions?"
2560
  msgstr ""
2561
 
2562
- #: lite/includes/admin/addons.php:51
2563
  #, php-format
2564
  msgid ""
2565
- "To setup custom dimension tracking, please %1$supgrade your MonsterInsights "
2566
- "account%2$s to unlock this feature."
2567
  msgstr ""
2568
 
2569
- #: lite/includes/admin/addons.php:58
2570
  msgid "Want to setup Performance Tracking?"
2571
  msgstr ""
2572
 
2573
- #: lite/includes/admin/addons.php:59
2574
  #, php-format
2575
  msgid ""
2576
  "To setup performance tracking, please %1$supgrade your MonsterInsights "
2577
  "account%2$s to unlock this feature."
2578
  msgstr ""
2579
 
2580
- #: lite/includes/admin/addons.php:66
2581
  msgid "Want to setup Custom Reporting?"
2582
  msgstr ""
2583
 
2584
- #: lite/includes/admin/addons.php:67
2585
  #, php-format
2586
  msgid ""
2587
  "To setup custom reporting, please %1$supgrade your MonsterInsights account"
2588
  "%2$s to unlock this feature."
2589
  msgstr ""
2590
 
2591
- #: lite/includes/admin/addons.php:74
2592
  msgid "Want to setup Custom Notifications?"
2593
  msgstr ""
2594
 
2595
- #: lite/includes/admin/addons.php:75
2596
  #, php-format
2597
  msgid ""
2598
  "To setup custom notifications, please %1$supgrade your MonsterInsights "
2599
  "account%2$s to unlock this feature."
2600
  msgstr ""
2601
 
2602
- #: lite/includes/admin/addons.php:82
2603
- msgid "Want to setup eCommerce Tracking"
2604
- msgstr ""
2605
-
2606
- #: lite/includes/admin/addons.php:83
2607
- #, php-format
2608
- msgid ""
2609
- "To setup eCommerce tracking, please %1$supgrade your MonsterInsights account"
2610
- "%2$s to unlock this feature."
2611
- msgstr ""
2612
-
2613
- #: lite/includes/admin/addons.php:109
2614
- #, php-format
2615
- msgid ""
2616
- "Demographics and Interests tracking is only available on Universal Tracking "
2617
- "(analytics.js). You're currently using deprecated ga.js tracking. We "
2618
- "recommend switching to analytics.js, as it is significantly more accurate "
2619
- "than ga.js, and allows for additional functionality (like the more accurate "
2620
- "Javascript based events tracking we offer). Further Google Analytics has "
2621
- "deprecated support for ga.js, and it may stop working at any time when "
2622
- "Google decides to disable it from their server. To switch to using the newer "
2623
- "Universal Analytics (analytics.js) %1$sclick here%2$s."
2624
- msgstr ""
2625
-
2626
- #: lite/includes/admin/addons.php:115
2627
- #, php-format
2628
- msgid ""
2629
- "Enhanced Link Attribution tracking is only available on Universal Tracking "
2630
- "(analytics.js). You're currently using deprecated ga.js tracking. We "
2631
- "recommend switching to analytics.js, as it is significantly more accurate "
2632
- "than ga.js, and allows for additional functionality (like the more accurate "
2633
- "Javascript based events tracking we offer). Further Google Analytics has "
2634
- "deprecated support for ga.js, and it may stop working at any time when "
2635
- "Google decides to disable it from their server. To switch to using the newer "
2636
- "Universal Analytics (analytics.js) %1$sclick here%2$s."
2637
- msgstr ""
2638
-
2639
  #: lite/includes/admin/addons.php:120
2640
- msgid "Subdomain tracking:"
2641
  msgstr ""
2642
 
2643
- #: lite/includes/admin/addons.php:121
2644
  #, php-format
2645
  msgid ""
2646
- "This allows you to set the domain that's set by %1$s for tracking "
2647
- "subdomains. If empty, this will not be set. Can be used to set localhost for "
2648
- "ga.js tracking."
2649
  msgstr ""
2650
 
2651
  #. Plugin Name of the plugin/theme
5
  "Project-Id-Version: MonsterInsights Lite\n"
6
  "Report-Msgid-Bugs-To: https://github.com/awesomemotive/monsterinsights/"
7
  "issues\n"
8
+ "POT-Creation-Date: 2017-04-06 14:54-0700\n"
9
  "PO-Revision-Date: 2016-07-21 17:01-0400\n"
10
  "Last-Translator: Chris Christoff <support@monsterinsights.com>\n"
11
  "Language-Team: Chris Christoff <support@monsterinsights.com>\n"
246
  msgid "Imported!"
247
  msgstr ""
248
 
249
+ #: includes/admin/common.php:367
250
  #, php-format
251
  msgid ""
252
  "MonsterInsights has detected that it's files are being blocked. This is "
259
  "happy to help diagnose the issue."
260
  msgstr ""
261
 
262
+ #: includes/admin/google.php:316 includes/admin/google.php:363
263
  msgid ""
264
  "MonsterInsights requires WordPress version 4.6 or newer to use oAuth. Please "
265
  "update your WordPress version."
272
  msgstr ""
273
 
274
  #: includes/admin/google.php:371
275
+ msgid "Please ensure your Google Account is signed up for Google Analytics."
276
+ msgstr ""
277
+
278
+ #: includes/admin/google.php:373
279
+ msgid "Bad Request. Please contact support."
280
+ msgstr ""
281
+
282
+ #: includes/admin/google.php:375
283
+ msgid "Daily Limit Exceeded. Please contact support."
284
+ msgstr ""
285
+
286
+ #: includes/admin/google.php:377
287
+ msgid "User Rate Limit Exceeded. Wait 2 minutes and then try again."
288
+ msgstr ""
289
+
290
+ #: includes/admin/google.php:379
291
+ msgid "Project Rate Limit Exceeded. Wait 2 minutes and then try again."
292
+ msgstr ""
293
+
294
+ #: includes/admin/google.php:381
295
+ msgid "Project Rate Limit Quota Exceeded. Wait 2 minutes and then try again."
296
+ msgstr ""
297
+
298
+ #: includes/admin/google.php:383
299
+ msgid ""
300
+ "Google Analytics is having API issues on their side. Wait 2 minutes and then "
301
+ "try again."
302
+ msgstr ""
303
+
304
+ #: includes/admin/google.php:385
305
  #, php-format
306
+ msgid "Google Analytics had a connection error. Error code: %1$s. Reason: %2$s"
307
  msgstr ""
308
 
309
+ #: includes/admin/google.php:496 includes/admin/google.php:603
310
  msgid "Permission Denied"
311
  msgstr ""
312
 
313
+ #: includes/admin/google.php:509
314
  msgid "Cannot connect to Google"
315
  msgstr ""
316
 
317
+ #: includes/admin/google.php:535
318
  msgid "No profiles viewable for that account. Please use another account."
319
  msgstr ""
320
 
321
+ #: includes/admin/google.php:542
322
  msgid "Bad Google Code. Please try again."
323
  msgstr ""
324
 
325
+ #: includes/admin/google.php:549
326
  msgid "Please paste in your Google code."
327
  msgstr ""
328
 
329
+ #: includes/admin/google.php:575
330
  msgid "Invalid profile selected."
331
  msgstr ""
332
 
333
+ #: includes/admin/google.php:581
334
  msgid "Please select a profile."
335
  msgstr ""
336
 
337
+ #: includes/admin/google.php:641
338
  msgid "Analytics profile"
339
  msgstr ""
340
 
341
+ #: includes/admin/google.php:642
342
  msgid "Select a profile"
343
  msgstr ""
344
 
345
+ #: includes/admin/google.php:752
346
  #, php-format
347
  msgid "Please configure your %1$sGoogle Analytics settings%2$s!"
348
  msgstr ""
349
 
350
+ #: includes/admin/google.php:765
351
  #, php-format
352
  msgid ""
353
  "It seems the authentication for the plugin has expired or the connection to "
355
  "Google Analytics to allow the plugin to fetch data."
356
  msgstr ""
357
 
358
+ #: includes/admin/google.php:778
359
  #, php-format
360
  msgid ""
361
  "It seems the authentication for the plugin is missing permissions. Please "
363
  "data."
364
  msgstr ""
365
 
366
+ #: includes/admin/google.php:791 includes/admin/pages/dashboard.php:121
367
  #: includes/admin/pages/reports.php:164
368
  #, php-format
369
  msgid ""
1341
  msgstr ""
1342
 
1343
  #: includes/admin/settings/register-settings.php:340
1344
+ #: includes/admin/settings/tab-general.php:183
1345
  msgid "Allow Usage Tracking"
1346
  msgstr ""
1347
 
1348
  #: includes/admin/settings/register-settings.php:341
1349
+ #: includes/admin/settings/tab-general.php:184
1350
  msgid ""
1351
  "By allowing us to track usage data we can better help you, because we know "
1352
  "with which WordPress configurations, themes and plugins we should test."
1353
  msgstr ""
1354
 
1355
+ #: includes/admin/settings/settings-api.php:725
1356
  #, php-format
1357
  msgid "You must have the %s capability to view/edit this setting"
1358
  msgstr ""
1359
 
1360
+ #: includes/admin/settings/settings-api.php:914
1361
  #, php-format
1362
  msgid "The callback function used for the %s setting is missing."
1363
  msgstr ""
1364
 
1365
+ #: includes/admin/settings/settings-api.php:944
1366
+ #: includes/admin/settings/tab-general.php:204
1367
  msgid "Save Changes"
1368
  msgstr ""
1369
 
1428
  msgid "Analytics.js (Universal Analytics)"
1429
  msgstr ""
1430
 
1431
+ #: includes/admin/settings/tab-general.php:159
1432
  #, php-format
1433
  msgid ""
1434
  "Warning: You're currently using deprecated ga.js tracking. We recommend "
1440
  "(analytics.js) %1$sclick here%2$s."
1441
  msgstr ""
1442
 
1443
+ #: includes/admin/settings/tab-general.php:169
1444
  msgid "Switch to JS events tracking"
1445
  msgstr ""
1446
 
1447
+ #: includes/admin/settings/tab-general.php:175
1448
  #, php-format
1449
  msgid ""
1450
  "Warning: You're currently using deprecated PHP based events tracking. We "
2522
  msgid "Zimbabwe"
2523
  msgstr ""
2524
 
2525
+ #: lite/includes/admin/addons.php:28
2526
+ #, php-format
2527
+ msgid ""
2528
+ "Demographics and Interests tracking is only available on Universal Tracking "
2529
+ "(analytics.js). You're currently using deprecated ga.js tracking. We "
2530
+ "recommend switching to analytics.js, as it is significantly more accurate "
2531
+ "than ga.js, and allows for additional functionality (like the more accurate "
2532
+ "Javascript based events tracking we offer). Further Google Analytics has "
2533
+ "deprecated support for ga.js, and it may stop working at any time when "
2534
+ "Google decides to disable it from their server. To switch to using the newer "
2535
+ "Universal Analytics (analytics.js) %1$sclick here%2$s."
2536
+ msgstr ""
2537
+
2538
+ #: lite/includes/admin/addons.php:34
2539
+ #, php-format
2540
+ msgid ""
2541
+ "Enhanced Link Attribution tracking is only available on Universal Tracking "
2542
+ "(analytics.js). You're currently using deprecated ga.js tracking. We "
2543
+ "recommend switching to analytics.js, as it is significantly more accurate "
2544
+ "than ga.js, and allows for additional functionality (like the more accurate "
2545
+ "Javascript based events tracking we offer). Further Google Analytics has "
2546
+ "deprecated support for ga.js, and it may stop working at any time when "
2547
+ "Google decides to disable it from their server. To switch to using the newer "
2548
+ "Universal Analytics (analytics.js) %1$sclick here%2$s."
2549
+ msgstr ""
2550
+
2551
+ #: lite/includes/admin/addons.php:39
2552
+ msgid "Subdomain tracking:"
2553
+ msgstr ""
2554
+
2555
+ #: lite/includes/admin/addons.php:40
2556
+ #, php-format
2557
+ msgid ""
2558
+ "This allows you to set the domain that's set by %1$s for tracking "
2559
+ "subdomains. If empty, this will not be set. Can be used to set localhost for "
2560
+ "ga.js tracking."
2561
+ msgstr ""
2562
+
2563
+ #: lite/includes/admin/addons.php:48
2564
  msgid "Want to setup Social Tracking?"
2565
  msgstr ""
2566
 
2567
+ #: lite/includes/admin/addons.php:50
2568
  #, php-format
2569
  msgid ""
2570
  "To setup social tracking, please %1$supgrade your MonsterInsights account"
2571
  "%2$s to unlock this feature."
2572
  msgstr ""
2573
 
2574
+ #: lite/includes/admin/addons.php:50 lite/includes/admin/addons.php:58
2575
+ #: lite/includes/admin/addons.php:66 lite/includes/admin/addons.php:74
2576
+ #: lite/includes/admin/addons.php:82 lite/includes/admin/addons.php:90
2577
+ #: lite/includes/admin/addons.php:98 lite/includes/admin/addons.php:106
2578
+ #: lite/includes/admin/addons.php:114 lite/includes/admin/addons.php:122
2579
  msgid "Learn more about MonsterInsights Pro"
2580
  msgstr ""
2581
 
2582
+ #: lite/includes/admin/addons.php:56
2583
  msgid "Want to setup Ad Tracking?"
2584
  msgstr ""
2585
 
2586
+ #: lite/includes/admin/addons.php:58
2587
  #, php-format
2588
  msgid ""
2589
  "To setup ad tracking, please %1$supgrade your MonsterInsights account%2$s to "
2590
  "unlock this feature."
2591
  msgstr ""
2592
 
2593
+ #: lite/includes/admin/addons.php:64
2594
+ msgid "Want to setup Forms Tracking?"
2595
  msgstr ""
2596
 
2597
+ #: lite/includes/admin/addons.php:66
2598
  #, php-format
2599
  msgid ""
2600
  "To setup form tracking, please %1$supgrade your MonsterInsights account%2$s "
2601
  "to unlock this feature."
2602
  msgstr ""
2603
 
2604
+ #: lite/includes/admin/addons.php:72
2605
  msgid "Want to setup Media Tracking?"
2606
  msgstr ""
2607
 
2608
+ #: lite/includes/admin/addons.php:74
2609
  #, php-format
2610
  msgid ""
2611
  "To setup media tracking, please %1$supgrade your MonsterInsights account%2$s "
2612
  "to unlock this feature."
2613
  msgstr ""
2614
 
2615
+ #: lite/includes/admin/addons.php:80
2616
  msgid "Want to setup Membership Tracking?"
2617
  msgstr ""
2618
 
2619
+ #: lite/includes/admin/addons.php:82
2620
  #, php-format
2621
  msgid ""
2622
  "To setup membership tracking, please %1$supgrade your MonsterInsights account"
2623
  "%2$s to unlock this feature."
2624
  msgstr ""
2625
 
2626
+ #: lite/includes/admin/addons.php:88
2627
  msgid "Want to setup Custom Dimensions?"
2628
  msgstr ""
2629
 
2630
+ #: lite/includes/admin/addons.php:90
2631
  #, php-format
2632
  msgid ""
2633
+ "To setup custom dimensions, please %1$supgrade your MonsterInsights account"
2634
+ "%2$s to unlock this feature."
2635
  msgstr ""
2636
 
2637
+ #: lite/includes/admin/addons.php:96
2638
  msgid "Want to setup Performance Tracking?"
2639
  msgstr ""
2640
 
2641
+ #: lite/includes/admin/addons.php:98
2642
  #, php-format
2643
  msgid ""
2644
  "To setup performance tracking, please %1$supgrade your MonsterInsights "
2645
  "account%2$s to unlock this feature."
2646
  msgstr ""
2647
 
2648
+ #: lite/includes/admin/addons.php:104
2649
  msgid "Want to setup Custom Reporting?"
2650
  msgstr ""
2651
 
2652
+ #: lite/includes/admin/addons.php:106
2653
  #, php-format
2654
  msgid ""
2655
  "To setup custom reporting, please %1$supgrade your MonsterInsights account"
2656
  "%2$s to unlock this feature."
2657
  msgstr ""
2658
 
2659
+ #: lite/includes/admin/addons.php:112
2660
  msgid "Want to setup Custom Notifications?"
2661
  msgstr ""
2662
 
2663
+ #: lite/includes/admin/addons.php:114
2664
  #, php-format
2665
  msgid ""
2666
  "To setup custom notifications, please %1$supgrade your MonsterInsights "
2667
  "account%2$s to unlock this feature."
2668
  msgstr ""
2669
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2670
  #: lite/includes/admin/addons.php:120
2671
+ msgid "Want to setup eCommerce Tracking?"
2672
  msgstr ""
2673
 
2674
+ #: lite/includes/admin/addons.php:122
2675
  #, php-format
2676
  msgid ""
2677
+ "To setup ecommerce tracking, please %1$supgrade your MonsterInsights account"
2678
+ "%2$s to unlock this feature."
 
2679
  msgstr ""
2680
 
2681
  #. Plugin Name of the plugin/theme
lite/includes/admin/addons.php CHANGED
@@ -5,87 +5,6 @@ if ( ! defined( 'ABSPATH' ) ) {
5
  exit;
6
  }
7
 
8
- function monsterinsights_lite_social_addon_notice( ) {
9
- echo '<div class="monsterinsights-upsell-box"><h2>' . esc_html__( 'Want to setup Social Tracking?', 'google-analytics-for-wordpress') . '</h2>'
10
- . '<p class="upsell-lite">' . sprintf( esc_html__( 'To setup social tracking, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '">', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a></p>'
11
-
12
- . '</div>';
13
- }
14
- add_action( 'monsterinsights_tab_settings_tracking_social', 'monsterinsights_lite_social_addon_notice' );
15
-
16
- function monsterinsights_lite_ads_addon_notice( ) {
17
- echo '<div class="monsterinsights-upsell-box"><h2>' . esc_html__( 'Want to setup Ad Tracking?', 'google-analytics-for-wordpress') . '</h2>'
18
- . '<p class="upsell-lite">' . sprintf( esc_html__( 'To setup ad tracking, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a></p>'
19
-
20
- . '</div>';
21
- }
22
- add_action( 'monsterinsights_tab_settings_tracking_ads', 'monsterinsights_lite_ads_addon_notice' );
23
-
24
- function monsterinsights_lite_forms_addon_notice( ) {
25
- echo '<div class="monsterinsights-upsell-box"><h2>' . esc_html__( 'Want to setup Form Tracking?', 'google-analytics-for-wordpress') . '</h2>'
26
- . '<p class="upsell-lite">' . sprintf( esc_html__( 'To setup form tracking, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a></p>'
27
-
28
- . '</div>';
29
- }
30
- add_action( 'monsterinsights_tab_settings_tracking_forms', 'monsterinsights_lite_forms_addon_notice' );
31
-
32
-
33
- function monsterinsights_lite_media_addon_notice( ) {
34
- echo '<div class="monsterinsights-upsell-box"><h2>' . esc_html__( 'Want to setup Media Tracking?', 'google-analytics-for-wordpress') . '</h2>'
35
- . '<p class="upsell-lite">' . sprintf( esc_html__( 'To setup media tracking, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a></p>'
36
-
37
- . '</div>';
38
- }
39
- add_action( 'monsterinsights_tab_settings_tracking_media', 'monsterinsights_lite_media_addon_notice' );
40
-
41
- function monsterinsights_lite_memberships_addon_notice( ) {
42
- echo '<div class="monsterinsights-upsell-box"><h2>' . esc_html__( 'Want to setup Membership Tracking?', 'google-analytics-for-wordpress') . '</h2>'
43
- . '<p class="upsell-lite">' . sprintf( esc_html__( 'To setup membership tracking, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a></p>'
44
-
45
- . '</div>';
46
- }
47
- add_action( 'monsterinsights_tab_settings_tracking_memberships', 'monsterinsights_lite_memberships_addon_notice' );
48
-
49
- function monsterinsights_lite_dimensions_addon_notice( ) {
50
- echo '<div class="monsterinsights-upsell-box"><h2>' . esc_html__( 'Want to setup Custom Dimensions?', 'google-analytics-for-wordpress') . '</h2>'
51
- . '<p class="upsell-lite">' . sprintf( esc_html__( 'To setup custom dimension tracking, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a></p>'
52
-
53
- . '</div>';
54
- }
55
- add_action( 'monsterinsights_tab_settings_tracking_dimensions', 'monsterinsights_lite_dimensions_addon_notice' );
56
-
57
- function monsterinsights_lite_performance_addon_notice( ) {
58
- echo '<div class="monsterinsights-upsell-box"><h2>' . esc_html__( 'Want to setup Performance Tracking?', 'google-analytics-for-wordpress') . '</h2>'
59
- . '<p class="upsell-lite">' . sprintf( esc_html__( 'To setup performance tracking, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a></p>'
60
-
61
- . '</div>';
62
- }
63
- add_action( 'monsterinsights_tab_settings_tracking_performance', 'monsterinsights_lite_performance_addon_notice' );
64
-
65
- function monsterinsights_lite_reporting_addon_notice( ) {
66
- echo '<div class="monsterinsights-upsell-box"><h2>' . esc_html__( 'Want to setup Custom Reporting?', 'google-analytics-for-wordpress') . '</h2>'
67
- . '<p class="upsell-lite">' . sprintf( esc_html__( 'To setup custom reporting, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a></p>'
68
-
69
- . '</div>';
70
- }
71
- add_action( 'monsterinsights_tab_settings_tracking_reporting', 'monsterinsights_lite_reporting_addon_notice' );
72
-
73
- function monsterinsights_lite_notifications_addon_notice( ) {
74
- echo '<div class="monsterinsights-upsell-box"><h2>' . esc_html__( 'Want to setup Custom Notifications?', 'google-analytics-for-wordpress') . '</h2>'
75
- . '<p class="upsell-lite">' . sprintf( esc_html__( 'To setup custom notifications, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a></p>'
76
-
77
- . '</div>';
78
- }
79
- add_action( 'monsterinsights_tab_settings_tracking_notifications', 'monsterinsights_lite_notifications_addon_notice' );
80
-
81
- function monsterinsights_lite_ecommerce_addon_notice( ) {
82
- echo '<div class="monsterinsights-upsell-box"><h2>' . esc_html__( 'Want to setup eCommerce Tracking', 'google-analytics-for-wordpress') . '</h2>'
83
- . '<p class="upsell-lite">' . sprintf( esc_html__( 'To setup eCommerce tracking, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a></p>'
84
-
85
- . '</div>';
86
- }
87
- add_action( 'monsterinsights_tab_settings_tracking_ecommerce', 'monsterinsights_lite_ecommerce_addon_notice' );
88
-
89
  function monsterinsights_registered_settings_filter( $settings ) {
90
  $tracking_mode = monsterinsights_get_option( 'tracking_mode', 'analytics' );
91
  $events_tracking = monsterinsights_get_option( 'events_mode', 'js' );
@@ -120,6 +39,88 @@ function monsterinsights_registered_settings_filter( $settings ) {
120
  $settings['links']['enhanced_link_attribution']['name'] = __( 'Subdomain tracking:', 'google-analytics-for-wordpress' );
121
  $settings['links']['enhanced_link_attribution']['desc'] = sprintf( esc_html__( 'This allows you to set the domain that\'s set by %1$s for tracking subdomains. If empty, this will not be set. Can be used to set localhost for ga.js tracking.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiDomainDirectory#_gat.GA_Tracker_._setDomainName" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_setDomainName</code></a>' );
122
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
123
  return $settings;
124
  }
125
  add_filter( 'monsterinsights_registered_settings', 'monsterinsights_registered_settings_filter' );
5
  exit;
6
  }
7
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
8
  function monsterinsights_registered_settings_filter( $settings ) {
9
  $tracking_mode = monsterinsights_get_option( 'tracking_mode', 'analytics' );
10
  $events_tracking = monsterinsights_get_option( 'events_mode', 'js' );
39
  $settings['links']['enhanced_link_attribution']['name'] = __( 'Subdomain tracking:', 'google-analytics-for-wordpress' );
40
  $settings['links']['enhanced_link_attribution']['desc'] = sprintf( esc_html__( 'This allows you to set the domain that\'s set by %1$s for tracking subdomains. If empty, this will not be set. Can be used to set localhost for ga.js tracking.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiDomainDirectory#_gat.GA_Tracker_._setDomainName" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_setDomainName</code></a>' );
41
  }
42
+
43
+
44
+ // Addons:
45
+ // Social
46
+ $settings['social']['social_notice'] = array(
47
+ 'id' => 'social_notice',
48
+ 'name' => __( 'Want to setup Social Tracking?', 'google-analytics-for-wordpress'),
49
+ 'type' => 'upgrade_notice',
50
+ 'desc' => sprintf( esc_html__( 'To setup social tracking, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '">', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'
51
+ );
52
+
53
+ // Ads
54
+ $settings['ads']['ads_notice'] = array(
55
+ 'id' => 'ads_notice',
56
+ 'name' => __( 'Want to setup Ad Tracking?', 'google-analytics-for-wordpress'),
57
+ 'type' => 'upgrade_notice',
58
+ 'desc' => sprintf( esc_html__( 'To setup ad tracking, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '">', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'
59
+ );
60
+
61
+ // Forms
62
+ $settings['forms']['forms_notice'] = array(
63
+ 'id' => 'forms_notice',
64
+ 'name' => __( 'Want to setup Forms Tracking?', 'google-analytics-for-wordpress'),
65
+ 'type' => 'upgrade_notice',
66
+ 'desc' => sprintf( esc_html__( 'To setup form tracking, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '">', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'
67
+ );
68
+
69
+ // Media
70
+ $settings['media']['media_notice'] = array(
71
+ 'id' => 'media_notice',
72
+ 'name' => __( 'Want to setup Media Tracking?', 'google-analytics-for-wordpress'),
73
+ 'type' => 'upgrade_notice',
74
+ 'desc' => sprintf( esc_html__( 'To setup media tracking, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '">', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'
75
+ );
76
+
77
+ // Membership
78
+ $settings['membership']['membership_notice'] = array(
79
+ 'id' => 'membership_notice',
80
+ 'name' => __( 'Want to setup Membership Tracking?', 'google-analytics-for-wordpress'),
81
+ 'type' => 'upgrade_notice',
82
+ 'desc' => sprintf( esc_html__( 'To setup membership tracking, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '">', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'
83
+ );
84
+
85
+ // Dimensions
86
+ $settings['dimensions']['dimensions_notice'] = array(
87
+ 'id' => 'dimensions_notice',
88
+ 'name' => __( 'Want to setup Custom Dimensions?', 'google-analytics-for-wordpress'),
89
+ 'type' => 'upgrade_notice',
90
+ 'desc' => sprintf( esc_html__( 'To setup custom dimensions, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '">', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'
91
+ );
92
+
93
+ // Performance
94
+ $settings['performance']['performance_notice'] = array(
95
+ 'id' => 'performance_notice',
96
+ 'name' => __( 'Want to setup Performance Tracking?', 'google-analytics-for-wordpress'),
97
+ 'type' => 'upgrade_notice',
98
+ 'desc' => sprintf( esc_html__( 'To setup performance tracking, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '">', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'
99
+ );
100
+
101
+ // Reporting
102
+ $settings['reporting']['reporting_notice'] = array(
103
+ 'id' => 'reporting_notice',
104
+ 'name' => __( 'Want to setup Custom Reporting?', 'google-analytics-for-wordpress'),
105
+ 'type' => 'upgrade_notice',
106
+ 'desc' => sprintf( esc_html__( 'To setup custom reporting, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '">', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'
107
+ );
108
+
109
+ // Reporting
110
+ $settings['notifications']['notifications_notice'] = array(
111
+ 'id' => 'notifications_notice',
112
+ 'name' => __( 'Want to setup Custom Notifications?', 'google-analytics-for-wordpress'),
113
+ 'type' => 'upgrade_notice',
114
+ 'desc' => sprintf( esc_html__( 'To setup custom notifications, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '">', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'
115
+ );
116
+
117
+ // Reporting
118
+ $settings['ecommerce']['ecommerce_notice'] = array(
119
+ 'id' => 'ecommerce_notice',
120
+ 'name' => __( 'Want to setup eCommerce Tracking?', 'google-analytics-for-wordpress'),
121
+ 'type' => 'upgrade_notice',
122
+ 'desc' => sprintf( esc_html__( 'To setup ecommerce tracking, please %1$supgrade your MonsterInsights account%2$s to unlock this feature.', 'google-analytics-for-wordpress' ), '<a href="' . esc_attr( monsterinsights_get_upgrade_link() ) . '">', '</a>' ) , '<br /><a href="' . monsterinsights_get_upgrade_link() . '" class="monsterinsights-upsell-box-button button button-primary" target="_blank" rel="noopener noreferrer" referrer="no-referrer" >' . esc_html__( 'Learn more about MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'
123
+ );
124
  return $settings;
125
  }
126
  add_filter( 'monsterinsights_registered_settings', 'monsterinsights_registered_settings_filter' );
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://www.wpbeginner.com/wpbeginner-needs-your-help/
4
  Tags: analytics, analytics dashboard, google analytics, google analytics dashboard, google analytics widget, universal google analytics, statistics, tracking, stats, google, yoast, google analytics by yoast, ga, monster insights, monsterinsights, universal analytics, web stats, ecommerce, ecommerce tracking
5
  Requires at least: 3.9
6
  Tested up to: 4.7.4
7
- Stable tag: 6.1.6
8
  License: GPL v3
9
 
10
  The best Google Analytics plugin for WordPress. See how visitors find and use your website, so you can keep them coming back.
@@ -136,6 +136,12 @@ You can also learn about other <a href="http://www.wpbeginner.com/category/plugi
136
  4. Want more features? <a href="https://www.monsterinsights.com/?utm_source=wprepo&utm_medium=link&utm_campaign=liteversion">Purchase MonsterInsights Pro</a>!
137
 
138
  == Changelog ==
 
 
 
 
 
 
139
  = 6.1.6, March 29, 2017 =
140
  * New: Select2 filter for the Google oAuth list of profiles, to make it easier to find your Google property by fully supporting search by URL.
141
  * Tweak: Inbound-as-external now is prioritized before downloads in tracking preference order.
4
  Tags: analytics, analytics dashboard, google analytics, google analytics dashboard, google analytics widget, universal google analytics, statistics, tracking, stats, google, yoast, google analytics by yoast, ga, monster insights, monsterinsights, universal analytics, web stats, ecommerce, ecommerce tracking
5
  Requires at least: 3.9
6
  Tested up to: 4.7.4
7
+ Stable tag: 6.1.7
8
  License: GPL v3
9
 
10
  The best Google Analytics plugin for WordPress. See how visitors find and use your website, so you can keep them coming back.
136
  4. Want more features? <a href="https://www.monsterinsights.com/?utm_source=wprepo&utm_medium=link&utm_campaign=liteversion">Purchase MonsterInsights Pro</a>!
137
 
138
  == Changelog ==
139
+ = 6.1.7, April 10, 2017 =
140
+ * New: Changes needed to support new addons, including the Google AMP addon, available as of today.
141
+ * Tweak: Comments for frontend are minification-safe.
142
+ * Tweak: GA notice is now hidden when debug mode is on.
143
+ * Tweak: All settings now use the Settings API framework, including all addons.
144
+
145
  = 6.1.6, March 29, 2017 =
146
  * New: Select2 filter for the Google oAuth list of profiles, to make it easier to find your Google property by fully supporting search by URL.
147
  * Tweak: Inbound-as-external now is prioritized before downloads in tracking preference order.