updated plugin WP-Matomo Integration version 1.0.24

This commit is contained in:
2020-09-25 14:44:13 +00:00
committed by Gitium
parent 62ddc64fea
commit 4f3d745449
27 changed files with 3321 additions and 3304 deletions

View File

@ -1,41 +1,41 @@
<?php
// Get & delete old version's options
if (self::$settings->checkNetworkActivation ()) {
$oldGlobalOptions = get_site_option ( 'wp-piwik_global-settings', array () );
delete_site_option('wp-piwik_global-settings');
} else {
$oldGlobalOptions = get_option ( 'wp-piwik_global-settings', array () );
delete_option('wp-piwik_global-settings');
}
$oldOptions = get_option ( 'wp-piwik_settings', array () );
delete_option('wp-piwik_settings');
if (self::$settings->checkNetworkActivation ()) {
global $wpdb;
$aryBlogs = \WP_Piwik\Settings::getBlogList();
if (is_array($aryBlogs))
foreach ($aryBlogs as $aryBlog) {
$oldOptions = get_blog_option ( $aryBlog['blog_id'], 'wp-piwik_settings', array () );
if (!$this->isConfigured())
foreach ( $oldOptions as $key => $value )
self::$settings->setOption ( $key, $value, $aryBlog['blog_id'] );
delete_blog_option($aryBlog['blog_id'], 'wp-piwik_settings');
}
}
if (!$this->isConfigured()) {
if (!$oldGlobalOptions['add_tracking_code']) $oldGlobalOptions['track_mode'] = 'disabled';
elseif (!$oldGlobalOptions['track_mode']) $oldGlobalOptions['track_mode'] = 'default';
elseif ($oldGlobalOptions['track_mode'] == 1) $oldGlobalOptions['track_mode'] = 'js';
elseif ($oldGlobalOptions['track_mode'] == 2) $oldGlobalOptions['track_mode'] = 'proxy';
// Store old values in new settings
foreach ( $oldGlobalOptions as $key => $value )
self::$settings->setGlobalOption ( $key, $value );
foreach ( $oldOptions as $key => $value )
self::$settings->setOption ( $key, $value );
}
<?php
// Get & delete old version's options
if (self::$settings->checkNetworkActivation ()) {
$oldGlobalOptions = get_site_option ( 'wp-piwik_global-settings', array () );
delete_site_option('wp-piwik_global-settings');
} else {
$oldGlobalOptions = get_option ( 'wp-piwik_global-settings', array () );
delete_option('wp-piwik_global-settings');
}
$oldOptions = get_option ( 'wp-piwik_settings', array () );
delete_option('wp-piwik_settings');
if (self::$settings->checkNetworkActivation ()) {
global $wpdb;
$aryBlogs = \WP_Piwik\Settings::getBlogList();
if (is_array($aryBlogs))
foreach ($aryBlogs as $aryBlog) {
$oldOptions = get_blog_option ( $aryBlog['blog_id'], 'wp-piwik_settings', array () );
if (!$this->isConfigured())
foreach ( $oldOptions as $key => $value )
self::$settings->setOption ( $key, $value, $aryBlog['blog_id'] );
delete_blog_option($aryBlog['blog_id'], 'wp-piwik_settings');
}
}
if (!$this->isConfigured()) {
if (!$oldGlobalOptions['add_tracking_code']) $oldGlobalOptions['track_mode'] = 'disabled';
elseif (!$oldGlobalOptions['track_mode']) $oldGlobalOptions['track_mode'] = 'default';
elseif ($oldGlobalOptions['track_mode'] == 1) $oldGlobalOptions['track_mode'] = 'js';
elseif ($oldGlobalOptions['track_mode'] == 2) $oldGlobalOptions['track_mode'] = 'proxy';
// Store old values in new settings
foreach ( $oldGlobalOptions as $key => $value )
self::$settings->setGlobalOption ( $key, $value );
foreach ( $oldOptions as $key => $value )
self::$settings->setOption ( $key, $value );
}
self::$settings->save ();

View File

@ -1,9 +1,9 @@
<?php
$aryWPMUConfig = get_site_option ( 'wpmu-piwik_global-settings', false );
if (self::$settings->checkNetworkActivation () && $aryWPMUConfig) {
foreach ( $aryWPMUConfig as $key => $value )
self::$settings->setGlobalOption ( $key, $value );
delete_site_option ( 'wpmu-piwik_global-settings' );
self::$settings->setGlobalOption ( 'auto_site_config', true );
} else
<?php
$aryWPMUConfig = get_site_option ( 'wpmu-piwik_global-settings', false );
if (self::$settings->checkNetworkActivation () && $aryWPMUConfig) {
foreach ( $aryWPMUConfig as $key => $value )
self::$settings->setGlobalOption ( $key, $value );
delete_site_option ( 'wpmu-piwik_global-settings' );
self::$settings->setGlobalOption ( 'auto_site_config', true );
} else
self::$settings->setGlobalOption ( 'auto_site_config', false );

View File

@ -1,5 +1,5 @@
<?php
if (self::$settings->getGlobalOption ( 'track_compress' ))
self::$settings->setGlobalOption ( 'track_mode', 1 );
else
<?php
if (self::$settings->getGlobalOption ( 'track_compress' ))
self::$settings->setGlobalOption ( 'track_mode', 1 );
else
self::$settings->setGlobalOption ( 'track_mode', 0 );

View File

@ -1,10 +1,10 @@
<?php
$aryRemoveOptions = array (
'wp-piwik_siteid',
'wp-piwik_404',
'wp-piwik_scriptupdate',
'wp-piwik_dashboardid',
'wp-piwik_jscode'
);
foreach ( $aryRemoveOptions as $strRemoveOption )
<?php
$aryRemoveOptions = array (
'wp-piwik_siteid',
'wp-piwik_404',
'wp-piwik_scriptupdate',
'wp-piwik_dashboardid',
'wp-piwik_jscode'
);
foreach ( $aryRemoveOptions as $strRemoveOption )
delete_option ( $strRemoveOption );