Google Analytics Dashboard for WP (GADWP) - Version 4.9.1.2b

Version Description

Download this release

Release Info

Developer deconf
Plugin Icon 128x128 Google Analytics Dashboard for WP (GADWP)
Version 4.9.1.2b
Comparing to
See all releases

Code changes from version 4.9.1.1 to 4.9.1.2b

Files changed (7) hide show
  1. admin/css/admin-widgets.css +3 -3
  2. admin/js/widgets.js +0 -47
  3. admin/settings.php +2 -2
  4. common/js/reports.js +34 -32
  5. gadwp.php +2 -2
  6. readme.txt +7 -1
  7. tools/gapi.php +0 -3
admin/css/admin-widgets.css CHANGED
@@ -152,7 +152,7 @@
152
  padding: 0px;
153
  }
154
 
155
- .gadwp-wrapper .inside .small-box {
156
  width: 30%;
157
  float: left;
158
  margin: 0 5px 10px 5px;
@@ -163,7 +163,7 @@
163
  box-shadow: 0px 0px 7px 0px #BBB;
164
  }
165
 
166
- .gadwp-wrapper .inside .small-box h3 {
167
  font-size: 1em;
168
  color: #777;
169
  padding: 0px 5px 0px 5px;
@@ -173,7 +173,7 @@
173
  white-space: nowrap;
174
  }
175
 
176
- .gadwp-wrapper .inside .small-box p {
177
  font-size: 1.2em;
178
  margin: 0px 0px 2px 0px;
179
  }
152
  padding: 0px;
153
  }
154
 
155
+ #gadwp-widget .inside .small-box {
156
  width: 30%;
157
  float: left;
158
  margin: 0 5px 10px 5px;
163
  box-shadow: 0px 0px 7px 0px #BBB;
164
  }
165
 
166
+ #gadwp-widget .inside .small-box h3 {
167
  font-size: 1em;
168
  color: #777;
169
  padding: 0px 5px 0px 5px;
173
  white-space: nowrap;
174
  }
175
 
176
+ #gadwp-widget .inside .small-box p {
177
  font-size: 1.2em;
178
  margin: 0px 0px 2px 0px;
179
  }
