Merge pull request #8 from indigoxela/rename-piwik-matomo

Issue #5: Renamed piwik.js/php to matomo.js/php

Author: indigoxela

matomo.admin.inc

@@ -470,7 +470,7 @@ function matomo_admin_settings_form_validate($form, &$form_state) {
     $matomo_url = $matomo_url . '/';
     $form_state['values']['url_http'] = $matomo_url;
   }
-  $url = $matomo_url . 'piwik.php';
+  $url = $matomo_url . 'matomo.php';
   $result = backdrop_http_request($url);
   if ($result->code != 200 && $form_state['values']['url_skiperror'] == FALSE) {
     form_set_error('url_http', t('The validation of "@url" failed with error "@error" (HTTP code @code).', array('@url' => check_url($url), '@error' => $result->error, '@code' => $result->code)));
@@ -482,7 +482,7 @@ function matomo_admin_settings_form_validate($form, &$form_state) {
       $matomo_url = $matomo_url . '/';
       $form_state['values']['url_https'] = $matomo_url;
     }
-    $url = $matomo_url . 'piwik.php';
+    $url = $matomo_url . 'matomo.php';
     $result = backdrop_http_request($url);
     if ($result->code != 200 && $form_state['values']['url_skiperror'] == FALSE) {
       form_set_error('url_https', t('The validation of "@url" failed with error "@error" (HTTP code @code).', array('@url' => check_url($url), '@error' => $result->error, '@code' => $result->code)));

matomo.module

@@ -246,7 +246,7 @@ function matomo_preprocess_layout(&$variables) {
     $script .= '(function(){';
     $script .= 'var u=(("https:" == document.location.protocol) ? "' . check_url($url_https) . '" : "' . check_url($url_http) . '");';
     $script .= '_paq.push(["setSiteId", ' . backdrop_json_encode($config->get('site_id')) . ']);';
-    $script .= '_paq.push(["setTrackerUrl", u+"piwik.php"]);';
+    $script .= '_paq.push(["setTrackerUrl", u+"matomo.php"]);';
 
     // Track logged in users across all devices.
     if ($config->get('trackuserid') && user_is_logged_in()) {
@@ -343,7 +343,7 @@ function matomo_preprocess_layout(&$variables) {
     $script .= 'g.async=true;';
 
     // Should a local cached copy of the tracking code be used?
-    if ($config->get('cache') && $url = _matomo_cache($url_http . 'piwik.js')) {
+    if ($config->get('cache') && $url = _matomo_cache($url_http . 'matomo.js')) {
       // A dummy query-string is added to filenames, to gain control over
       // browser-caching. The string changes on every update or full cache
       // flush, forcing browsers to load a new copy of the files, as the
@@ -353,7 +353,7 @@ function matomo_preprocess_layout(&$variables) {
       $script .= 'g.src="' . $url . $query_string . '";';
     }
     else {
-      $script .= 'g.src=u+"piwik.js";';
+      $script .= 'g.src=u+"matomo.js";';
     }
 
     $script .= 's.parentNode.insertBefore(g,s);';
@@ -456,9 +456,9 @@ function matomo_user_presave($account) {
  */
 function matomo_cron() {
   $config = config('matomo.settings');
-  // Regenerate the piwik.js every day.
+  // Regenerate the matomo.js every day.
   if (REQUEST_TIME - $config->get('last_cache') >= 86400 && $config->get('cache', 0)) {
-    _matomo_cache($config->get('url_http', '') . 'piwik.js', TRUE);
+    _matomo_cache($config->get('url_http', '') . 'matomo.js', TRUE);
     $config->set('last_cache', REQUEST_TIME);
     $config->save();
   }

tests/matomo.test

@@ -84,30 +84,30 @@ class MatomoBasicTest extends BackdropWebTestCase {
     // Check tracking code visibility.
     $this->backdropGet('');
     $this->assertRaw('/matomo/matomo.js', '[testMatomoPageVisibility]: Custom tracking script is displayed for authenticated users.');
-    $this->assertRaw('u+"piwik.php"', '[testMatomoPageVisibility]: Tracking code is displayed for authenticated users.');
+    $this->assertRaw('u+"matomo.php"', '[testMatomoPageVisibility]: Tracking code is displayed for authenticated users.');
 
     // Test whether tracking code is not included on pages to omit.
     $this->backdropGet('admin');
-    $this->assertNoRaw('u+"piwik.php"', '[testMatomoPageVisibility]: Tracking code is not displayed on admin page.');
+    $this->assertNoRaw('u+"matomo.php"', '[testMatomoPageVisibility]: Tracking code is not displayed on admin page.');
     $this->backdropGet('admin/config/system/matomo');
     // Checking for tracking code URI here, as $ua_code is displayed in the form.
-    $this->assertNoRaw('u+"piwik.php"', '[testMatomoPageVisibility]: Tracking code is not displayed on admin subpage.');
+    $this->assertNoRaw('u+"matomo.php"', '[testMatomoPageVisibility]: Tracking code is not displayed on admin subpage.');
 
     // Test whether tracking code display is properly flipped.
     $config->set('visibility_pages', 1);
     $config->save();
     $this->backdropGet('admin');
-    $this->assertRaw('u+"piwik.php"', '[testMatomoPageVisibility]: Tracking code is displayed on admin page.');
+    $this->assertRaw('u+"matomo.php"', '[testMatomoPageVisibility]: Tracking code is displayed on admin page.');
     $this->backdropGet('admin/config/system/matomo');
     // Checking for tracking code URI here, as $ua_code is displayed in the form.
-    $this->assertRaw('u+"piwik.php"', '[testMatomoPageVisibility]: Tracking code is displayed on admin subpage.');
+    $this->assertRaw('u+"matomo.php"', '[testMatomoPageVisibility]: Tracking code is displayed on admin subpage.');
     $this->backdropGet('');
-    $this->assertNoRaw('u+"piwik.php"', '[testMatomoPageVisibility]: Tracking code is NOT displayed on front page.');
+    $this->assertNoRaw('u+"matomo.php"', '[testMatomoPageVisibility]: Tracking code is NOT displayed on front page.');
 
     // Test whether tracking code is not display for anonymous.
     $this->backdropLogout();
     $this->backdropGet('');
-    $this->assertNoRaw('u+"piwik.php"', '[testMatomoPageVisibility]: Tracking code is NOT displayed for anonymous.');
+    $this->assertNoRaw('u+"matomo.php"', '[testMatomoPageVisibility]: Tracking code is NOT displayed for anonymous.');
 
     // Switch back to every page except the listed pages.
     $config->set('visibility_pages', 0);
@@ -142,7 +142,7 @@ class MatomoBasicTest extends BackdropWebTestCase {
     (function(){
         var u=(("https:" == document.location.protocol) ? "https://{$MATOMO_URL}" : "http://{$MATOMO_URL}");
         _paq.push(['setSiteId', {$IDSITE}]);
-        _paq.push(['setTrackerUrl', u+'piwik.php']);
+        _paq.push(['setTrackerUrl', u+'matomo.php']);
         _paq.push(['trackPageView']);
         var d=document,
             g=d.createElement('script'),
@@ -160,7 +160,7 @@ class MatomoBasicTest extends BackdropWebTestCase {
     $config->set('cache', 0);
     $config->save();
     $this->backdropGet('');
-    $this->assertRaw('u+"piwik.php"', '[testMatomoTrackingCode]: Latest tracking code used.');
+    $this->assertRaw('u+"matomo.php"', '[testMatomoTrackingCode]: Latest tracking code used.');
 
     // Test if tracking of User ID is enabled.
     $config->set('trackuserid', 1);
@@ -464,16 +464,16 @@ class MatomoRolesTest extends BackdropWebTestCase {
 
     // Check tracking code visibility.
     $this->backdropGet('');
-    $this->assertRaw('u+"piwik.php"', '[testMatomoRoleVisibility]: Tracking code is displayed for anonymous users on frontpage with default settings.');
+    $this->assertRaw('u+"matomo.php"', '[testMatomoRoleVisibility]: Tracking code is displayed for anonymous users on frontpage with default settings.');
     $this->backdropGet('admin');
     $this->assertRaw('"403/URL = "', '[testMatomoRoleVisibility]: 403 Forbidden tracking code is displayed for anonymous users in admin section with default settings.');
 
     $this->backdropLogin($this->admin_user);
 
     $this->backdropGet('');
-    $this->assertRaw('u+"piwik.php"', '[testMatomoRoleVisibility]: Tracking code is displayed for authenticated users on frontpage with default settings.');
+    $this->assertRaw('u+"matomo.php"', '[testMatomoRoleVisibility]: Tracking code is displayed for authenticated users on frontpage with default settings.');
     $this->backdropGet('admin');
-    $this->assertNoRaw('u+"piwik.php"', '[testMatomoRoleVisibility]: Tracking code is NOT displayed for authenticated users in admin section with default settings.');
+    $this->assertNoRaw('u+"matomo.php"', '[testMatomoRoleVisibility]: Tracking code is NOT displayed for authenticated users in admin section with default settings.');
 
     // Test if the non-default settings are working as expected.
 
@@ -483,11 +483,11 @@ class MatomoRolesTest extends BackdropWebTestCase {
     cache_flush('page');
 
     $this->backdropGet('');
-    $this->assertRaw('u+"piwik.php"', '[testMatomoRoleVisibility]: Tracking code is displayed for authenticated users only on frontpage.');
+    $this->assertRaw('u+"matomo.php"', '[testMatomoRoleVisibility]: Tracking code is displayed for authenticated users only on frontpage.');
 
     $this->backdropLogout();
     $this->backdropGet('');
-    $this->assertNoRaw('u+"piwik.php"', '[testMatomoRoleVisibility]: Tracking code is NOT displayed for anonymous users on frontpage.');
+    $this->assertNoRaw('u+"matomo.php"', '[testMatomoRoleVisibility]: Tracking code is NOT displayed for anonymous users on frontpage.');
 
     // Add to every role except the selected ones.
     $config->set('visibility_roles', 1);
@@ -498,30 +498,30 @@ class MatomoRolesTest extends BackdropWebTestCase {
 
     // Check tracking code visibility.
     $this->backdropGet('');
-    $this->assertRaw('u+"piwik.php"', '[testMatomoRoleVisibility]: Tracking code is added to every role and displayed for anonymous users.');
+    $this->assertRaw('u+"matomo.php"', '[testMatomoRoleVisibility]: Tracking code is added to every role and displayed for anonymous users.');
     $this->backdropGet('admin');
     $this->assertRaw('"403/URL = "', '[testMatomoRoleVisibility]: 403 Forbidden tracking code is shown for anonymous users if every role except the selected ones is selected.');
 
     $this->backdropLogin($this->admin_user);
 
     $this->backdropGet('');
-    $this->assertRaw('u+"piwik.php"', '[testMatomoRoleVisibility]: Tracking code is added to every role and displayed on frontpage for authenticated users.');
+    $this->assertRaw('u+"matomo.php"', '[testMatomoRoleVisibility]: Tracking code is added to every role and displayed on frontpage for authenticated users.');
     $this->backdropGet('admin');
-    $this->assertNoRaw('u+"piwik.php"', '[testMatomoRoleVisibility]: Tracking code is added to every role and NOT displayed in admin section for authenticated users.');
+    $this->assertNoRaw('u+"matomo.php"', '[testMatomoRoleVisibility]: Tracking code is added to every role and NOT displayed in admin section for authenticated users.');
 
     // Disable tracking for authenticated users.
     $config->set('roles', array(BACKDROP_AUTHENTICATED_ROLE => BACKDROP_AUTHENTICATED_ROLE));
     $config->save();
     cache_flush('page');
 
     $this->backdropGet('');
-    $this->assertNoRaw('u+"piwik.php"', '[testMatomoRoleVisibility]: Tracking code is NOT displayed on frontpage for excluded authenticated users.');
+    $this->assertNoRaw('u+"matomo.php"', '[testMatomoRoleVisibility]: Tracking code is NOT displayed on frontpage for excluded authenticated users.');
     $this->backdropGet('admin');
-    $this->assertNoRaw('u+"piwik.php"', '[testMatomoRoleVisibility]: Tracking code is NOT displayed in admin section for excluded authenticated users.');
+    $this->assertNoRaw('u+"matomo.php"', '[testMatomoRoleVisibility]: Tracking code is NOT displayed in admin section for excluded authenticated users.');
 
     $this->backdropLogout();
     $this->backdropGet('');
-    $this->assertRaw('u+"piwik.php"', '[testMatomoRoleVisibility]: Tracking code is displayed on frontpage for included anonymous users.');
+    $this->assertRaw('u+"matomo.php"', '[testMatomoRoleVisibility]: Tracking code is displayed on frontpage for included anonymous users.');
   }
 
 }
@@ -576,14 +576,14 @@ class MatomoRolesTest extends BackdropWebTestCase {
 //     $config->set('pages', '<?php return TRUE; ?>');
 //     $config->save();
 //     $this->backdropGet('');
-//     $this->assertRaw('u+"piwik.php"', '[testMatomoPhpFilter]: Tracking is displayed on frontpage page.');
+//     $this->assertRaw('u+"matomo.php"', '[testMatomoPhpFilter]: Tracking is displayed on frontpage page.');
 //     $this->backdropGet('admin');
-//     $this->assertRaw('u+"piwik.php"', '[testMatomoPhpFilter]: Tracking is displayed on admin page.');
+//     $this->assertRaw('u+"matomo.php"', '[testMatomoPhpFilter]: Tracking is displayed on admin page.');
 // 
 //     $config->set('pages', '<?php return FALSE; ?>');
 //     $config->save();
 //     $this->backdropGet('');
-//     $this->assertNoRaw('u+"piwik.php"', '[testMatomoPhpFilter]: Tracking is not displayed on frontpage page.');
+//     $this->assertNoRaw('u+"matomo.php"', '[testMatomoPhpFilter]: Tracking is not displayed on frontpage page.');
 // 
 //     // Test administration form.
 //     $config->set('pages', '<?php return TRUE; ?>');