Browse Source

update matomo 7.x-2.12

opi 6 years ago
parent
commit
ccb84d2b1e

+ 3 - 3
sites/all/modules/matomo/README.txt

@@ -1,6 +1,6 @@
 
 Module: Matomo Analytics
-Author: Alexander Hass <http://www.hass.de/>
+Author: Alexander Hass <https://www.hass.de/>
 
 
 Description
@@ -49,7 +49,7 @@ Value: [current-user:matomo-role-ids]
 Scope: Visitor
 
 More details about custom variables can be found in the Matomo API documentation
-at http://matomo.org/docs/javascript-tracking/#toc-custom-variables.
+at https://matomo.org/docs/javascript-tracking/#toc-custom-variables.
 
 
 Advanced Settings
@@ -66,7 +66,7 @@ download mode.
 
 Known issues
 ============
-Drupal requirements (http://drupal.org/requirements) tell you to configure 
+Drupal requirements (https://drupal.org/requirements) tell you to configure 
 PHP with "session.save_handler = user", but your Matomo installation may
 not work with this configuration and gives you a server error 500.
 

File diff suppressed because it is too large
+ 4 - 4
sites/all/modules/matomo/matomo.admin.inc


+ 3 - 3
sites/all/modules/matomo/matomo.info

@@ -6,8 +6,8 @@ configure = admin/config/system/matomo
 files[] = matomo.test
 test_dependencies[] = token
 
-; Information added by Drupal.org packaging script on 2018-06-04
-version = "7.x-2.11"
+; Information added by Drupal.org packaging script on 2019-01-31
+version = "7.x-2.12"
 core = "7.x"
 project = "matomo"
-datestamp = "1528147384"
+datestamp = "1548968889"

+ 1 - 1
sites/all/modules/matomo/matomo.install

@@ -6,7 +6,7 @@
  */
 
 function matomo_install() {
-  // Remove tracking from all administrative pages, see http://drupal.org/node/34970.
+  // Remove tracking from all administrative pages, see https://drupal.org/node/34970.
   variable_set('matomo_visibility_roles', 0);
   variable_set('matomo_visibility_pages', 0);
   $pages = array(

+ 6 - 6
sites/all/modules/matomo/matomo.module

@@ -7,7 +7,7 @@
  * Adds the required Javascript to all your Drupal pages to allow tracking by
  * the Matomo statistics package.
  *
- * @author: Alexander Hass <http://drupal.org/user/85918>
+ * @author: Alexander Hass <https://drupal.org/user/85918>
  */
 
 /**
@@ -17,7 +17,7 @@ define('MATOMO_TRACKFILES_EXTENSIONS', '7z|aac|arc|arj|asf|asx|avi|bin|csv|doc(x
 
 /**
  * Define default path exclusion list to remove tracking from admin pages,
- * see http://drupal.org/node/34970 for more information.
+ * see https://drupal.org/node/34970 for more information.
  */
 define('MATOMO_PAGES', "admin\nadmin/*\nbatch\nnode/add*\nnode/*/*\nuser/*/*");
 
@@ -27,7 +27,7 @@ define('MATOMO_PAGES', "admin\nadmin/*\nbatch\nnode/add*\nnode/*/*\nuser/*/*");
 function matomo_help($path, $arg) {
   switch ($path) {
     case 'admin/config/system/matomo':
-      return t('<a href="@pk_url">Matomo Analytics</a> is an open source (GPL license) web analytics software. It gives interesting reports on your website visitors, your popular pages, the search engines keywords they used, the language they speak... and so much more. Matomo aims to be an open source alternative to Google Analytics.', array('@pk_url' => 'http://www.matomo.org/'));
+      return t('<a href="@pk_url">Matomo Analytics</a> is an open source (GPL license) web analytics software. It gives interesting reports on your website visitors, your popular pages, the search engines keywords they used, the language they speak... and so much more. Matomo aims to be an open source alternative to Google Analytics.', array('@pk_url' => 'https://www.matomo.org/'));
   }
 }
 
@@ -239,7 +239,7 @@ function matomo_page_alter(&$page) {
     $codesnippet_before = variable_get('matomo_codesnippet_before', '');
     $codesnippet_after = variable_get('matomo_codesnippet_after', '');
 
-    // Build tracker code. See http://matomo.org/docs/javascript-tracking/#toc-asynchronous-tracking
+    // Build tracker code. See https://matomo.org/docs/javascript-tracking/#toc-asynchronous-tracking
     $script = 'var _paq = _paq || [];';
     $script .= '(function(){';
     $script .= 'var u=(("https:" == document.location.protocol) ? "' . check_url($url_https) . '" : "' . check_url($url_http) . '");';
@@ -319,7 +319,7 @@ function matomo_page_alter(&$page) {
       );
       // Disable the download & outlink tracking for specific CSS classes.
       // Custom code snippets with 'setIgnoreClasses' will override the value.
-      // http://developer.matomo.org/api-reference/tracking-javascript#disable-the-download-amp-outlink-tracking-for-specific-css-classes
+      // https://developer.matomo.org/api-reference/tracking-javascript#disable-the-download-amp-outlink-tracking-for-specific-css-classes
       $script .= '_paq.push(["setIgnoreClasses", ' . drupal_json_encode($ignore_classes) . ']);';
 
       // Enable download & outlink link tracking.
@@ -553,7 +553,7 @@ function matomo_clear_js_cache() {
 /**
  * Helper function for grabbing search keys. Function is missing in D7.
  *
- * http://api.drupal.org/api/function/search_get_keys/6
+ * https://api.drupal.org/api/function/search_get_keys/6
  */
 function matomo_search_get_keys() {
   static $return;

+ 1 - 1
sites/all/modules/matomo/matomo.test

@@ -395,7 +395,7 @@ class MatomoStatusMessagesTest extends DrupalWebTestCase {
     //drupal_set_message('Example status message.', 'status');
     //drupal_set_message('Example warning message.', 'warning');
     //drupal_set_message('Example error message.', 'error');
-    //drupal_set_message('Example error <em>message</em> with html tags and <a href="http://example.com/">link</a>.', 'error');
+    //drupal_set_message('Example error <em>message</em> with html tags and <a href="https://example.com/">link</a>.', 'error');
     //$this->drupalGet('');
     //$this->assertNoRaw('_paq.push(["trackEvent", "Messages", "Status message", "Example status message."]);', '[testMatomoStatusMessages]: Example status message is not enabled for tracking.');
     //$this->assertNoRaw('_paq.push(["trackEvent", "Messages", "Warning message", "Example warning message."]);', '[testMatomoStatusMessages]: Example warning message is not enabled for tracking.');