admin/js/widgets.js DELETED
@@ -1,47 +0,0 @@
1
- /*
2
- * Responsive charts
3
- */
4
- jQuery(window).resize(
5
- function() {
6
- if (typeof ga_dash_drawmainchart == "function"
7
- && typeof gadash_mainchart !== 'undefined'
8
- && !jQuery.isNumeric(gadash_mainchart)) {
9
- ga_dash_drawmainchart(gadash_mainchart);
10
- }
11
- if (typeof ga_dash_drawlocations == "function"
12
- && typeof gadash_locations !== 'undefined'
13
- && !jQuery.isNumeric(gadash_locations)) {
14
- ga_dash_drawmaplocations(gadash_locations);
15
- ga_dash_drawlocations(gadash_locations);
16
- }
17
- if (typeof ga_dash_drawtrafficchannels == "function"
18
- && typeof gadash_trafficchannels !== 'undefined'
19
- && !jQuery.isNumeric(gadash_trafficchannels)) {
20
- ga_dash_drawtrafficchannels(gadash_trafficchannels);
21
- }
22
- if (typeof ga_dash_drawprs == "function"
23
- && typeof gadash_prs !== 'undefined'
24
- && !jQuery.isNumeric(gadash_prs)) {
25
- ga_dash_drawprs(gadash_prs);
26
- }
27
- if (typeof ga_dash_drawtrafficmediums == "function"
28
- && typeof gadash_trafficmediums !== 'undefined'
29
- && !jQuery.isNumeric(gadash_trafficmediums)) {
30
- ga_dash_drawtrafficmediums(gadash_trafficmediums);
31
- }
32
- if (typeof ga_dash_drawtraffictype == "function"
33
- && typeof gadash_traffictype !== 'undefined'
34
- && !jQuery.isNumeric(gadash_traffictype)) {
35
- ga_dash_drawtraffictype(gadash_traffictype);
36
- }
37
- if (typeof ga_dash_drawsocialnetworks == "function"
38
- && typeof gadash_socialnetworks !== 'undefined'
39
- && !jQuery.isNumeric(gadash_socialnetworks)) {
40
- ga_dash_drawsocialnetworks(gadash_socialnetworks);
41
- }
42
- if (typeof ga_dash_drawtrafficorganic == "function"
43
- && typeof gadash_trafficorganic !== 'undefined'
44
- && !jQuery.isNumeric(gadash_trafficorganic)) {
45
- ga_dash_drawtrafficorganic(gadash_trafficorganic);
46
- }
47
- });
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
admin/settings.php CHANGED
@@ -897,7 +897,7 @@ final class GADWP_Settings {
897
  if ( ! empty( $options['ga_dash_profile_list'] ) ) {
898
  foreach ( $options['ga_dash_profile_list'] as $items ) {
899
  if ( $items[3] ) {
900
- echo '<option value="' . esc_attr( $items[1] ) . '" ' . selected( $items[1], $options['ga_dash_tableid_jail'] );
901
  echo ' title="' . __( "View Name:", 'google-analytics-dashboard-for-wp' ) . ' ' . esc_attr( $items[0] ) . '">' . esc_html( GADWP_Tools::strip_protocol( $items[3] ) ) . ' &#8658; ' . esc_attr( $items[0] ) . '</option>';
902
  }
903
  }
@@ -1213,7 +1213,7 @@ final class GADWP_Settings {
1213
  if ( ! empty( $options['ga_dash_profile_list'] ) ) {
1214
  foreach ( $options['ga_dash_profile_list'] as $items ) {
1215
  if ( $items[3] ) {
1216
- echo '<option value="' . esc_attr( $items[1] ) . '" ' . selected( $items[1], isset( $options['ga_dash_tableid_network']->$blog['blog_id'] ) ? $options['ga_dash_tableid_network']->$blog['blog_id'] : '' );
1217
  echo ' title="' . __( "View Name:", 'google-analytics-dashboard-for-wp' ) . ' ' . esc_attr( $items[0] ) . '">' . esc_html( GADWP_Tools::strip_protocol( $items[3] ) ) . ' &#8658; ' . esc_attr( $items[0] ) . '</option>';
1218
  }
1219
  }
897
  if ( ! empty( $options['ga_dash_profile_list'] ) ) {
898
  foreach ( $options['ga_dash_profile_list'] as $items ) {
899
  if ( $items[3] ) {
900
+ echo '<option value="' . esc_attr( $items[1] ) . '" ' . selected( $items[1], $options['ga_dash_tableid_jail'], false );
901
  echo ' title="' . __( "View Name:", 'google-analytics-dashboard-for-wp' ) . ' ' . esc_attr( $items[0] ) . '">' . esc_html( GADWP_Tools::strip_protocol( $items[3] ) ) . ' &#8658; ' . esc_attr( $items[0] ) . '</option>';
902
  }
903
  }
1213
  if ( ! empty( $options['ga_dash_profile_list'] ) ) {
1214
  foreach ( $options['ga_dash_profile_list'] as $items ) {
1215
  if ( $items[3] ) {
1216
+ echo '<option value="' . esc_attr( $items[1] ) . '" ' . selected( $items[1], isset( $options['ga_dash_tableid_network']->$blog['blog_id'] ) ? $options['ga_dash_tableid_network']->$blog['blog_id'] : '', false );
1217
  echo ' title="' . __( "View Name:", 'google-analytics-dashboard-for-wp' ) . ' ' . esc_attr( $items[0] ) . '">' . esc_html( GADWP_Tools::strip_protocol( $items[3] ) ) . ' &#8658; ' . esc_attr( $items[0] ) . '</option>';
1218
  }
1219
  }
common/js/reports.js CHANGED
@@ -1,13 +1,38 @@
1
  "use strict";
2
 
3
- jQuery( function () {
4
- google.load( "visualization", "1", {
5
- packages : [ "corechart", "table", "orgchart", "geochart" ],
6
- 'language' : gadwp_item_data.language,
7
- 'callback' : GADWPLoad
8
- } );
9
  } );
10
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
11
  // Get the numeric ID
12
  gadwp_item_data.getID = function ( item ) {
13
  if ( gadwp_item_data.scope == 'admin-item' ) {
@@ -507,7 +532,7 @@ jQuery.fn.extend( {
507
  return ( "<p><center><strong>" + pagetitle + "</strong></center></p>" + tablerfr + tablekwd + tablescl + tablecpg + tabledrt );
508
  },
509
 
510
- rt_refresh : function ( ) {
511
  if ( reports.render.focusFlag ) {
512
  post_data.from = false;
513
  post_data.to = false;
@@ -799,7 +824,7 @@ jQuery.fn.extend( {
799
  }
800
  }
801
  if ( period == 'realtime' ) {
802
-
803
  reports.render.focusFlag = 1;
804
 
805
  jQuery( window ).bind( "focus", function ( event ) {
@@ -846,7 +871,7 @@ jQuery.fn.extend( {
846
  tpl += '</div>';
847
 
848
  jQuery( '#gadwp-reports' + slug ).html( tpl );
849
-
850
  reports.rt_refresh( reports.render.focusFlag );
851
 
852
  reports.realtime_running = setInterval( reports.rt_refresh, 55000 );
@@ -1176,26 +1201,3 @@ jQuery.fn.extend( {
1176
  }
1177
  }
1178
  } );
1179
-
1180
- function GADWPLoad () {
1181
- if ( gadwp_item_data.scope == 'admin-widgets' ) {
1182
- jQuery( '#gadwp-window-1' ).gadwpItemReport( 1 );
1183
- } else {
1184
- jQuery( gadwp_item_data.getSelector( gadwp_item_data.scope ) ).click( function () {
1185
- if ( !jQuery( "#gadwp-window-" + gadwp_item_data.getID( this ) ).length > 0 ) {
1186
- jQuery( "body" ).append( '<div id="gadwp-window-' + gadwp_item_data.getID( this ) + '"></div>' );
1187
- }
1188
- jQuery( '#gadwp-window-' + gadwp_item_data.getID( this ) ).gadwpItemReport( gadwp_item_data.getID( this ) );
1189
- } );
1190
- }
1191
-
1192
- // on window resize
1193
- jQuery( window ).resize( function () {
1194
- gadwp_item_data.responsiveDialog();
1195
- } );
1196
-
1197
- // dialog width larger than viewport
1198
- jQuery( document ).on( "dialogopen", ".ui-dialog", function ( event, ui ) {
1199
- gadwp_item_data.responsiveDialog();
1200
- } );
1201
- }
1
  "use strict";
2
 
3
+ google.load( "visualization", "1", {
4
+ packages : [ "corechart", "table", "orgchart" ],
5
+ 'language' : gadwp_item_data.language,
 
 
 
6
  } );
7
 
8
+ google.setOnLoadCallback( GADWPLoad );
9
+
10
+ function GADWPLoad () {
11
+
12
+ jQuery( function () {
13
+ if ( gadwp_item_data.scope == 'admin-widgets' ) {
14
+ jQuery( '#gadwp-window-1' ).gadwpItemReport( 1 );
15
+ } else {
16
+ jQuery( gadwp_item_data.getSelector( gadwp_item_data.scope ) ).click( function () {
17
+ if ( !jQuery( "#gadwp-window-" + gadwp_item_data.getID( this ) ).length > 0 ) {
18
+ jQuery( "body" ).append( '<div id="gadwp-window-' + gadwp_item_data.getID( this ) + '"></div>' );
19
+ }
20
+ jQuery( '#gadwp-window-' + gadwp_item_data.getID( this ) ).gadwpItemReport( gadwp_item_data.getID( this ) );
21
+ } );
22
+ }
23
+
24
+ // on window resize
25
+ jQuery( window ).resize( function () {
26
+ gadwp_item_data.responsiveDialog();
27
+ } );
28
+
29
+ // dialog width larger than viewport
30
+ jQuery( document ).on( "dialogopen", ".ui-dialog", function ( event, ui ) {
31
+ gadwp_item_data.responsiveDialog();
32
+ } );
33
+ } );
34
+ }
35
+
36
  // Get the numeric ID
37
  gadwp_item_data.getID = function ( item ) {
38
  if ( gadwp_item_data.scope == 'admin-item' ) {
532
  return ( "<p><center><strong>" + pagetitle + "</strong></center></p>" + tablerfr + tablekwd + tablescl + tablecpg + tabledrt );
533
  },
534
 
535
+ rt_refresh : function () {
536
  if ( reports.render.focusFlag ) {
537
  post_data.from = false;
538
  post_data.to = false;
824
  }
825
  }
826
  if ( period == 'realtime' ) {
827
+
828
  reports.render.focusFlag = 1;
829
 
830
  jQuery( window ).bind( "focus", function ( event ) {
871
  tpl += '</div>';
872
 
873
  jQuery( '#gadwp-reports' + slug ).html( tpl );
874
+
875
  reports.rt_refresh( reports.render.focusFlag );
876
 
877
  reports.realtime_running = setInterval( reports.rt_refresh, 55000 );
1201
  }
1202
  }
1203
  } );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
gadwp.php CHANGED
@@ -4,7 +4,7 @@
4
  * Plugin URI: https://deconf.com
5
  * Description: Displays Google Analytics Reports and Real-Time Statistics in your Dashboard. Automatically inserts the tracking code in every page of your website.
6
  * Author: Alin Marcu
7
- * Version: 4.9.1.1
8
  * Author URI: https://deconf.com
9
  * Text Domain: google-analytics-dashboard-for-wp
10
  * Domain Path: /languages
@@ -16,7 +16,7 @@ if ( ! defined( 'ABSPATH' ) )
16
 
17
  // Plugin Version
18
  if ( ! defined( 'GADWP_CURRENT_VERSION' ) ) {
19
- define( 'GADWP_CURRENT_VERSION', '4.9.1.1' );
20
  }
21
 
22
  if ( ! class_exists( 'GADWP_Manager' ) ) {
4
  * Plugin URI: https://deconf.com
5
  * Description: Displays Google Analytics Reports and Real-Time Statistics in your Dashboard. Automatically inserts the tracking code in every page of your website.
6
  * Author: Alin Marcu
7
+ * Version: 4.9.1.2b
8
  * Author URI: https://deconf.com
9
  * Text Domain: google-analytics-dashboard-for-wp
10
  * Domain Path: /languages
16
 
17
  // Plugin Version
18
  if ( ! defined( 'GADWP_CURRENT_VERSION' ) ) {
19
+ define( 'GADWP_CURRENT_VERSION', '4.9.1.2b' );
20
  }
21
 
22
  if ( ! class_exists( 'GADWP_Manager' ) ) {
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://deconf.com/donate/
4
  Tags: google,analytics,google analytics,dashboard,analytics dashboard,google analytics dashboard,google analytics plugin,google analytics widget,tracking,universal google analytics,realtime,multisite,gadwp
5
  Requires at least: 3.5
6
  Tested up to: 4.4
7
- Stable tag: 4.9.1.1
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -132,6 +132,12 @@ Google Analytics Dashboard for WP it's released under the GPLv2, you can use it
132
 
133
  == Changelog ==
134
 
 
 
 
 
 
 
135
  = 4.9.1.1 =
136
  - Bug Fix: focusFlag preventing Real-Time reports from refreshing properly
137
  - Bug Fix: date format is not properly localized in daily/monthly reports
4
  Tags: google,analytics,google analytics,dashboard,analytics dashboard,google analytics dashboard,google analytics plugin,google analytics widget,tracking,universal google analytics,realtime,multisite,gadwp
5
  Requires at least: 3.5
6
  Tested up to: 4.4
7
+ Stable tag: 4.9.1.2b
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
132
 
133
  == Changelog ==
134
 
135
+ = 4.9.1.2 =
136
+ - Bug Fix: multiple CSS fixes for frontend widget
137
+ - Bug Fix: clean-up output for View selection list
138
+ - Bug Fix: try to fix Google Charts conflicts with other plugins
139
+ - Bug Fix: prevent PHP warnings during authorization and while revoking tokens
140
+
141
  = 4.9.1.1 =
142
  - Bug Fix: focusFlag preventing Real-Time reports from refreshing properly
143
  - Bug Fix: date format is not properly localized in daily/monthly reports
tools/gapi.php CHANGED
@@ -240,9 +240,6 @@ if ( ! class_exists( 'GADWP_GAPI_Controller' ) ) {
240
  } else {
241
  $this->gadwp->config->set_plugin_options();
242
  }
243
- GADWP_Tools::unset_cookie( 'default_metric' );
244
- GADWP_Tools::unset_cookie( 'default_dimension' );
245
- GADWP_Tools::unset_cookie( 'default_view' );
246
  }
247
 
248
  /**
240
  } else {
241
  $this->gadwp->config->set_plugin_options();
242
  }
 
 
 
243
  }
244
 
245
  /**