WP-Matomo (WP-Piwik) - Version 0.9.9.12

Version Description

  • Bugfix: Avoid forced relogin on site change (WP network)
  • Bugfix: Avoid multiple annotations on post updates
  • Bugfix: User mergeSubdomains instead of mergeAliasURLs
  • Feature: Added mergeAliasURLs as additional feature
Download this release

Release Info

Developer Braekling
Plugin Icon 128x128 WP-Matomo (WP-Piwik)
Version 0.9.9.12
Comparing to
See all releases

Code changes from version 0.9.9.11 to 0.9.9.12

Files changed (6) hide show
  1. classes/WP_Piwik_Settings.php +1 -1
  2. languages/wp-piwik-de_DE.mo +0 -0
  3. languages/wp-piwik-de_DE.po +7 -1
  4. readme.txt +10 -4
  5. settings/tracking.php +5 -0
  6. wp-piwik.php +9 -5
classes/WP_Piwik_Settings.php CHANGED
@@ -42,6 +42,7 @@
42
  'track_codeposition' => 'footer',
43
  'track_datacfasync' => false,
44
  'track_across' => false,
 
45
  'limit_cookies' => false,
46
  'limit_cookies_visitor' => 1209600,
47
  'limit_cookies_session' => 0,
@@ -156,7 +157,6 @@
156
  public function checkNetworkActivation() {
157
  if (!function_exists("is_plugin_active_for_network")) {
158
  require_once(ABSPATH.'wp-admin/includes/plugin.php');
159
- wp_cookie_constants();
160
  }
161
  return is_plugin_active_for_network('wp-piwik/wp-piwik.php');
162
  }
42
  'track_codeposition' => 'footer',
43
  'track_datacfasync' => false,
44
  'track_across' => false,
45
+ 'track_across_alias' => false,
46
  'limit_cookies' => false,
47
  'limit_cookies_visitor' => 1209600,
48
  'limit_cookies_session' => 0,
157
  public function checkNetworkActivation() {
158
  if (!function_exists("is_plugin_active_for_network")) {
159
  require_once(ABSPATH.'wp-admin/includes/plugin.php');
 
160
  }
161
  return is_plugin_active_for_network('wp-piwik/wp-piwik.php');
162
  }
languages/wp-piwik-de_DE.mo CHANGED
Binary file
languages/wp-piwik-de_DE.po CHANGED
@@ -755,4 +755,10 @@ msgid "Track visitors across all subdomains"
755
  msgstr "Besucher über alle Subdomains aufzeichnen"
756
 
757
  msgid "Adds *.-prefix to cookie domain."
758
- msgstr "Fügt ein *.-Präfix zur Cookie Domain hinzu."
 
 
 
 
 
 
755
  msgstr "Besucher über alle Subdomains aufzeichnen"
756
 
757
  msgid "Adds *.-prefix to cookie domain."
758
+ msgstr "Fügt ein *.-Präfix zur Cookie Domain hinzu."
759
+
760
+ msgid "Track visitors across all alias URLs"
761
+ msgstr "Besucher über alle alternative URLs aufzeichnen"
762
+
763
+ msgid "Adds *.-prefix to tracked domain."
764
+ msgstr "Fügt ein *.-Präfix zur getrackten Domain hinzu."
readme.txt CHANGED
@@ -2,8 +2,8 @@
2
 
3
  Contributors: Braekling
4
  Requires at least: 3.8
5
- Tested up to: 3.9.1
6
- Stable tag: 0.9.9.11
7
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6046779
8
  Tags: statistics, stats, analytics, piwik, wpmu
9
 
@@ -13,7 +13,7 @@ This plugin adds a Piwik stats site to your WordPress or WordPress multisite das
13
 
14
  This plugin adds a Piwik stats site to your WordPress dashboard. It's also able to add the Piwik tracking code to your blog using wp_footer.
15
 
