Google Analytics for WordPress by MonsterInsights - Version 5.0.1

Version Description

Release Date: September 4th, 2014

  • Bugfixes:
    • Fixed string where array expected warning.
Download this release

Release Info

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

Code changes from version 5.0 to 5.0.1

admin/class-admin.php CHANGED
@@ -43,6 +43,11 @@ if ( ! class_exists( 'Yoast_GA_Admin' ) ) {
43
  $this->options = get_option( 'yst_ga' );
44
  }
45
 
 
 
 
 
 
46
  if ( $_SERVER['REQUEST_METHOD'] == 'POST' ) {
47
  if ( isset( $_POST['ga-form-settings'] ) && wp_verify_nonce( $_POST['yoast_ga_nonce'], 'save_settings' ) ) {
48
  // Post submitted and verified with our nonce
@@ -60,6 +65,13 @@ if ( ! class_exists( 'Yoast_GA_Admin' ) ) {
60
  $this->connect_with_google_analytics();
61
  }
62
 
 
 
 
 
 
 
 
63
  /**
64
  * Set the default GA settings here
65
  * @return array
@@ -67,25 +79,25 @@ if ( ! class_exists( 'Yoast_GA_Admin' ) ) {
67
  public function default_ga_values() {
68
  return array(
69
  $this->form_prefix => array(
70
- 'analytics_profile' => NULL,
71
  'manual_ua_code' => 0,
72
- 'manual_ua_code_field' => NULL,
73
- 'track_internal_as_outbound' => NULL,
74
- 'track_internal_as_label' => NULL,
75
  'track_outbound' => 0,
76
  'anonymous_data' => 0,
77
  'enable_universal' => 0,
78
  'demographics' => 0,
79
- 'ignore_users' => 'editor',
80
- 'anonymize_ips' => NULL,
81
  'track_download_as' => 'event',
82
  'extensions_of_files' => 'doc,exe,js,pdf,ppt,tgz,zip,xls',
83
  'track_full_url' => 'domain',
84
- 'subdomain_tracking' => NULL,
85
  'tag_links_in_rss' => 0,
86
  'allow_anchor' => 0,
87
  'add_allow_linker' => 0,
88
- 'custom_code' => NULL,
89
  'debug_mode' => 0,
90
  'firebug_lite' => 0,
91
  )
@@ -101,10 +113,10 @@ if ( ! class_exists( 'Yoast_GA_Admin' ) ) {
101
  */
102
  public function get_setting( $name ) {
103
 
104
- if ( isset( $this->options[$this->form_prefix][$name] ) ) {
105
- return $this->options[$this->form_prefix][$name];
106
  } else {
107
- return NULL;
108
  }
109
  }
110
 
@@ -115,14 +127,14 @@ if ( ! class_exists( 'Yoast_GA_Admin' ) ) {
115
  */
116
  public function save_settings( $data ) {
117
  foreach ( $data as $key => $value ) {
118
- $this->options[$this->form_prefix][$key] = $value;
119
  }
120
 
121
  // Check checkboxes, on a uncheck they won't be posted to this function
122
  $defaults = $this->default_ga_values();
123
  foreach ( $defaults['ga_general'] as $key => $value ) {
124
- if ( ! isset( $data[$key] ) ) {
125
- $this->options[$this->form_prefix][$key] = $value;
126
  }
127
  }
128
 
@@ -152,7 +164,7 @@ if ( ! class_exists( 'Yoast_GA_Admin' ) ) {
152
  *
153
  * @todo, we need to implement a new icon for this, currently we're using the WP seo icon
154
  */
155
- public function create_menu( $param = NULL ) {
156
  // Add main page
157
  add_menu_page( __( 'Yoast Google Analytics:', 'google-analytics-for-wordpress' ) . ' ' . __( 'General Settings', 'google-analytics-for-wordpress' ), __( 'Analytics', 'google-analytics-for-wordpress' ), 'manage_options', 'yst_ga_dashboard', array(
158
  $this,
@@ -255,7 +267,7 @@ if ( ! class_exists( 'Yoast_GA_Admin' ) ) {
255
  $action .= '?page=' . $_GET['page'];
256
  }
257
 
258
- return '<form action="' . $action . '" method="post" id="yoast-ga-form-' . $this->form_namespace . '" class="yoast_ga_form">' . wp_nonce_field( 'save_settings', 'yoast_ga_nonce', NULL, false );
259
  }
260
 
261
  /**
@@ -267,7 +279,7 @@ if ( ! class_exists( 'Yoast_GA_Admin' ) ) {
267
  * @return null|string
268
  */
269
  public function end_form( $button_label = "Save changes", $name = 'submit' ) {
270
- $output = NULL;
271
  $output .= '<div class="ga-form ga-form-input">';
272
  $output .= '<input type="submit" name="ga-form-' . $name . '" value="' . $button_label . '" class="button button-primary ga-form-submit" id="yoast-ga-form-submit-' . $this->form_namespace . '">';
273
  $output .= '</div></form>';
@@ -286,8 +298,8 @@ if ( ! class_exists( 'Yoast_GA_Admin' ) ) {
286
  *
287
  * @return null|string
288
  */
289
- public function input( $type = 'text', $title = NULL, $name = NULL, $text_label = NULL, $description = NULL ) {
290
- $input = NULL;
291
  $id = str_replace( '[', '-', $name );
292
  $id = str_replace( ']', '', $id );
293
 
@@ -332,8 +344,8 @@ if ( ! class_exists( 'Yoast_GA_Admin' ) ) {
332
  *
333
  * @return null|string
334
  */
335
- public function select( $title, $name, $values, $description = NULL, $multiple = false ) {
336
- $select = NULL;
337
  $id = str_replace( '[', '-', $name );
338
  $id = str_replace( ']', '', $id );
339
  $select .= '<div class="ga-form ga-form-input">';
@@ -382,8 +394,8 @@ if ( ! class_exists( 'Yoast_GA_Admin' ) ) {
382
  *
383
  * @return null|string
384
  */
385
- public function textarea( $title, $name, $description = NULL ) {
386
- $text = NULL;
387
  $id = $this->form_prefix . '_' . $name;
388
  $text .= '<div class="ga-form ga-form-input">';
389
  if ( ! is_null( $title ) ) {
@@ -435,15 +447,15 @@ if ( ! class_exists( 'Yoast_GA_Admin' ) ) {
435
  $response = wp_remote_retrieve_body( $response );
436
 
437
  if ( $http_code == 200 ) {
438
- $options['ga_api_responses'][$token] = array(
439
  'response' => array( 'code' => $http_code ),
440
  'body' => $response
441
  );
442
- $options['ga_token'] = $token;
443
  update_option( 'Yoast_Google_Analytics', $options );
444
  }
445
 
446
- $xml_reader = new SimpleXMLElement( $options['ga_api_responses'][$token]['body'] );
447
 
448
  if ( ! empty( $xml_reader->entry ) ) {
449
 
@@ -658,7 +670,7 @@ if ( ! class_exists( 'Yoast_GA_Admin' ) ) {
658
 
659
  if ( true == WP_DEBUG ) {
660
  // Show the debug information if debug is enabled in the wp_config file
661
- echo '<div id="ga-debug-info" class="postbox"><h3 class="hndle"><span>'.__('Debug information', 'google-analytics-for-wordpress').'</span></h3><div class="inside"><pre>';
662
  var_dump( $this->options );
663
  echo '</pre></div></div>';
664
  }
43
  $this->options = get_option( 'yst_ga' );
44
  }
45
 
46
+ global $Yoast_GA_Options;
47
+ if ( is_null( $Yoast_GA_Options->get_tracking_code() ) ) {
48
+ add_action( 'admin_notices', array( $this, 'config_warning' ) );
49
+ }
50
+
51
  if ( $_SERVER['REQUEST_METHOD'] == 'POST' ) {
52
  if ( isset( $_POST['ga-form-settings'] ) && wp_verify_nonce( $_POST['yoast_ga_nonce'], 'save_settings' ) ) {
53
  // Post submitted and verified with our nonce
65
  $this->connect_with_google_analytics();
66
  }
67
 
68
+ /**
69
+ * Throw a warning if no UA code is set.
70
+ */
71
+ public function config_warning() {
72
+ echo '<div class="error"><p>' . sprintf( __( 'Please configure your %s$1Google Analytics settings%s$2!', 'google-analytics-for-wordpress' ), '<a href="' . admin_url( 'admin.php?page=yst_ga_settings' ) . '">', '</a>' ) . '</p></div>';
73
+ }
74
+
75
  /**
76
  * Set the default GA settings here
77
  * @return array
79
  public function default_ga_values() {
80
  return array(
81
  $this->form_prefix => array(
82
+ 'analytics_profile' => null,
83
  'manual_ua_code' => 0,
84
+ 'manual_ua_code_field' => null,
85
+ 'track_internal_as_outbound' => null,
86
+ 'track_internal_as_label' => null,
87
  'track_outbound' => 0,
88
  'anonymous_data' => 0,
89
  'enable_universal' => 0,
90
  'demographics' => 0,
91
+ 'ignore_users' => array( 'editor' ),
92
+ 'anonymize_ips' => null,
93
  'track_download_as' => 'event',
94
  'extensions_of_files' => 'doc,exe,js,pdf,ppt,tgz,zip,xls',
95
  'track_full_url' => 'domain',
96
+ 'subdomain_tracking' => null,
97
  'tag_links_in_rss' => 0,
98
  'allow_anchor' => 0,
99
  'add_allow_linker' => 0,
100
+ 'custom_code' => null,
101
  'debug_mode' => 0,
102
  'firebug_lite' => 0,
103
  )
113
  */
114
  public function get_setting( $name ) {
115
 
116
+ if ( isset( $this->options[ $this->form_prefix ][ $name ] ) ) {
117
+ return $this->options[ $this->form_prefix ][ $name ];
118
  } else {
119
+ return null;
120
  }
121
  }
122
 
127
  */
128
  public function save_settings( $data ) {
129
  foreach ( $data as $key => $value ) {
130
+ $this->options[ $this->form_prefix ][ $key ] = $value;
131
  }
132
 
133
  // Check checkboxes, on a uncheck they won't be posted to this function
134
  $defaults = $this->default_ga_values();
135
  foreach ( $defaults['ga_general'] as $key => $value ) {
136
+ if ( ! isset( $data[ $key ] ) ) {
137
+ $this->options[ $this->form_prefix ][ $key ] = $value;
138
  }
139
  }
140
 
164
  *
165
  * @todo, we need to implement a new icon for this, currently we're using the WP seo icon
166
  */
167
+ public function create_menu( $param = null ) {
168
  // Add main page
169
  add_menu_page( __( 'Yoast Google Analytics:', 'google-analytics-for-wordpress' ) . ' ' . __( 'General Settings', 'google-analytics-for-wordpress' ), __( 'Analytics', 'google-analytics-for-wordpress' ), 'manage_options', 'yst_ga_dashboard', array(
170
  $this,
267
  $action .= '?page=' . $_GET['page'];
268
  }
269
 
270
+ return '<form action="' . $action . '" method="post" id="yoast-ga-form-' . $this->form_namespace . '" class="yoast_ga_form">' . wp_nonce_field( 'save_settings', 'yoast_ga_nonce', null, false );
271
  }
272
 
273
  /**
279
  * @return null|string
280
  */
281
  public function end_form( $button_label = "Save changes", $name = 'submit' ) {
282
+ $output = null;
283
  $output .= '<div class="ga-form ga-form-input">';
284
  $output .= '<input type="submit" name="ga-form-' . $name . '" value="' . $button_label . '" class="button button-primary ga-form-submit" id="yoast-ga-form-submit-' . $this->form_namespace . '">';
285
  $output .= '</div></form>';
298
  *
299
  * @return null|string
300
  */
301
+ public function input( $type = 'text', $title = null, $name = null, $text_label = null, $description = null ) {
302
+ $input = null;
303
  $id = str_replace( '[', '-', $name );
304
  $id = str_replace( ']', '', $id );
305
 
344
  *
345
  * @return null|string
346
  */
347
+ public function select( $title, $name, $values, $description = null, $multiple = false ) {
348
+ $select = null;
349
  $id = str_replace( '[', '-', $name );
350
  $id = str_replace( ']', '', $id );
351
  $select .= '<div class="ga-form ga-form-input">';
394
  *
395
  * @return null|string
396
  */
397
+ public function textarea( $title, $name, $description = null ) {
398
+ $text = null;
399
  $id = $this->form_prefix . '_' . $name;
400
  $text .= '<div class="ga-form ga-form-input">';
401
  if ( ! is_null( $title ) ) {
447
  $response = wp_remote_retrieve_body( $response );
448
 
449
  if ( $http_code == 200 ) {
450
+ $options['ga_api_responses'][ $token ] = array(
451
  'response' => array( 'code' => $http_code ),
452
  'body' => $response
453
  );
454
+ $options['ga_token'] = $token;
455
  update_option( 'Yoast_Google_Analytics', $options );
456
  }
457
 
458
+ $xml_reader = new SimpleXMLElement( $options['ga_api_responses'][ $token ]['body'] );
459
 
460
  if ( ! empty( $xml_reader->entry ) ) {
461
 
670
 
671
  if ( true == WP_DEBUG ) {
672
  // Show the debug information if debug is enabled in the wp_config file
673
+ echo '<div id="ga-debug-info" class="postbox"><h3 class="hndle"><span>' . __( 'Debug information', 'google-analytics-for-wordpress' ) . '</span></h3><div class="inside"><pre>';
674
  var_dump( $this->options );
675
  echo '</pre></div></div>';
676
  }
admin/pages/dashboard.php CHANGED
@@ -6,7 +6,10 @@ echo $yoast_ga_admin->content_head();
6
  <h2 id="yoast_ga_title"><?php echo __( 'Yoast Google Analytics: Dashboard', 'google-analytics-for-wordpress' ); ?></h2>
7
 
8
  <div id="ga-promote">
9
- <p>This feature <a href="https://yoast.com/google-analytics-5/#utm_medium=textlink&utm_source=gawp-config&utm_campaign=wpgaplugin">will be coming soon</a>. For now, you can <a href="https://yoast.com/cat/analytics/#utm_medium=textlink&utm_source=gawp-config&utm_campaign=wpgaplugin">read our posts on Analytics</a>, or, of course, <a href="http://www.google.com/analytics/">log into Google Analytics</a> yourself.</p>
 
 
 
10
 
11
  <p align="center"><img src="<?php echo GAWP_URL . 'img/'; ?>yoast_avatar_joost.png" width="250"></p>
12
  </div>
6
  <h2 id="yoast_ga_title"><?php echo __( 'Yoast Google Analytics: Dashboard', 'google-analytics-for-wordpress' ); ?></h2>
7
 
8
  <div id="ga-promote">
9
+ <p>This feature
10
+ <a href="https://yoast.com/google-analytics-5/#utm_medium=textlink&utm_source=gawp-config&utm_campaign=wpgaplugin">will be coming soon</a>. For now, you can
11
+ <a href="https://yoast.com/cat/analytics/#utm_medium=textlink&utm_source=gawp-config&utm_campaign=wpgaplugin">read our posts on Analytics</a>, or, of course,
12
+ <a href="http://www.google.com/analytics/">log into Google Analytics</a> yourself.</p>
13
 
14
  <p align="center"><img src="<?php echo GAWP_URL . 'img/'; ?>yoast_avatar_joost.png" width="250"></p>
15
  </div>
admin/pages/settings.php CHANGED
@@ -3,117 +3,117 @@ global $yoast_ga_admin;
3
 
4
  echo $yoast_ga_admin->content_head();
5
  ?>
6
- <h2 id="yoast_ga_title"><?php echo __( 'Yoast Google Analytics: Settings', 'google-analytics-for-wordpress' ); ?></h2>
7
 
8
  <?php
9
- settings_errors('yoast_google_analytics');
10
  ?>
11
 
12
- <h2 class="nav-tab-wrapper" id="ga-tabs">
13
- <a class="nav-tab" id="general-tab" href="#top#general"><?php _e( 'General', 'google-analytics-for-wordpress' ); ?></a>
14
- <a class="nav-tab" id="universal-tab" href="#top#universal"><?php _e( 'Universal', 'google-analytics-for-wordpress' ); ?></a>
15
- <a class="nav-tab" id="advanced-tab" href="#top#advanced"><?php _e( 'Advanced', 'google-analytics-for-wordpress' ); ?></a>
16
- <a class="nav-tab" id="debugmode-tab" href="#top#debugmode"><?php _e( 'Debug mode', 'google-analytics-for-wordpress' ); ?></a>
17
- </h2>
18
 
19
  <?php
20
  echo $yoast_ga_admin->create_form( 'settings' );
21
  ?>
22
- <div class="tabwrapper">
23
- <div id="general" class="gatab">
24
- <?php
25
- echo '<h2>' . __( 'General settings', 'google-analytics-for-wordpress' ) . '</h2>';
26
- echo '<div id="ga-promote">';
27
 
28
- $profiles = $yoast_ga_admin->get_profiles();
29
- $ga_url = $_SERVER['PHP_SELF'];
30
- if ( isset( $_GET['page'] ) ) {
31
- $ga_url .= '?page=' . $_GET['page'];
32
- }
33
- $ga_url .= '&reauth=true';
34
-
35
- echo "<div id='google_ua_code_field'>";
36
- if ( count( $profiles ) == 0 ) {
37
- echo '<div class="ga-form ga-form-input">';
38
- echo '<label class="ga-form ga-form-text-label ga-form-label-left" id="yoast-ga-form-label-text-ga-authwithgoogle" />' . __( 'Google profile', 'google-analytics-for-wordpress' ) . ':</label>';
39
- echo '<a class="button" href="' . $ga_url . '">' . __('Authenticate with your Google account', 'google-analytics-for-wordpress') . '</a>';
40
- echo '</div>';
41
- echo '<div class="ga-form ga-form-input">';
42
- echo '<label class="ga-form ga-form-text-label ga-form-label-left" id="yoast-ga-form-label-text-ga-authwithgoogle" />' . __('Current UA-profile', 'google-analytics-for-wordpress') . '</label>';
43
- echo $yoast_ga_admin->get_setting('analytics_profile');
44
- echo '</div>';
45
- } else {
46
- echo $yoast_ga_admin->select( 'Analytics profile', 'analytics_profile', $profiles );
47
 
48
- echo '<div class="ga-form ga-form-input">';
49
- echo '<label class="ga-form ga-form-text-label ga-form-label-left" id="yoast-ga-form-label-text-ga-authwithgoogle" />&nbsp;</label>';
50
- echo '<a class="button" href="' . $ga_url . '">' . __('Re-authenticate with your Google account', 'google-analytics-for-wordpress') . '</a>';
51
- echo '</div>';
52
- }
53
- echo "</div>";
 
 
 
 
 
 
54
 
55
- echo '<label class="ga-form ga-form-checkbox-label ga-form-label-left">';
56
- echo $yoast_ga_admin->input( 'checkbox', NULL, 'manual_ua_code', __('Manually enter your UA code', 'google-analytics-for-wordpress' ) );
57
- echo '</label>';
58
- echo '<div id="enter_ua">';
59
- echo $yoast_ga_admin->input( 'text', NULL, 'manual_ua_code_field');
60
  echo '</div>';
61
- echo '<div class="clear"></div></div>';
62
- ?>
63
- <div class="clear"><br /></div>
64
- <?php
65
- echo $yoast_ga_admin->input( 'checkbox', __('Track outbound click & downloads', 'google-analytics-for-wordpress' ), 'track_outbound', NULL, __( 'Clicks &amp; downloads will be tracked as events, you can find these under Content &raquo; Event Tracking in your Google Analytics reports.', 'google-analytics-for-wordpress' ) );
66
- echo $yoast_ga_admin->input( 'checkbox', __('Allow tracking of anonymous data', 'google-analytics-for-wordpress' ), 'anonymous_data', NULL, __( 'By allowing us to track anonymous data we can better help you, because we know with which WordPress configurations, themes and plugins we should test. No personal data will be submitted.', 'google-analytics-for-wordpress' ) );
67
- echo $yoast_ga_admin->input( 'checkbox', __('Anonymize IP\'s', 'google-analytics-for-wordpress' ), 'anonymize_ips', NULL, __( 'This adds <code><a href="http://code.google.com/apis/analytics/docs/gaJS/gaJSApi_gat.html#_gat._anonymizeIp" target="_blank">_anonymizeIp</a></code>, telling Google Analytics to anonymize the information sent by the tracker objects by removing the last octet of the IP address prior to its storage.', 'google-analytics-for-wordpress' ) );
68
- echo $yoast_ga_admin->select( 'Ignore users', 'ignore_users', $yoast_ga_admin->get_userroles(), __('Hint: Select multiple roles by using CTRL or CMD.', 'google-analytics-for-wordpress' ) . '<br />' . __( 'Users of the role you select and higher will be ignored, so if you select Editor, all Editors and Administrators will be ignored.', 'google-analytics-for-wordpress' ), true );
69
- ?>
70
- </div>
71
- <div id="universal" class="gatab">
72
- <?php
73
- echo '<h2>' . __( 'Universal settings', 'google-analytics-for-wordpress' ) . '</h2>';
74
- echo $yoast_ga_admin->input( 'checkbox', __('Enable Universal tracking', 'google-analytics-for-wordpress' ), 'enable_universal', NULL, __('First enable Universal tracking in your Google Analytics account. How to do that, please read <a href="https://developers.google.com/analytics/devguides/collection/upgrade/guide" target="_blank">this guide</a> to learn how to do that.', 'google-analytics-for-wordpress') );
75
- echo $yoast_ga_admin->input( 'checkbox', __('Enable Demographics and Interest Reports', 'google-analytics-for-wordpress' ), 'demographics', NULL, __('You have to enable the Demographics in Google Analytics before you can see the tracking data. We have a doc in our <a href="http://kb.yoast.com/article/154-enable-demographics-and-interests-report-in-google-analytics//#utm_medium=kb-link&utm_source=gawp-config&utm_campaign=wpgaplugin" target="_blank">knowlegde base</a> about this feature.', 'google-analytics-for-wordpress') );
76
- ?>
77
- </div>
78
- <div id="advanced" class="gatab">
79
- <?php
80
- echo '<h2>' . __( 'Advanced settings', 'google-analytics-for-wordpress' ) . '</h2>';
81
- echo $yoast_ga_admin->select( __('Track downloads as', 'google-analytics-for-wordpress' ), 'track_download_as', $yoast_ga_admin->track_download_types(), __( 'Not recommended, as this would skew your statistics, but it does make it possible to track downloads as goals.', 'google-analytics-for-wordpress' ) );
82
- echo $yoast_ga_admin->input( 'text', __('Extensions of files to track as downloads', 'google-analytics-for-wordpress' ), 'extensions_of_files', NULL, 'Please separate extensions using commas' );
83
- echo $yoast_ga_admin->select( __('Track full URL of outbound clicks or just the domain', 'google-analytics-for-wordpress' ), 'track_full_url', $yoast_ga_admin->get_track_full_url() );
84
- echo $yoast_ga_admin->input( 'text', __('Subdomain tracking', 'google-analytics-for-wordpress' ), 'subdomain_tracking', NULL, __('This allows you to set the domain that\'s set by <code>setDomainName</code> for tracking subdomains, if empty this will not be set.', 'google-analytics-for-wordpress' ) );
85
 
86
- echo $yoast_ga_admin->input( 'text', __('Set path for internal links to track as outbound links', 'google-analytics-for-wordpress' ), 'track_internal_as_outbound', NULL, 'If you want to track all internal links that begin with <code>/out/</code>, enter <code>/out/</code> in the box above. If you have multiple prefixes you can separate them with comma\'s: <code>/out/,/recommends/</code>' );
87
- echo $yoast_ga_admin->input( 'text', __('Label for those links', 'google-analytics-for-wordpress' ), 'track_internal_as_label', NULL, "The label to use for these links, this will be added to where the click came from, so if the label is \"aff\", the label for a click from the content of an article becomes \"outbound-article-aff\"." );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
88
 
89
- echo $yoast_ga_admin->input( 'checkbox', __('Tag links in RSS feed with campaign variables', 'google-analytics-for-wordpress' ), 'tag_links_in_rss', NULL, __( 'Do not use this feature if you use FeedBurner, as FeedBurner can do this automatically, and better than this plugin can. Check <a href="http://www.google.com/support/feedburner/bin/answer.py?hl=en&amp;answer=165769" target="_blank">this help page</a> for info on how to enable this feature in FeedBurner.', 'google-analytics-for-wordpress' ) );
90
- echo $yoast_ga_admin->input( 'checkbox', __('Allow anchor', 'google-analytics-for-wordpress' ), 'allow_anchor', NULL, __( 'This adds a <code><a href="http://code.google.com/apis/analytics/docs/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._setAllowAnchor" target="_blank">_setAllowAnchor</a></code> call to your tracking code, and makes RSS link tagging use a # as well.', 'google-analytics-for-wordpress' ) );
91
- echo $yoast_ga_admin->input( 'checkbox', __('Add <code>_setAllowLinker</code>', 'google-analytics-for-wordpress' ), 'add_allow_linker', NULL, __( 'This adds a <code><a href="http://code.google.com/apis/analytics/docs/gaJS/gaJSApiDomainDirectory.html#_gat.GA_Tracker_._setAllowLinker" target="_blank">_setAllowLinker</a></code> call to your tracking code, allowing you to use <code>_link</code> and related functions.', 'google-analytics-for-wordpress' ) );
92
- echo $yoast_ga_admin->textarea( 'Custom code', 'custom_code', __( 'Not for the average user: this allows you to add a line of code, to be added before the <code>trackPageview</code> call.', 'google-analytics-for-wordpress' ) );
93
- ?>
94
- </div>
95
- <div id="debugmode" class="gatab">
96
- <?php
97
- echo '<h2>' . __( 'Debug settings', 'google-analytics-for-wordpress' ) . '</h2>';
98
 
99
- echo '<div id="ga-promote">';
100
- echo '<p class="ga-topdescription">' . __( 'If you want to confirm that tracking on your blog is working as it should, enable these options and check the console in Firebug (for Firefox), Firebug Lite (for other browsers) or Chrome & Safari\'s Web Inspector. Be absolutely sure to disable debugging afterwards, as it is slower than normal tracking.', 'google-analytics-for-wordpress' ) . '</p>';
101
- echo '<p class="ga-topdescription"><strong>' . __( 'Note', 'google-analytics-for-wordpress' ) . ':</strong> ' . __( 'the debugging and firebug scripts are only loaded for admins.', 'google-analytics-for-wordpress' ) . '</p>';
102
- echo '</div>';
103
- echo $yoast_ga_admin->input( 'checkbox', __('Enable debug mode', 'google-analytics-for-wordpress' ), 'debug_mode' );
104
- echo $yoast_ga_admin->input( 'checkbox', __('Enable Firebug Lite', 'google-analytics-for-wordpress' ), 'firebug_lite' );
105
- ?>
106
- </div>
 
 
 
 
 
 
 
 
 
107
  </div>
 
108
  <?php
109
  echo $yoast_ga_admin->end_form( 'Save changes', 'settings' );
110
  echo $yoast_ga_admin->content_footer();
111
  ?>
112
- <script type="text/javascript">
113
  jQuery(document).ready(
114
- function() {
115
  jQuery('#yoast-ga-form-select-settings-analytics_profile').chosen();
116
- jQuery('#yoast-ga-form-select-settings-ignore_users').chosen( { placeholder_text_multiple : '<?php echo __( 'Select the users to ignore', 'google-analytics-for-wordpress' ); ?>' });
117
  }
118
  );
119
  </script>
3
 
4
  echo $yoast_ga_admin->content_head();
5
  ?>
6
+ <h2 id="yoast_ga_title"><?php echo __( 'Yoast Google Analytics: Settings', 'google-analytics-for-wordpress' ); ?></h2>
7
 
8
  <?php
9
+ settings_errors( 'yoast_google_analytics' );
10
  ?>
11
 
12
+ <h2 class="nav-tab-wrapper" id="ga-tabs">
13
+ <a class="nav-tab" id="general-tab" href="#top#general"><?php _e( 'General', 'google-analytics-for-wordpress' ); ?></a>
14
+ <a class="nav-tab" id="universal-tab" href="#top#universal"><?php _e( 'Universal', 'google-analytics-for-wordpress' ); ?></a>
15
+ <a class="nav-tab" id="advanced-tab" href="#top#advanced"><?php _e( 'Advanced', 'google-analytics-for-wordpress' ); ?></a>
16
+ <a class="nav-tab" id="debugmode-tab" href="#top#debugmode"><?php _e( 'Debug mode', 'google-analytics-for-wordpress' ); ?></a>
17
+ </h2>
18
 
19
  <?php
20
  echo $yoast_ga_admin->create_form( 'settings' );
21
  ?>
22
+ <div class="tabwrapper">
23
+ <div id="general" class="gatab">
24
+ <?php
25
+ echo '<h2>' . __( 'General settings', 'google-analytics-for-wordpress' ) . '</h2>';
26
+ echo '<div id="ga-promote">';
27
 
28
+ $profiles = $yoast_ga_admin->get_profiles();
29
+ $ga_url = $_SERVER['PHP_SELF'];
30
+ if ( isset( $_GET['page'] ) ) {
31
+ $ga_url .= '?page=' . $_GET['page'];
32
+ }
33
+ $ga_url .= '&reauth=true';
 
 
 
 
 
 
 
 
 
 
 
 
 
34
 
35
+ echo "<div id='google_ua_code_field'>";
36
+ if ( count( $profiles ) == 0 ) {
37
+ echo '<div class="ga-form ga-form-input">';
38
+ echo '<label class="ga-form ga-form-text-label ga-form-label-left" id="yoast-ga-form-label-text-ga-authwithgoogle" />' . __( 'Google profile', 'google-analytics-for-wordpress' ) . ':</label>';
39
+ echo '<a class="button" href="' . $ga_url . '">' . __( 'Authenticate with your Google account', 'google-analytics-for-wordpress' ) . '</a>';
40
+ echo '</div>';
41
+ echo '<div class="ga-form ga-form-input">';
42
+ echo '<label class="ga-form ga-form-text-label ga-form-label-left" id="yoast-ga-form-label-text-ga-authwithgoogle" />' . __( 'Current UA-profile', 'google-analytics-for-wordpress' ) . '</label>';
43
+ echo $yoast_ga_admin->get_setting( 'analytics_profile' );
44
+ echo '</div>';
45
+ } else {
46
+ echo $yoast_ga_admin->select( 'Analytics profile', 'analytics_profile', $profiles );
47
 
48
+ echo '<div class="ga-form ga-form-input">';
49
+ echo '<label class="ga-form ga-form-text-label ga-form-label-left" id="yoast-ga-form-label-text-ga-authwithgoogle" />&nbsp;</label>';
50
+ echo '<a class="button" href="' . $ga_url . '">' . __( 'Re-authenticate with your Google account', 'google-analytics-for-wordpress' ) . '</a>';
 
 
51
  echo '</div>';
52
+ }
53
+ echo "</div>";
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
54
 
55
+ echo '<label class="ga-form ga-form-checkbox-label ga-form-label-left">';
56
+ echo $yoast_ga_admin->input( 'checkbox', null, 'manual_ua_code', __( 'Manually enter your UA code', 'google-analytics-for-wordpress' ) );
57
+ echo '</label>';
58
+ echo '<div id="enter_ua">';
59
+ echo $yoast_ga_admin->input( 'text', null, 'manual_ua_code_field' );
60
+ echo '</div>';
61
+ echo '<div class="clear"></div></div>';
62
+ ?>
63
+ <div class="clear"><br /></div>
64
+ <?php
65
+ echo $yoast_ga_admin->input( 'checkbox', __( 'Track outbound click & downloads', 'google-analytics-for-wordpress' ), 'track_outbound', null, __( 'Clicks &amp; downloads will be tracked as events, you can find these under Content &raquo; Event Tracking in your Google Analytics reports.', 'google-analytics-for-wordpress' ) );
66
+ echo $yoast_ga_admin->input( 'checkbox', __( 'Allow tracking of anonymous data', 'google-analytics-for-wordpress' ), 'anonymous_data', null, __( 'By allowing us to track anonymous data we can better help you, because we know with which WordPress configurations, themes and plugins we should test. No personal data will be submitted.', 'google-analytics-for-wordpress' ) );
67
+ echo $yoast_ga_admin->input( 'checkbox', __( 'Anonymize IP\'s', 'google-analytics-for-wordpress' ), 'anonymize_ips', null, __( 'This adds <code><a href="http://code.google.com/apis/analytics/docs/gaJS/gaJSApi_gat.html#_gat._anonymizeIp" target="_blank">_anonymizeIp</a></code>, telling Google Analytics to anonymize the information sent by the tracker objects by removing the last octet of the IP address prior to its storage.', 'google-analytics-for-wordpress' ) );
68
+ echo $yoast_ga_admin->select( 'Ignore users', 'ignore_users', $yoast_ga_admin->get_userroles(), __( 'Hint: Select multiple roles by using CTRL or CMD.', 'google-analytics-for-wordpress' ) . '<br />' . __( 'Users of the role you select and higher will be ignored, so if you select Editor, all Editors and Administrators will be ignored.', 'google-analytics-for-wordpress' ), true );
69
+ ?>
70
+ </div>
71
+ <div id="universal" class="gatab">
72
+ <?php
73
+ echo '<h2>' . __( 'Universal settings', 'google-analytics-for-wordpress' ) . '</h2>';
74
+ echo $yoast_ga_admin->input( 'checkbox', __( 'Enable Universal tracking', 'google-analytics-for-wordpress' ), 'enable_universal', null, __( 'First enable Universal tracking in your Google Analytics account. How to do that, please read <a href="https://developers.google.com/analytics/devguides/collection/upgrade/guide" target="_blank">this guide</a> to learn how to do that.', 'google-analytics-for-wordpress' ) );
75
+ echo $yoast_ga_admin->input( 'checkbox', __( 'Enable Demographics and Interest Reports', 'google-analytics-for-wordpress' ), 'demographics', null, __( 'You have to enable the Demographics in Google Analytics before you can see the tracking data. We have a doc in our <a href="http://kb.yoast.com/article/154-enable-demographics-and-interests-report-in-google-analytics//#utm_medium=kb-link&utm_source=gawp-config&utm_campaign=wpgaplugin" target="_blank">knowlegde base</a> about this feature.', 'google-analytics-for-wordpress' ) );
76
+ ?>
77
+ </div>
78
+ <div id="advanced" class="gatab">
79
+ <?php
80
+ echo '<h2>' . __( 'Advanced settings', 'google-analytics-for-wordpress' ) . '</h2>';
81
+ echo $yoast_ga_admin->select( __( 'Track downloads as', 'google-analytics-for-wordpress' ), 'track_download_as', $yoast_ga_admin->track_download_types(), __( 'Not recommended, as this would skew your statistics, but it does make it possible to track downloads as goals.', 'google-analytics-for-wordpress' ) );
82
+ echo $yoast_ga_admin->input( 'text', __( 'Extensions of files to track as downloads', 'google-analytics-for-wordpress' ), 'extensions_of_files', null, 'Please separate extensions using commas' );
83
+ echo $yoast_ga_admin->select( __( 'Track full URL of outbound clicks or just the domain', 'google-analytics-for-wordpress' ), 'track_full_url', $yoast_ga_admin->get_track_full_url() );
84
+ echo $yoast_ga_admin->input( 'text', __( 'Subdomain tracking', 'google-analytics-for-wordpress' ), 'subdomain_tracking', null, __( 'This allows you to set the domain that\'s set by <code>setDomainName</code> for tracking subdomains, if empty this will not be set.', 'google-analytics-for-wordpress' ) );
85
 
86
+ echo $yoast_ga_admin->input( 'text', __( 'Set path for internal links to track as outbound links', 'google-analytics-for-wordpress' ), 'track_internal_as_outbound', null, 'If you want to track all internal links that begin with <code>/out/</code>, enter <code>/out/</code> in the box above. If you have multiple prefixes you can separate them with comma\'s: <code>/out/,/recommends/</code>' );
87
+ echo $yoast_ga_admin->input( 'text', __( 'Label for those links', 'google-analytics-for-wordpress' ), 'track_internal_as_label', null, "The label to use for these links, this will be added to where the click came from, so if the label is \"aff\", the label for a click from the content of an article becomes \"outbound-article-aff\"." );
 
 
 
 
 
 
 
88
 
89
+ echo $yoast_ga_admin->input( 'checkbox', __( 'Tag links in RSS feed with campaign variables', 'google-analytics-for-wordpress' ), 'tag_links_in_rss', null, __( 'Do not use this feature if you use FeedBurner, as FeedBurner can do this automatically, and better than this plugin can. Check <a href="http://www.google.com/support/feedburner/bin/answer.py?hl=en&amp;answer=165769" target="_blank">this help page</a> for info on how to enable this feature in FeedBurner.', 'google-analytics-for-wordpress' ) );
90
+ echo $yoast_ga_admin->input( 'checkbox', __( 'Allow anchor', 'google-analytics-for-wordpress' ), 'allow_anchor', null, __( 'This adds a <code><a href="http://code.google.com/apis/analytics/docs/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._setAllowAnchor" target="_blank">_setAllowAnchor</a></code> call to your tracking code, and makes RSS link tagging use a # as well.', 'google-analytics-for-wordpress' ) );
91
+ echo $yoast_ga_admin->input( 'checkbox', __( 'Add <code>_setAllowLinker</code>', 'google-analytics-for-wordpress' ), 'add_allow_linker', null, __( 'This adds a <code><a href="http://code.google.com/apis/analytics/docs/gaJS/gaJSApiDomainDirectory.html#_gat.GA_Tracker_._setAllowLinker" target="_blank">_setAllowLinker</a></code> call to your tracking code, allowing you to use <code>_link</code> and related functions.', 'google-analytics-for-wordpress' ) );
92
+ echo $yoast_ga_admin->textarea( 'Custom code', 'custom_code', __( 'Not for the average user: this allows you to add a line of code, to be added before the <code>trackPageview</code> call.', 'google-analytics-for-wordpress' ) );
93
+ ?>
94
+ </div>
95
+ <div id="debugmode" class="gatab">
96
+ <?php
97
+ echo '<h2>' . __( 'Debug settings', 'google-analytics-for-wordpress' ) . '</h2>';
98
+
99
+ echo '<div id="ga-promote">';
100
+ echo '<p class="ga-topdescription">' . __( 'If you want to confirm that tracking on your blog is working as it should, enable these options and check the console in Firebug (for Firefox), Firebug Lite (for other browsers) or Chrome & Safari\'s Web Inspector. Be absolutely sure to disable debugging afterwards, as it is slower than normal tracking.', 'google-analytics-for-wordpress' ) . '</p>';
101
+ echo '<p class="ga-topdescription"><strong>' . __( 'Note', 'google-analytics-for-wordpress' ) . ':</strong> ' . __( 'the debugging and firebug scripts are only loaded for admins.', 'google-analytics-for-wordpress' ) . '</p>';
102
+ echo '</div>';
103
+ echo $yoast_ga_admin->input( 'checkbox', __( 'Enable debug mode', 'google-analytics-for-wordpress' ), 'debug_mode' );
104
+ echo $yoast_ga_admin->input( 'checkbox', __( 'Enable Firebug Lite', 'google-analytics-for-wordpress' ), 'firebug_lite' );
105
+ ?>
106
  </div>
107
+ </div>
108
  <?php
109
  echo $yoast_ga_admin->end_form( 'Save changes', 'settings' );
110
  echo $yoast_ga_admin->content_footer();
111
  ?>
112
+ <script type="text/javascript">
113
  jQuery(document).ready(
114
+ function () {
115
  jQuery('#yoast-ga-form-select-settings-analytics_profile').chosen();
116
+ jQuery('#yoast-ga-form-select-settings-ignore_users').chosen({placeholder_text_multiple: '<?php echo __( 'Select the users to ignore', 'google-analytics-for-wordpress' ); ?>'});
117
  }
118
  );
119
  </script>
frontend/class-frontend.php CHANGED
@@ -131,7 +131,7 @@ if ( ! class_exists( 'Yoast_GA_Frontend' ) ) {
131
 
132
  // Break out immediately if the link is not an http or https link.
133
  if ( $protocol != 'http' && $protocol != 'https' && $protocol != 'mailto' ) {
134
- $type = NULL;
135
  } else {
136
  if ( ( $protocol == 'mailto' ) ) {
137
  $type = 'email';
131
 
132
  // Break out immediately if the link is not an http or https link.
133
  if ( $protocol != 'http' && $protocol != 'https' && $protocol != 'mailto' ) {
134
+ $type = null;
135
  } else {
136
  if ( ( $protocol == 'mailto' ) ) {
137
  $type = 'email';
googleanalytics.php CHANGED
@@ -4,7 +4,7 @@ Plugin Name: Google Analytics by Yoast
4
  Plugin URI: http://yoast.com/wordpress/google-analytics/#utm_source=wordpress&utm_medium=plugin&utm_campaign=wpgaplugin&utm_content=v500
5
  Description: This plugin makes it simple to add Google Analytics to your WordPress blog, adding lots of features, eg. custom variables and automatic clickout and download tracking.
6
  Author: Joost de Valk
7
- Version: 5.0.0
8
  Requires at least: 3.8
9
  Author URI: http://yoast.com/
10
  License: GPL v3
@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
30
 
31
  // This plugin was originally based on Rich Boakes' Analytics plugin: http://boakes.org/analytics, but has since been rewritten and refactored multiple times.
32
 
33
- define( "GAWP_VERSION", '5.0.0' );
34
 
35
  define( "GAWP_FILE", __FILE__ );
36
 
@@ -38,7 +38,7 @@ define( "GAWP_URL", trailingslashit( plugin_dir_url( __FILE__ ) ) );
38
 
39
  define( "GAWP_PATH", plugin_dir_path( __FILE__ ) );
40
 
41
- if( !class_exists('Yoast_GA_Options') ){
42
  require_once GAWP_PATH . 'includes/class-options.php';
43
  }
44
 
4
  Plugin URI: http://yoast.com/wordpress/google-analytics/#utm_source=wordpress&utm_medium=plugin&utm_campaign=wpgaplugin&utm_content=v500
5
  Description: This plugin makes it simple to add Google Analytics to your WordPress blog, adding lots of features, eg. custom variables and automatic clickout and download tracking.
6
  Author: Joost de Valk
7
+ Version: 5.0.1
8
  Requires at least: 3.8
9
  Author URI: http://yoast.com/
10
  License: GPL v3
30
 
31
  // This plugin was originally based on Rich Boakes' Analytics plugin: http://boakes.org/analytics, but has since been rewritten and refactored multiple times.
32
 
33
+ define( "GAWP_VERSION", '5.0.1' );
34
 
35
  define( "GAWP_FILE", __FILE__ );
36
 
38
 
39
  define( "GAWP_PATH", plugin_dir_path( __FILE__ ) );
40
 
41
+ if ( ! class_exists( 'Yoast_GA_Options' ) ) {
42
  require_once GAWP_PATH . 'includes/class-options.php';
43
  }
44
 
includes/class-options.php CHANGED
@@ -11,6 +11,10 @@ if ( ! class_exists( 'Yoast_GA_Options' ) ) {
11
  */
12
  public function __construct() {
13
  $this->options = $this->get_options();
 
 
 
 
14
  }
15
 
16
  /**
@@ -28,7 +32,7 @@ if ( ! class_exists( 'Yoast_GA_Options' ) ) {
28
  * @return null
29
  */
30
  public function get_tracking_code() {
31
- $tracking_code = NULL;
32
  $options = $this->options;
33
  $options = $options['ga_general'];
34
 
@@ -43,6 +47,43 @@ if ( ! class_exists( 'Yoast_GA_Options' ) ) {
43
  return $tracking_code;
44
  }
45
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
46
  }
47
 
48
  global $Yoast_GA_Options;
11
  */
12
  public function __construct() {
13
  $this->options = $this->get_options();
14
+
15
+ if ( ! isset( $this->options['ga_general']['version'] ) || $this->options['ga_general']['version'] < GAWP_VERSION ) {
16
+ $this->upgrade();
17
+ }
18
  }
19
 
20
  /**
32
  * @return null
33
  */
34
  public function get_tracking_code() {
35
+ $tracking_code = null;
36
  $options = $this->options;
37
  $options = $options['ga_general'];
38
 
47
  return $tracking_code;
48
  }
49
 
50
+ /**
51
+ * Upgrade the settings when settings are changed.
52
+ *
53
+ * @since 5.0.1
54
+ */
55
+ private function upgrade() {
56
+ if ( ! isset( $this->options['ga_general']['version'] ) && is_null( $this->get_tracking_code() ) ) {
57
+ $old_options = get_option( 'Yoast_Google_Analytics' );
58
+
59
+ // Save UA as manual UA, instead of saving all the old GA crap
60
+ $this->options['ga_general']['manual_ua_code'] = 1;
61
+ $this->options['ga_general']['manual_ua_code_field'] = $old_options['uastring'];
62
+
63
+ // Other settings
64
+ $this->options['ga_general']['allow_anchor'] = $old_options['allowanchor'];
65
+ $this->options['ga_general']['add_allow_linker'] = $old_options['allowlinker'];
66
+ $this->options['ga_general']['anonymous_data'] = $old_options['anonymizeip'];
67
+ $this->options['ga_general']['track_outbound'] = $old_options['trackoutbound'];
68
+ $this->options['ga_general']['track_internal_as_outbound'] = $old_options['internallink'];
69
+ $this->options['ga_general']['track_internal_as_label'] = $old_options['internallinklabel'];
70
+ $this->options['ga_general']['extensions_of_files'] = $old_options['dlextensions'];
71
+
72
+ delete_option( 'Yoast_Google_Analytics' );
73
+ }
74
+
75
+ // 5.0.0 to 5.0.1 fix of ignore users array
76
+ if ( ! isset( $this->options['ga_general']['version'] ) || version_compare( $this->options['ga_general']['version'], '5.0.1', '<' ) ) {
77
+ if ( ! is_array( $this->options['ga_general']['ignore_users'] ) ) {
78
+ $this->options['ga_general']['ignore_users'] = (array) $this->options['ga_general']['ignore_users'];
79
+ }
80
+ }
81
+
82
+ // Set to the current version now that we've done all needed upgrades
83
+ $this->options['ga_general']['version'] = GAWP_VERSION;
84
+
85
+ update_option( 'yst_ga', $this->options );
86
+ }
87
  }
88
 
89
  global $Yoast_GA_Options;
lib/languages/google-analytics-for-wordpress.pot CHANGED
@@ -2,10 +2,10 @@
2
  # This file is distributed under the GPL v3.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: Google Analytics for WordPress 5.0.0\n"
6
  "Report-Msgid-Bugs-To: "
7
  "http://wordpress.org/support/plugin/google-analytics-for-wordpress\n"
8
- "POT-Creation-Date: 2014-06-23 20:33:09+00:00\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=utf-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
@@ -25,57 +25,436 @@ msgstr ""
25
  "X-Poedit-SearchPath-0: .\n"
26
  "X-Textdomain-Support: yes\n"
27
 
28
- #: admin/class-admin.php:21 admin/class-admin.php:30 admin/class-admin.php:39
29
- #: admin/class-admin.php:48
 
 
 
 
30
  msgid "Yoast Google Analytics:"
31
  msgstr ""
32
 
33
- #: admin/class-admin.php:21
34
  msgid "General Settings"
35
  msgstr ""
36
 
37
- #: admin/class-admin.php:21
38
  msgid "Analytics"
39
  msgstr ""
40
 
41
- #: admin/class-admin.php:30 admin/class-admin.php:31
42
  msgid "Dashboard"
43
  msgstr ""
44
 
45
- #: admin/class-admin.php:39 admin/class-admin.php:40
46
  msgid "Settings"
47
  msgstr ""
48
 
49
- #: admin/class-admin.php:48
50
  msgid "Extensions"
51
  msgstr ""
52
 
53
- #: frontend/class-frontend.php:80
 
 
 
 
54
  msgid ""
55
- "Google Analytics tracking code not shown because you haven't setup Google "
56
- "Analytics for WordPress yet."
 
 
 
 
57
  msgstr ""
58
 
59
- #: frontend/class-frontend.php:334
 
 
 
 
 
 
 
 
60
  msgid ""
61
- "Google Analytics tracking code not shown because users over level %s are "
62
- "ignored."
63
  msgstr ""
64
 
65
- #: frontend/class-frontend.php:728
66
  msgid ""
67
- "Please set Google Analytics position to \"manual\" in the settings, or "
68
- "remove this call to yoast_analytics();"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
69
  msgstr ""
70
 
71
  #. Plugin Name of the plugin/theme
72
- msgid "Google Analytics for WordPress"
73
  msgstr ""
74
 
75
  #. Plugin URI of the plugin/theme
76
  msgid ""
77
  "http://yoast.com/wordpress/google-analytics/#utm_source=wordpress&utm_"
78
- "medium=plugin&utm_campaign=wpgaplugin&utm_content=v420"
79
  msgstr ""
80
 
81
  #. Description of the plugin/theme
2
  # This file is distributed under the GPL v3.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: Google Analytics by Yoast 5.0.0\n"
6
  "Report-Msgid-Bugs-To: "
7
  "http://wordpress.org/support/plugin/google-analytics-for-wordpress\n"
8
+ "POT-Creation-Date: 2014-09-04 10:56:39+00:00\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=utf-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
25
  "X-Poedit-SearchPath-0: .\n"
26
  "X-Textdomain-Support: yes\n"
27
 
28
+ #: admin/class-admin.php:54
29
+ msgid "Settings saved!"
30
+ msgstr ""
31
+
32
+ #: admin/class-admin.php:157 admin/class-admin.php:166
33
+ #: admin/class-admin.php:175 admin/class-admin.php:184
34
  msgid "Yoast Google Analytics:"
35
  msgstr ""
36
 
37
+ #: admin/class-admin.php:157
38
  msgid "General Settings"
39
  msgstr ""
40
 
41
+ #: admin/class-admin.php:157
42
  msgid "Analytics"
43
  msgstr ""
44
 
45
+ #: admin/class-admin.php:166 admin/class-admin.php:167
46
  msgid "Dashboard"
47
  msgstr ""
48
 
49
+ #: admin/class-admin.php:175 admin/class-admin.php:176
50
  msgid "Settings"
51
  msgstr ""
52
 
53
+ #: admin/class-admin.php:184
54
  msgid "Extensions"
55
  msgstr ""
56
 
57
+ #: admin/class-admin.php:661
58
+ msgid "Debug information"
59
+ msgstr ""
60
+
61
+ #: admin/license-manager/class-license-manager.php:137
62
  msgid ""
63
+ "<b>Warning!</b> You're blocking external requests which means you won't be "
64
+ "able to get %s updates. Please add %s to %s."
65
+ msgstr ""
66
+
67
+ #: admin/license-manager/class-license-manager.php:180
68
+ msgid "Your %s license has been activated. You have an unlimited license. "
69
  msgstr ""
70
 
71
+ #: admin/license-manager/class-license-manager.php:182
72
+ msgid "Your %s license has been activated. You have used %d/%d activations. "
73
+ msgstr ""
74
+
75
+ #: admin/license-manager/class-license-manager.php:187
76
+ msgid "<a href=\"%s\">Did you know you can upgrade your license?</a>"
77
+ msgstr ""
78
+
79
+ #: admin/license-manager/class-license-manager.php:191
80
  msgid ""
81
+ "<a href=\"%s\">Your license is expiring in %d days, would you like to "
82
+ "extend it?</a>"
83
  msgstr ""
84
 
85
+ #: admin/license-manager/class-license-manager.php:200
86
  msgid ""
87
+ "You've reached your activation limit. You must <a href=\"%s\">upgrade your "
88
+ "license</a> to use it on this site."
89
+ msgstr ""
90
+
91
+ #: admin/license-manager/class-license-manager.php:203
92
+ msgid ""
93
+ "Your license has expired. You must <a href=\"%s\">extend your license</a> "
94
+ "in order to use it again."
95
+ msgstr ""
96
+
97
+ #: admin/license-manager/class-license-manager.php:206
98
+ msgid "Failed to activate your license, your license key seems to be invalid."
99
+ msgstr ""
100
+
101
+ #: admin/license-manager/class-license-manager.php:230
102
+ msgid "Your %s license has been deactivated."
103
+ msgstr ""
104
+
105
+ #: admin/license-manager/class-license-manager.php:232
106
+ msgid "Failed to deactivate your %s license."
107
+ msgstr ""
108
+
109
+ #: admin/license-manager/class-license-manager.php:267
110
+ msgid "Request error: \"%s\" (%scommon license notices%s)"
111
+ msgstr ""
112
+
113
+ #: admin/license-manager/class-license-manager.php:423
114
+ msgid "%s: License Settings"
115
+ msgstr ""
116
+
117
+ #: admin/license-manager/class-plugin-license-manager.php:73
118
+ msgid ""
119
+ "%s is network activated, you can manage your license in the <a "
120
+ "href=\"%s\">network admin license page</a>."
121
+ msgstr ""
122
+
123
+ #: admin/license-manager/class-plugin-license-manager.php:75
124
+ msgid ""
125
+ "%s is network activated, please contact your site administrator to manage "
126
+ "the license."
127
+ msgstr ""
128
+
129
+ #: admin/license-manager/class-theme-license-manager.php:34
130
+ #: admin/license-manager/samples/sample-plugin.php:53
131
+ msgid "%s License"
132
+ msgstr ""
133
+
134
+ #: admin/license-manager/class-theme-license-manager.php:34
135
+ msgid "Theme License"
136
+ msgstr ""
137
+
138
+ #: admin/license-manager/class-theme-update-manager.php:96
139
+ msgid ""
140
+ "Updating this theme will lose any customizations you have made. 'Cancel' to "
141
+ "stop, 'OK' to update."
142
+ msgstr ""
143
+
144
+ #: admin/license-manager/class-theme-update-manager.php:101
145
+ msgid ""
146
+ "<strong>%s version %s</strong> is available. <a href=\"%s\" "
147
+ "class=\"thickbox\" title=\"%s\">Check out what's new</a> or <a href=\"%s\" "
148
+ "%s>update now</a>."
149
+ msgstr ""
150
+
151
+ #: admin/license-manager/class-update-manager.php:83
152
+ msgid "%s failed to check for updates because of the following error: <em>%s</em>"
153
+ msgstr ""
154
+
155
+ #: admin/license-manager/class-update-manager.php:153
156
+ msgid ""
157
+ "This site has not been activated properly on yoast.com and thus cannot "
158
+ "check for future updates. Please activate your site with a valid license "
159
+ "key."
160
+ msgstr ""
161
+
162
+ #: admin/license-manager/views/form.php:23
163
+ msgid "License status"
164
+ msgstr ""
165
+
166
+ #: admin/license-manager/views/form.php:33
167
+ msgid "Toggle license status"
168
+ msgstr ""
169
+
170
+ #: admin/license-manager/views/form.php:37
171
+ msgid "Deactivate License"
172
+ msgstr ""
173
+
174
+ #: admin/license-manager/views/form.php:38
175
+ msgid "(deactivate your license so you can activate it on another WordPress site)"
176
+ msgstr ""
177
+
178
+ #: admin/license-manager/views/form.php:42
179
+ msgid "Activate License"
180
+ msgstr ""
181
+
182
+ #: admin/license-manager/views/form.php:44
183
+ msgid "Please enter a license key in the field below first."
184
+ msgstr ""
185
+
186
+ #: admin/license-manager/views/form.php:52
187
+ msgid "License Key"
188
+ msgstr ""
189
+
190
+ #: admin/license-manager/views/form.php:54
191
+ msgid "Paste your %s license key here.."
192
+ msgstr ""
193
+
194
+ #: admin/license-manager/views/form.php:56
195
+ msgid "You defined your license key using the %s PHP constant."
196
+ msgstr ""
197
+
198
+ #: admin/license-manager/views/form.php:73
199
+ msgid "Your %s license will expire on %s."
200
+ msgstr ""
201
+
202
+ #: admin/license-manager/views/form.php:76
203
+ msgid "%sRenew your license now%s."
204
+ msgstr ""
205
+
206
+ #: admin/pages/dashboard.php:6
207
+ msgid "Yoast Google Analytics: Dashboard"
208
+ msgstr ""
209
+
210
+ #: admin/pages/extensions.php:6
211
+ msgid "Yoast Google Analytics: Extensions"
212
+ msgstr ""
213
+
214
+ #: admin/pages/settings.php:6
215
+ msgid "Yoast Google Analytics: Settings"
216
+ msgstr ""
217
+
218
+ #: admin/pages/settings.php:13
219
+ msgid "General"
220
+ msgstr ""
221
+
222
+ #: admin/pages/settings.php:14
223
+ msgid "Universal"
224
+ msgstr ""
225
+
226
+ #: admin/pages/settings.php:15
227
+ msgid "Advanced"
228
+ msgstr ""
229
+
230
+ #: admin/pages/settings.php:16
231
+ msgid "Debug mode"
232
+ msgstr ""
233
+
234
+ #: admin/pages/settings.php:25
235
+ msgid "General settings"
236
+ msgstr ""
237
+
238
+ #: admin/pages/settings.php:38
239
+ msgid "Google profile"
240
+ msgstr ""
241
+
242
+ #: admin/pages/settings.php:39
243
+ msgid "Authenticate with your Google account"
244
+ msgstr ""
245
+
246
+ #: admin/pages/settings.php:42
247
+ msgid "Current UA-profile"
248
+ msgstr ""
249
+
250
+ #: admin/pages/settings.php:50
251
+ msgid "Re-authenticate with your Google account"
252
+ msgstr ""
253
+
254
+ #: admin/pages/settings.php:56
255
+ msgid "Manually enter your UA code"
256
+ msgstr ""
257
+
258
+ #: admin/pages/settings.php:65
259
+ msgid "Track outbound click & downloads"
260
+ msgstr ""
261
+
262
+ #: admin/pages/settings.php:65
263
+ msgid ""
264
+ "Clicks &amp; downloads will be tracked as events, you can find these under "
265
+ "Content &raquo; Event Tracking in your Google Analytics reports."
266
+ msgstr ""
267
+
268
+ #: admin/pages/settings.php:66
269
+ msgid "Allow tracking of anonymous data"
270
+ msgstr ""
271
+
272
+ #: admin/pages/settings.php:66
273
+ msgid ""
274
+ "By allowing us to track anonymous data we can better help you, because we "
275
+ "know with which WordPress configurations, themes and plugins we should "
276
+ "test. No personal data will be submitted."
277
+ msgstr ""
278
+
279
+ #: admin/pages/settings.php:67
280
+ msgid "Anonymize IP's"
281
+ msgstr ""
282
+
283
+ #: admin/pages/settings.php:67
284
+ msgid ""
285
+ "This adds <code><a "
286
+ "href=\"http://code.google.com/apis/analytics/docs/gaJS/gaJSApi_gat.html#_"
287
+ "gat._anonymizeIp\" target=\"_blank\">_anonymizeIp</a></code>, telling "
288
+ "Google Analytics to anonymize the information sent by the tracker objects "
289
+ "by removing the last octet of the IP address prior to its storage."
290
+ msgstr ""
291
+
292
+ #: admin/pages/settings.php:68
293
+ msgid "Hint: Select multiple roles by using CTRL or CMD."
294
+ msgstr ""
295
+
296
+ #: admin/pages/settings.php:68
297
+ msgid ""
298
+ "Users of the role you select and higher will be ignored, so if you select "
299
+ "Editor, all Editors and Administrators will be ignored."
300
+ msgstr ""
301
+
302
+ #: admin/pages/settings.php:73
303
+ msgid "Universal settings"
304
+ msgstr ""
305
+
306
+ #: admin/pages/settings.php:74
307
+ msgid "Enable Universal tracking"
308
+ msgstr ""
309
+
310
+ #: admin/pages/settings.php:74
311
+ msgid ""
312
+ "First enable Universal tracking in your Google Analytics account. How to do "
313
+ "that, please read <a "
314
+ "href=\"https://developers.google.com/analytics/devguides/collection/upgrade/"
315
+ "guide\" target=\"_blank\">this guide</a> to learn how to do that."
316
+ msgstr ""
317
+
318
+ #: admin/pages/settings.php:75
319
+ msgid "Enable Demographics and Interest Reports"
320
+ msgstr ""
321
+
322
+ #: admin/pages/settings.php:75
323
+ msgid ""
324
+ "You have to enable the Demographics in Google Analytics before you can see "
325
+ "the tracking data. We have a doc in our <a "
326
+ "href=\"http://kb.yoast.com/article/154-enable-demographics-and-interests-"
327
+ "report-in-google-analytics//#utm_medium=kb-link&utm_source=gawp-config&utm_"
328
+ "campaign=wpgaplugin\" target=\"_blank\">knowlegde base</a> about this "
329
+ "feature."
330
+ msgstr ""
331
+
332
+ #: admin/pages/settings.php:80
333
+ msgid "Advanced settings"
334
+ msgstr ""
335
+
336
+ #: admin/pages/settings.php:81
337
+ msgid "Track downloads as"
338
+ msgstr ""
339
+
340
+ #: admin/pages/settings.php:81
341
+ msgid ""
342
+ "Not recommended, as this would skew your statistics, but it does make it "
343
+ "possible to track downloads as goals."
344
+ msgstr ""
345
+
346
+ #: admin/pages/settings.php:82
347
+ msgid "Extensions of files to track as downloads"
348
+ msgstr ""
349
+
350
+ #: admin/pages/settings.php:83
351
+ msgid "Track full URL of outbound clicks or just the domain"
352
+ msgstr ""
353
+
354
+ #: admin/pages/settings.php:84
355
+ msgid "Subdomain tracking"
356
+ msgstr ""
357
+
358
+ #: admin/pages/settings.php:84
359
+ msgid ""
360
+ "This allows you to set the domain that's set by <code>setDomainName</code> "
361
+ "for tracking subdomains, if empty this will not be set."
362
+ msgstr ""
363
+
364
+ #: admin/pages/settings.php:86
365
+ msgid "Set path for internal links to track as outbound links"
366
+ msgstr ""
367
+
368
+ #: admin/pages/settings.php:87
369
+ msgid "Label for those links"
370
+ msgstr ""
371
+
372
+ #: admin/pages/settings.php:89
373
+ msgid "Tag links in RSS feed with campaign variables"
374
+ msgstr ""
375
+
376
+ #: admin/pages/settings.php:89
377
+ msgid ""
378
+ "Do not use this feature if you use FeedBurner, as FeedBurner can do this "
379
+ "automatically, and better than this plugin can. Check <a "
380
+ "href=\"http://www.google.com/support/feedburner/bin/answer.py?hl=en&amp;"
381
+ "answer=165769\" target=\"_blank\">this help page</a> for info on how to "
382
+ "enable this feature in FeedBurner."
383
+ msgstr ""
384
+
385
+ #: admin/pages/settings.php:90
386
+ msgid "Allow anchor"
387
+ msgstr ""
388
+
389
+ #: admin/pages/settings.php:90
390
+ msgid ""
391
+ "This adds a <code><a "
392
+ "href=\"http://code.google.com/apis/analytics/docs/gaJSApiCampaignTracking."
393
+ "html#_gat.GA_Tracker_._setAllowAnchor\" "
394
+ "target=\"_blank\">_setAllowAnchor</a></code> call to your tracking code, "
395
+ "and makes RSS link tagging use a # as well."
396
+ msgstr ""
397
+
398
+ #: admin/pages/settings.php:91
399
+ msgid "Add <code>_setAllowLinker</code>"
400
+ msgstr ""
401
+
402
+ #: admin/pages/settings.php:91
403
+ msgid ""
404
+ "This adds a <code><a "
405
+ "href=\"http://code.google.com/apis/analytics/docs/gaJS/"
406
+ "gaJSApiDomainDirectory.html#_gat.GA_Tracker_._setAllowLinker\" "
407
+ "target=\"_blank\">_setAllowLinker</a></code> call to your tracking code, "
408
+ "allowing you to use <code>_link</code> and related functions."
409
+ msgstr ""
410
+
411
+ #: admin/pages/settings.php:92
412
+ msgid ""
413
+ "Not for the average user: this allows you to add a line of code, to be "
414
+ "added before the <code>trackPageview</code> call."
415
+ msgstr ""
416
+
417
+ #: admin/pages/settings.php:97
418
+ msgid "Debug settings"
419
+ msgstr ""
420
+
421
+ #: admin/pages/settings.php:100
422
+ msgid ""
423
+ "If you want to confirm that tracking on your blog is working as it should, "
424
+ "enable these options and check the console in Firebug (for Firefox), "
425
+ "Firebug Lite (for other browsers) or Chrome & Safari's Web Inspector. Be "
426
+ "absolutely sure to disable debugging afterwards, as it is slower than "
427
+ "normal tracking."
428
+ msgstr ""
429
+
430
+ #: admin/pages/settings.php:101
431
+ msgid "Note"
432
+ msgstr ""
433
+
434
+ #: admin/pages/settings.php:101
435
+ msgid "the debugging and firebug scripts are only loaded for admins."
436
+ msgstr ""
437
+
438
+ #: admin/pages/settings.php:103
439
+ msgid "Enable debug mode"
440
+ msgstr ""
441
+
442
+ #: admin/pages/settings.php:104
443
+ msgid "Enable Firebug Lite"
444
+ msgstr ""
445
+
446
+ #: admin/pages/settings.php:116
447
+ msgid "Select the users to ignore"
448
  msgstr ""
449
 
450
  #. Plugin Name of the plugin/theme
451
+ msgid "Google Analytics by Yoast"
452
  msgstr ""
453
 
454
  #. Plugin URI of the plugin/theme
455
  msgid ""
456
  "http://yoast.com/wordpress/google-analytics/#utm_source=wordpress&utm_"
457
+ "medium=plugin&utm_campaign=wpgaplugin&utm_content=v500"
458
  msgstr ""
459
 
460
  #. Description of the plugin/theme
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://yoast.com/donate/
4
  Tags: analytics, google analytics, statistics, tracking, stats, google, yoast
5
  Requires at least: 3.8
6
  Tested up to: 4.0
7
- Stable tag: 5.0
8
 
9
  Track your WordPress site easily with the latest tracking codes and lots added data for search result pages and error pages.
10
 
@@ -49,6 +49,12 @@ This section describes how to install the plugin and get it working.
49
 
50
  == Changelog ==
51
 
 
 
 
 
 
 
52
  = 5.0.0 =
53
  Release Date: September 4th, 2014
54
 
@@ -377,3 +383,5 @@ For all frequently asked questions, and their answers, check the [Yoast Knowledg
377
  1. Screenshot of the general settings panel for this plugin.
378
  2. Screenshot of the universal settings panel.
379
  3. Screenshot of the advanced settings panel.
 
 
4
  Tags: analytics, google analytics, statistics, tracking, stats, google, yoast
5
  Requires at least: 3.8
6
  Tested up to: 4.0
7
+ Stable tag: 5.0.1
8
 
9
  Track your WordPress site easily with the latest tracking codes and lots added data for search result pages and error pages.
10
 
49
 
50
  == Changelog ==
51
 
52
+ = 5.0.1 =
53
+ Release Date: September 4th, 2014
54
+
55
+ * Bugfixes:
56
+ * Fixed string where array expected warning.
57
+
58
  = 5.0.0 =
59
  Release Date: September 4th, 2014
60
 
383
  1. Screenshot of the general settings panel for this plugin.
384
  2. Screenshot of the universal settings panel.
385
  3. Screenshot of the advanced settings panel.
386
+
387
+ == Upgrade Notice ==