more switching of paths to matomo

diff --git a/app/authutils.php-class b/app/authutils.php-class
index f94131096a88c4a2634b351f1f670b83f400a23e..d2737d9d7ebb3e6ff1326060fdee92368e0d3422 100755 (executable)
--- a/app/authutils.php-class
+++ b/app/authutils.php-class
@@ -121,7 +121,7 @@ class AuthUtils {
     // Sanitize settings.
     $this->settings['piwik_enabled'] = (@$this->settings['piwik_enabled']) ? true : false;
     $this->settings['piwik_site_id'] = intval(@$this->settings['piwik_site_id']);
     // Sanitize settings.
     $this->settings['piwik_enabled'] = (@$this->settings['piwik_enabled']) ? true : false;
     $this->settings['piwik_site_id'] = intval(@$this->settings['piwik_site_id']);

-    $this->settings['piwik_url'] = strlen(@$this->settings['piwik_url']) ? $this->settings['piwik_url'] : '/piwik/';
+    $this->settings['piwik_url'] = strlen(@$this->settings['piwik_url']) ? $this->settings['piwik_url'] : '/matomo/';

     $this->settings['piwik_tracker_path'] = strlen(@$this->settings['piwik_tracker_path']) ? $this->settings['piwik_tracker_path'] : '../vendor/matomo/matomo-php-tracker/';
     $this->settings['skin'] = (@$this->settings['skin'] && is_dir('skin/'.$this->settings['skin'])) ? $this->settings['skin'] : 'default';
     $this->settings['operator_name'] = (@$this->settings['operator_name']) ? $this->settings['operator_name'] : 'Example';
     $this->settings['piwik_tracker_path'] = strlen(@$this->settings['piwik_tracker_path']) ? $this->settings['piwik_tracker_path'] : '../vendor/matomo/matomo-php-tracker/';
     $this->settings['skin'] = (@$this->settings['skin'] && is_dir('skin/'.$this->settings['skin'])) ? $this->settings['skin'] : 'default';
     $this->settings['operator_name'] = (@$this->settings['operator_name']) ? $this->settings['operator_name'] : 'Example';

diff --git a/etc/kairo/auth_settings.json b/etc/kairo/auth_settings.json
index 164b2bda2be29c292031db270dba3dca09da61e0..59749d5f7c23265df9d596234a6da89634f755c5 100644 (file)
--- a/etc/kairo/auth_settings.json
+++ b/etc/kairo/auth_settings.json
@@ -13,7 +13,7 @@
 "operator_contact_url": "https://github.com/KaiRo_at/authserver/",
 "info_from_email": "noreply@example.com",
 "piwik_enabled": false,
 "operator_contact_url": "https://github.com/KaiRo_at/authserver/",
 "info_from_email": "noreply@example.com",
 "piwik_enabled": false,

-"piwik_url": "/piwik/",
+"piwik_url": "/matomo/",

 "piwik_site_id": 1,
 "piwik_tracker_path": "/srv/www/matomo/vendor/matomo/matomo-php-tracker/",
 }
 "piwik_site_id": 1,
 "piwik_tracker_path": "/srv/www/matomo/vendor/matomo/matomo-php-tracker/",
 }