16
- You need a running **Piwik 2.0.2 or higher** installation and at least view access to your stats. Also **PHP 5.3 or higher** is strictly required.
17
 
18
  Look at the [Piwik website](http://piwik.org/) to get further information about Piwik.
19
 
@@ -125,6 +125,12 @@ Please update Piwik if not done yet (Piwik 2.0 or higher is recommended)!
125
 
126
  == Changelog ==
127
 
 
 
 
 
 
 
128
  = 0.9.9.11 =
129
  * Bugfix: PHP API causes plain text output issue, see http://wordpress.org/support/topic/bug-cant-access-to-tabs-in-setting-after-configuration
130
  * Bugfix: PHP API causes WordPress multisite login issue, see http://wordpress.org/support/topic/causes-multisite-superadmin-subsite-login-problem
@@ -138,7 +144,7 @@ Please update Piwik if not done yet (Piwik 2.0 or higher is recommended)!
138
  * Feature: Show page views (actions) in "visitors last 30"
139
 
140
  = 0.9.9.9 =
141
- * Update: PHP API will use namespaces (Piwik 2.x compatibility)
142
  * Update: Piwik URL isn't necessary to use PHP API anymore.
143
  * Feature: Limit cookie lifetime
144
  * Feature: Track visitors across all subdomains
2
 
3
  Contributors: Braekling
4
  Requires at least: 3.8
5
+ Tested up to: 4.0.0
6
+ Stable tag: 0.9.9.12
7
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6046779
8
  Tags: statistics, stats, analytics, piwik, wpmu
9
 
13
 
14
  This plugin adds a Piwik stats site to your WordPress dashboard. It's also able to add the Piwik tracking code to your blog using wp_footer.
15
 
16
+ You need a running **Piwik 2.7.0 or higher** installation and at least view access to your stats. Also **PHP 5.3 or higher** is strictly required.
17
 
18
  Look at the [Piwik website](http://piwik.org/) to get further information about Piwik.
19
 
125
 
126
  == Changelog ==
127
 
128
+ = 0.9.9.12 =
129
+ * Bugfix: Avoid forced relogin on site change (WP network)
130
+ * Bugfix: Avoid multiple annotations on post updates
131
+ * Bugfix: User mergeSubdomains instead of mergeAliasURLs
132
+ * Feature: Added mergeAliasURLs as additional feature
133
+
134
  = 0.9.9.11 =
135
  * Bugfix: PHP API causes plain text output issue, see http://wordpress.org/support/topic/bug-cant-access-to-tabs-in-setting-after-configuration
136
  * Bugfix: PHP API causes WordPress multisite login issue, see http://wordpress.org/support/topic/causes-multisite-superadmin-subsite-login-problem
144
  * Feature: Show page views (actions) in "visitors last 30"
145
 
146
  = 0.9.9.9 =
147
+ * Update: PHP API will use namespaces (Piwik 2.x compatibility, PHP 5.3+ required)
148
  * Update: Piwik URL isn't necessary to use PHP API anymore.
149
  * Feature: Limit cookie lifetime
150
  * Feature: Track visitors across all subdomains
settings/tracking.php CHANGED
@@ -88,6 +88,11 @@ if (self::$settings->getGlobalOption('add_tracking_code')) {
88
  <label for="wp-piwik_track_across"><?php echo _e('Adds *.-prefix to cookie domain.', 'wp-piwik'); ?></label>
89
  </td></tr>
90
 
 
 
 
 
 
91
  <tr><th><?php _e('Track search', 'wp-piwik'); ?>:</th><td>
92
  <input type="checkbox" value="1" id="wp-piwik_search" name="wp-piwik_search"<?php echo (self::$settings->getGlobalOption('track_search')?' checked="checked"':''); ?> />
93
  <label for="wp-piwik_search"><?php echo _e('Use Piwik\'s advanced Site Search Analytics feature. See', 'wp-piwik'); ?> <a href="http://piwik.org/docs/javascript-tracking/#toc-tracking-internal-search-keywords-categories-and-no-result-search-keywords">Piwik Docs</a>.</label>
88
  <label for="wp-piwik_track_across"><?php echo _e('Adds *.-prefix to cookie domain.', 'wp-piwik'); ?></label>
89
  </td></tr>
90
 
91
+ <tr><th><?php _e('Track visitors across all alias URLs', 'wp-piwik'); ?>:</th><td>
92
+ <input type="checkbox" value="1" id="wp-piwik_track_across_alias" name="wp-piwik_track_across_alias"<?php echo (self::$settings->getGlobalOption('track_across_alias')?' checked="checked"':''); ?> />
93
+ <label for="wp-piwik_track_across_alias"><?php echo _e('Adds *.-prefix to tracked domain.', 'wp-piwik'); ?></label>
94
+ </td></tr>
95
+
96
  <tr><th><?php _e('Track search', 'wp-piwik'); ?>:</th><td>
97
  <input type="checkbox" value="1" id="wp-piwik_search" name="wp-piwik_search"<?php echo (self::$settings->getGlobalOption('track_search')?' checked="checked"':''); ?> />
98
  <label for="wp-piwik_search"><?php echo _e('Use Piwik\'s advanced Site Search Analytics feature. See', 'wp-piwik'); ?> <a href="http://piwik.org/docs/javascript-tracking/#toc-tracking-internal-search-keywords-categories-and-no-result-search-keywords">Piwik Docs</a>.</label>
wp-piwik.php CHANGED
@@ -6,7 +6,7 @@ Plugin URI: http://wordpress.org/extend/plugins/wp-piwik/
6
 
7
  Description: Adds Piwik stats to your dashboard menu and Piwik code to your wordpress header.
8
 
9
- Version: 0.9.9.11
10
  Author: Andr&eacute; Br&auml;kling
11
  Author URI: http://www.braekling.de
12
 
@@ -39,8 +39,8 @@ if (!class_exists('wp_piwik')) {
39
  class wp_piwik {
40
 
41
  private static
42
- $intRevisionId = 92000,
43
- $strVersion = '0.9.9.11',
44
  $blog_id,
45
  $intDashboardID = 30,
46
  $strPluginBasename = NULL,
@@ -103,7 +103,7 @@ class wp_piwik {
103
  add_action('admin_head', array($this, 'addAdminHeaderTracking'));
104
  }
105
  if (self::$settings->getGlobalOption('add_post_annotations'))
106
- add_action('transition_post_status', array($this, 'onPostStatusTransition'));
107
  }
108
 
109
  private function addFilters() {
@@ -953,6 +953,9 @@ class wp_piwik {
953
  $strURL .= ($strPageURL?'&pageUrl='.urlencode($strPageURL):'');
954
  $strURL .= ($strNote?'&note='.urlencode($strNote):'');
955
  if (self::$settings->getGlobalOption('track_across') && $strMethod == 'SitesManager.getJavascriptTag') {
 
 
 
956
  $strURL .= '&mergeAliasUrls=1';
957
  }
958
  // Fetch data if site exists
@@ -1220,6 +1223,7 @@ class wp_piwik {
1220
  self::$settings->setGlobalOption('track_feed_addcampaign', (isset($_POST['wp-piwik_trackfeed_addcampaign'])?$_POST['wp-piwik_trackfeed_addcampaign']:false));
1221
  self::$settings->setGlobalOption('track_datacfasync', (isset($_POST['wp-piwik_datacfasync'])?$_POST['wp-piwik_datacfasync']:false));
1222
  self::$settings->setGlobalOption('track_across', (isset($_POST['wp-piwik_track_across'])?$_POST['wp-piwik_track_across']:false));
 
1223
  self::$settings->setGlobalOption('add_post_annotations', (isset($_POST['wp-piwik_annotations'])?$_POST['wp-piwik_annotations']:false));
1224
  self::$settings->setGlobalOption('add_customvars_box', (isset($_POST['wp-piwik_customvars'])?$_POST['wp-piwik_customvars']:false));
1225
  self::$settings->setGlobalOption('capability_stealth', (isset($_POST['wp-piwik_filter'])?$_POST['wp-piwik_filter']:array()));
@@ -1512,7 +1516,7 @@ class wp_piwik {
1512
  $this->addNoscriptCode();
1513
  }
1514
 
1515
- public function onPostStatusTransition($newStatus, $oldStatus = 'false', $post = null) {
1516
  if ($newStatus == 'publish' && $oldStatus != 'publish' ) {
1517
  add_action('publish_post', array($this, 'addPiwikAnnotation'));
1518
  }
6
 
7
  Description: Adds Piwik stats to your dashboard menu and Piwik code to your wordpress header.
8
 
9
+ Version: 0.9.9.12
10
  Author: Andr&eacute; Br&auml;kling
11
  Author URI: http://www.braekling.de
12
 
39
  class wp_piwik {
40
 
41
  private static
42
+ $intRevisionId = 93000,
43
+ $strVersion = '0.9.9.12',
44
  $blog_id,
45
  $intDashboardID = 30,
46
  $strPluginBasename = NULL,
103
  add_action('admin_head', array($this, 'addAdminHeaderTracking'));
104
  }
105
  if (self::$settings->getGlobalOption('add_post_annotations'))
106
+ add_action('transition_post_status', array($this, 'onPostStatusTransition'),10,3);
107
  }
108
 
109
  private function addFilters() {
953
  $strURL .= ($strPageURL?'&pageUrl='.urlencode($strPageURL):'');
954
  $strURL .= ($strNote?'&note='.urlencode($strNote):'');
955
  if (self::$settings->getGlobalOption('track_across') && $strMethod == 'SitesManager.getJavascriptTag') {
956
+ $strURL .= '&mergeSubdomains=1';
957
+ }
958
+ if (self::$settings->getGlobalOption('track_across_alias') && $strMethod == 'SitesManager.getJavascriptTag') {
959
  $strURL .= '&mergeAliasUrls=1';
960
  }
961
  // Fetch data if site exists
1223
  self::$settings->setGlobalOption('track_feed_addcampaign', (isset($_POST['wp-piwik_trackfeed_addcampaign'])?$_POST['wp-piwik_trackfeed_addcampaign']:false));
1224
  self::$settings->setGlobalOption('track_datacfasync', (isset($_POST['wp-piwik_datacfasync'])?$_POST['wp-piwik_datacfasync']:false));
1225
  self::$settings->setGlobalOption('track_across', (isset($_POST['wp-piwik_track_across'])?$_POST['wp-piwik_track_across']:false));
1226
+ self::$settings->setGlobalOption('track_across_alias', (isset($_POST['wp-piwik_track_across_alias'])?$_POST['wp-piwik_track_across_alias']:false));
1227
  self::$settings->setGlobalOption('add_post_annotations', (isset($_POST['wp-piwik_annotations'])?$_POST['wp-piwik_annotations']:false));
1228
  self::$settings->setGlobalOption('add_customvars_box', (isset($_POST['wp-piwik_customvars'])?$_POST['wp-piwik_customvars']:false));
1229
  self::$settings->setGlobalOption('capability_stealth', (isset($_POST['wp-piwik_filter'])?$_POST['wp-piwik_filter']:array()));
1516
  $this->addNoscriptCode();
1517
  }
1518
 
1519
+ public function onPostStatusTransition($newStatus, $oldStatus, $post) {
1520
  if ($newStatus == 'publish' && $oldStatus != 'publish' ) {
1521
  add_action('publish_post', array($this, 'addPiwikAnnotation'));
1522
  }