diff --git a/.gitmodules b/.gitmodules
index 4fdca8d789847afb78810c9dd1d27ee9a534351a..59c95bea89e947f98ba61bf7f8e3e12e039789cd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,12 +7,12 @@
[submodule "library/Redmine"]
path = library/Redmine
url = http://git.afi-sa.fr/afi/php-redmine-api.git
-[submodule "library/piwik-php-tracker"]
- path = library/piwik-php-tracker
- url = http://git.afi-sa.fr/afi/piwik-php-tracker.git
[submodule "library/iCal"]
path = library/iCal
url = http://git.afi-sa.net/afi/iCal.git
[submodule "library/PhpParser"]
path = library/PhpParser
url = http://git.afi-sa.net/afi/PHP-Parser.git
+[submodule "library/matomo-php-tracker"]
+ path = library/matomo-php-tracker
+ url = http://git.afi-sa.fr/afi/matomo-php-tracker.git
diff --git a/VERSIONS_WIP/71435 b/VERSIONS_WIP/71435
new file mode 100644
index 0000000000000000000000000000000000000000..6ee80d4af8a6106ec498195686414a26cea116af
--- /dev/null
+++ b/VERSIONS_WIP/71435
@@ -0,0 +1 @@
+ - ticket #71435 : Piwik est devenu Matomo
\ No newline at end of file
diff --git a/application/modules/admin/controllers/StatController.php b/application/modules/admin/controllers/StatController.php
index fa7a407d4e6a5b670ad0234a0722c85b94f5a3d0..354192f5bdca0093eebd9c881af2ab5f67926b43 100644
--- a/application/modules/admin/controllers/StatController.php
+++ b/application/modules/admin/controllers/StatController.php
@@ -52,21 +52,21 @@ class Admin_StatController extends ZendAfi_Controller_Action {
}
- public function piwikAction() {
- $this->view->titre = $this->_('Tableau de bord PIWIK');
- if(!(new Class_AdminVar_Piwik())->isEnabled())
- return $this->view->error = $this->_('Veuillez renseigner la variable PIWIK_AUTH_TOKEN et JS_STAT');
+ public function matomoAction() {
+ $this->view->titre = $this->_('Tableau de bord MATOMO');
+ if(!(new Class_AdminVar_Matomo())->isEnabled())
+ return $this->view->error = $this->_('Veuillez renseigner la variable MATOMO_AUTH_TOKEN et JS_STAT');
- $this->view->url = $this->_getPiwikDashboardUrl();
+ $this->view->url = $this->_getMatomoDashboardUrl();
}
- protected function _getPiwikDashboardUrl() {
+ protected function _getMatomoDashboardUrl() {
$js_stat = (new Class_AdminVar_JsStat());
- $base_url = $js_stat->getPiwikUrl() . 'index.php';
- $auth_token = ['token_auth' => (new Class_AdminVar_Piwik())->getAuthToken()];
- $id_site = ['idSite' => $js_stat->getPiwikSiteId()];
+ $base_url = $js_stat->getMatomoUrl() . 'index.php';
+ $auth_token = ['token_auth' => (new Class_AdminVar_Matomo())->getAuthToken()];
+ $id_site = ['idSite' => $js_stat->getMatomoSiteId()];
$dashboard_params = ['module' => 'Widgetize',
'action' => 'iframe',
diff --git a/application/modules/admin/views/scripts/stat/piwik.phtml b/application/modules/admin/views/scripts/stat/matomo.phtml
similarity index 78%
rename from application/modules/admin/views/scripts/stat/piwik.phtml
rename to application/modules/admin/views/scripts/stat/matomo.phtml
index 068751548c7465abc25a0f8ebb7e64ee433546a0..aa926bd56d99a9c88a752ef4a5685ba392706e63 100644
--- a/application/modules/admin/views/scripts/stat/piwik.phtml
+++ b/application/modules/admin/views/scripts/stat/matomo.phtml
@@ -4,13 +4,13 @@ Class_ScriptLoader::getInstance()
var container_height = Math.round(window.innerHeight - title.position().top - title.height());
var container = $(".modules");
container.height(container_height);
- $("iframe#piwik").height(container_height - title.height() - Math.round(container.css("padding-bottom").replace("px","")))');
+ $("iframe#matomo").height(container_height - title.height() - Math.round(container.css("padding-bottom").replace("px","")))');
if($this->error)
echo $this->tag('p', $this->error, ['class' => 'error']);
echo $this->tag('iframe', '', ['src' => $this->url,
- 'id' => 'piwik',
+ 'id' => 'matomo',
'frameborder' => '0',
'marginheight' => '0',
'marginwidth' => '0',
diff --git a/cosmogramme/sql/patch/patch_356.php b/cosmogramme/sql/patch/patch_356.php
new file mode 100644
index 0000000000000000000000000000000000000000..e26d8e47475191bec2b50c8ebf424f701ae06531
--- /dev/null
+++ b/cosmogramme/sql/patch/patch_356.php
@@ -0,0 +1,2 @@
+<?php
+(new Class_Migration_PiwikToMatomo)->run();
\ No newline at end of file
diff --git a/library/Class/AdminVar.php b/library/Class/AdminVar.php
index 4388b4bd5cc6a62317f0a105b9cc79143eef1c84..249c29fae59fe0d28905f28ba9fe196cc7bf6661 100644
--- a/library/Class/AdminVar.php
+++ b/library/Class/AdminVar.php
@@ -394,7 +394,7 @@ class Class_AdminVarLoader extends Storm_Model_Loader {
protected function _getStatVars() {
return ['JS_STAT' => Class_AdminVar_Meta::newRawText($this->_('Javascript code for statistics')),
- 'PIWIK_AUTH_TOKEN' => Class_AdminVar_Meta::newDefault($this->_('PIWIK authentication token for widgets'))];
+ 'MATOMO_AUTH_TOKEN' => Class_AdminVar_Meta::newDefault($this->_('MATOMO authentication token for widgets'))];
}
diff --git a/library/Class/AdminVar/JsStat.php b/library/Class/AdminVar/JsStat.php
index 111be79302e59164878282e420b2f61ce8472f30..27618ee1533b128710bfc887cb82f4ca19fc850a 100644
--- a/library/Class/AdminVar/JsStat.php
+++ b/library/Class/AdminVar/JsStat.php
@@ -22,7 +22,7 @@
class Class_AdminVar_JsStat {
public function isTrackerSet() {
- return $this->isGoogleAnalytics() || $this->isPiwik();
+ return $this->isGoogleAnalytics() || $this->isMatomo();
}
@@ -31,8 +31,8 @@ class Class_AdminVar_JsStat {
}
- public function isPiwik() {
- return ($this->getPiwikSiteId() != '');
+ public function isMatomo() {
+ return ($this->getMatomoSiteId() != '');
}
@@ -40,7 +40,7 @@ class Class_AdminVar_JsStat {
return
$this->isGoogleAnalytics()
? $this->_getGoogleAnalyticsId()
- : $this->getPiwikSiteId();
+ : $this->getMatomoSiteId();
}
@@ -49,7 +49,7 @@ class Class_AdminVar_JsStat {
}
- public function getPiwikUrl() {
+ public function getMatomoUrl() {
return $this->_extractFromJsStat("/var u=.*(\/\/[^\"]+)\"/i", 1);
}
@@ -70,7 +70,7 @@ class Class_AdminVar_JsStat {
}
- public function getPiwikSiteId() {
+ public function getMatomoSiteId() {
$script = Class_AdminVar::get('JS_STAT');
preg_match_all("/setSiteId\',([^\]]+)\]\)/i", $script, $matches);
return isset($matches[1][0]) ? trim($matches[1][0], " \t\n\r\0\x0B'\"") : '';
diff --git a/library/Class/AdminVar/Piwik.php b/library/Class/AdminVar/Matomo.php
similarity index 86%
rename from library/Class/AdminVar/Piwik.php
rename to library/Class/AdminVar/Matomo.php
index 1fb11f0ad52075a1fb30e50b4b31dee5e27deb42..4161a03d9f4a6eac7d737024dce4297a03375193 100644
--- a/library/Class/AdminVar/Piwik.php
+++ b/library/Class/AdminVar/Matomo.php
@@ -20,16 +20,16 @@
*/
-class Class_AdminVar_Piwik {
+class Class_AdminVar_Matomo {
public function isEnabled() {
return (('' != $this->getAuthToken())
- && ('' != (new Class_AdminVar_JsStat())->getPiwikUrl()));
+ && ('' != (new Class_AdminVar_JsStat())->getMatomoUrl()));
}
public function getAuthToken() {
- return Class_AdminVar::get('PIWIK_AUTH_TOKEN');
+ return Class_AdminVar::get('MATOMO_AUTH_TOKEN');
}
}
?>
\ No newline at end of file
diff --git a/library/Class/Migration/PiwikToMatomo.php b/library/Class/Migration/PiwikToMatomo.php
new file mode 100644
index 0000000000000000000000000000000000000000..957587717e5c484318c637497244aa91d835eb35
--- /dev/null
+++ b/library/Class/Migration/PiwikToMatomo.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright (c) 2012-2017, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class Class_Migration_PiwikToMatomo {
+
+ public function run() {
+ if(!$old_var = Class_AdminVar::find('PIWIK_AUTH_TOKEN'))
+ return $this;
+
+ $old_var->delete();
+
+ Class_AdminVAr::set('MATOMO_AUTH_TOKEN', $old_var->getValeur());
+ return $this;
+ }
+}
\ No newline at end of file
diff --git a/library/Class/WebService/Analytics/Client.php b/library/Class/WebService/Analytics/Client.php
index 705c1c1a882f63aa0d4c2d9044330a79989989df..39fb2edfbb9e277c5308c8efcd675505856c9bde 100644
--- a/library/Class/WebService/Analytics/Client.php
+++ b/library/Class/WebService/Analytics/Client.php
@@ -28,7 +28,7 @@ class Class_WebService_Analytics_Client {
return $js_stat->isGoogleAnalytics()
? new Class_WebService_Analytics_GoogleTracker($js_stat)
- : new Class_WebService_Analytics_PiwikTracker($js_stat);
+ : new Class_WebService_Analytics_MatomoTracker($js_stat);
}
diff --git a/library/Class/WebService/Analytics/PiwikTracker.php b/library/Class/WebService/Analytics/MatomoTracker.php
similarity index 82%
rename from library/Class/WebService/Analytics/PiwikTracker.php
rename to library/Class/WebService/Analytics/MatomoTracker.php
index fa336782250319ffa70f6e6046d324a45f26fc5c..a7d0bfc1bba2e2bef67fe6bb5bdce6e669c289e6 100644
--- a/library/Class/WebService/Analytics/PiwikTracker.php
+++ b/library/Class/WebService/Analytics/MatomoTracker.php
@@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-class Class_WebService_Analytics_PiwikTracker extends Class_WebService_Analytics_NullTracker {
+class Class_WebService_Analytics_MatomoTracker extends Class_WebService_Analytics_NullTracker {
protected $_tracker;
public function __construct($config) {
- require_once('piwik-php-tracker/PiwikTracker.php');
+ require_once('matomo-php-tracker/PiwikTracker.php');
$this->_config = $config;
$this->_tracker = new PiwikTracker($config->getTrackerId(),
- $config->getPiwikUrl());
+ $config->getMatomoUrl());
}
@@ -36,7 +36,7 @@ class Class_WebService_Analytics_PiwikTracker extends Class_WebService_Analytics
public function getUrl() {
- return $this->_config->getPiwikUrl() . 'piwik.php';
+ return $this->_config->getMatomoUrl() . 'piwik.php';
}
diff --git a/library/ZendAfi/Acl/AdminControllerGroup.php b/library/ZendAfi/Acl/AdminControllerGroup.php
index 5f83a1d122bb71dd933cd9fdd25f24f3a2e6a89f..9693cfd026d3cd79eba28aa1ba6e2cf38f2f6eab 100644
--- a/library/ZendAfi/Acl/AdminControllerGroup.php
+++ b/library/ZendAfi/Acl/AdminControllerGroup.php
@@ -63,7 +63,7 @@ class ZendAfi_Acl_AdminControllerGroup {
'album/dilicom' => Class_AdminVar::isDilicomPNBEnabled(),
'premier-chapitre' => Class_AdminVar::isPremierChapitreEnabled(),
'i18n' => Class_AdminVar::isTranslationEnabled(),
- 'stat/piwik' => (new Class_AdminVar_Piwik())->isEnabled(),
+ 'stat/matomo' => (new Class_AdminVar_Matomo())->isEnabled(),
'multimedia' => Class_AdminVar::isMultimediaEnabled(),
'search-form' => Class_AdminVar::isCustomSearchFormEnabled(),
];
diff --git a/library/ZendAfi/View/Helper/Admin/ContentNav.php b/library/ZendAfi/View/Helper/Admin/ContentNav.php
index d728f63b53aee7e94046b96f5a3e60c86967b457..83b6f08ece978640b4569e9b49b83d8032ecd29b 100644
--- a/library/ZendAfi/View/Helper/Admin/ContentNav.php
+++ b/library/ZendAfi/View/Helper/Admin/ContentNav.php
@@ -109,7 +109,7 @@ class ZendAfi_View_Helper_Admin_ContentNav extends ZendAfi_View_Helper_BaseHelpe
public function menuStats() {
return $this
->renderBloc($this->_('Statistiques'),
- [['piwik_stats', $this->_('Piwik'), '/admin/stat/piwik'],
+ [['matomo_stats', $this->_('Matomo'), '/admin/stat/matomo'],
['failed_searches', $this->_('Recherches infructueuses'), '/admin/stat/rechercheinfructueuse']
]);
}
diff --git a/library/ZendAfi/View/Helper/Admin/HelpLink.php b/library/ZendAfi/View/Helper/Admin/HelpLink.php
index cb3334fec4225f17b69c9c5658df26ee9c8c741b..c4a9c02fcc7d0eaa52028620cf8712e4468dff1d 100644
--- a/library/ZendAfi/View/Helper/Admin/HelpLink.php
+++ b/library/ZendAfi/View/Helper/Admin/HelpLink.php
@@ -104,7 +104,7 @@ class ZendAfi_View_Helper_Admin_HelpLinkBokehWiki {
'bib' => ['index' => 'Modifier_une_bibliothèque'],
'index' => ['index' => 'Bokeh',
'update-skin' => 'Mettre_Ã _jour_la_charte_graphique'],
- 'stat' => ['piwik' => 'Piwik'],
+ 'stat' => ['matomo' => 'Matomo'],
'print' => ['index' => 'Imprimer_un_résultat_de_recherche,_une_notice_ou_des_articles'],
'file-manager' => ['index' => 'Explorateur_de_fichiers']
];
diff --git a/library/matomo-php-tracker b/library/matomo-php-tracker
new file mode 160000
index 0000000000000000000000000000000000000000..c635dc3b5ed656838d433ad5e373cb3487807185
--- /dev/null
+++ b/library/matomo-php-tracker
@@ -0,0 +1 @@
+Subproject commit c635dc3b5ed656838d433ad5e373cb3487807185
diff --git a/library/piwik-php-tracker b/library/piwik-php-tracker
deleted file mode 160000
index f026613f8137c014030c96a22491ede5f5f1676b..0000000000000000000000000000000000000000
--- a/library/piwik-php-tracker
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f026613f8137c014030c96a22491ede5f5f1676b
diff --git a/public/admin/skins/bokeh74/config.json b/public/admin/skins/bokeh74/config.json
index 4f9b981dfd4b14f5a741b914156bac681516e478..d8a3958cbcf2b8f05de395fec4e5cd79253669db 100644
--- a/public/admin/skins/bokeh74/config.json
+++ b/public/admin/skins/bokeh74/config.json
@@ -23,7 +23,7 @@
"genres": "icons/menu/genres_24.png",
"translations": "icons/menu/traductions_24.png",
"failed_searches": "icons/menu/infructueux_24.png",
- "piwik_stats": "icons/menu/piwik_24.png",
+ "matomo_stats": "icons/menu/matomo_24.png",
"record_views": "icons/menu/stats_visu_24.png",
"top_record_views": "icons/menu/stats_palmares_24.png",
"territories": "icons/menu/territoire_24.png",
diff --git a/public/admin/skins/bokeh74/icons/menu/matomo_24.png b/public/admin/skins/bokeh74/icons/menu/matomo_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..354eae7d2cf769a330ddd0b662026b80d184f674
Binary files /dev/null and b/public/admin/skins/bokeh74/icons/menu/matomo_24.png differ
diff --git a/public/admin/skins/bokeh74/icons/menu/matomo_48.png b/public/admin/skins/bokeh74/icons/menu/matomo_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..da69bbd295acd59a363029a8a162360947b1b043
Binary files /dev/null and b/public/admin/skins/bokeh74/icons/menu/matomo_48.png differ
diff --git a/public/admin/skins/bokeh74/icons/menu/piwik_24.png b/public/admin/skins/bokeh74/icons/menu/piwik_24.png
deleted file mode 100644
index 36e00ecb877874ab87054511a0a096a8f23240ec..0000000000000000000000000000000000000000
Binary files a/public/admin/skins/bokeh74/icons/menu/piwik_24.png and /dev/null differ
diff --git a/public/admin/skins/bokeh74/icons/menu/piwik_48.png b/public/admin/skins/bokeh74/icons/menu/piwik_48.png
deleted file mode 100644
index 36e00ecb877874ab87054511a0a096a8f23240ec..0000000000000000000000000000000000000000
Binary files a/public/admin/skins/bokeh74/icons/menu/piwik_48.png and /dev/null differ
diff --git a/public/admin/skins/retro/config.json b/public/admin/skins/retro/config.json
index 3e4d472326e4e9e09f500a3719f141cfc625b5b4..a46f274482363f553139e706a48e0f087062cc23 100644
--- a/public/admin/skins/retro/config.json
+++ b/public/admin/skins/retro/config.json
@@ -23,7 +23,7 @@
"genres": "icons/menu/genres_24.png",
"translations": "icons/menu/traductions_24.png",
"failed_searches": "icons/menu/infructueux_24.png",
- "piwik_stats": "icons/menu/piwik_24.png",
+ "matomo_stats": "icons/menu/matomo_24.png",
"record_views": "icons/menu/stats_visu_24.png",
"top_record_views": "icons/menu/stats_palmares_24.png",
"territories": "icons/menu/territoire_24.png",
diff --git a/public/admin/skins/retro/icons/menu/matomo_24.png b/public/admin/skins/retro/icons/menu/matomo_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..354eae7d2cf769a330ddd0b662026b80d184f674
Binary files /dev/null and b/public/admin/skins/retro/icons/menu/matomo_24.png differ
diff --git a/public/admin/skins/retro/icons/menu/matomo_48.png b/public/admin/skins/retro/icons/menu/matomo_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..da69bbd295acd59a363029a8a162360947b1b043
Binary files /dev/null and b/public/admin/skins/retro/icons/menu/matomo_48.png differ
diff --git a/public/admin/skins/retro/icons/menu/piwik_24.png b/public/admin/skins/retro/icons/menu/piwik_24.png
deleted file mode 100644
index 36e00ecb877874ab87054511a0a096a8f23240ec..0000000000000000000000000000000000000000
Binary files a/public/admin/skins/retro/icons/menu/piwik_24.png and /dev/null differ
diff --git a/public/admin/skins/retro/icons/menu/piwik_48.png b/public/admin/skins/retro/icons/menu/piwik_48.png
deleted file mode 100644
index 36e00ecb877874ab87054511a0a096a8f23240ec..0000000000000000000000000000000000000000
Binary files a/public/admin/skins/retro/icons/menu/piwik_48.png and /dev/null differ
diff --git a/tests/application/modules/admin/controllers/StatControllerTest.php b/tests/application/modules/admin/controllers/StatControllerTest.php
index a6d94762f7d39d6e0db9d97d32a7bbf734606ad3..acd4c5e171b17ab82404458038fab4419c49c4e4 100644
--- a/tests/application/modules/admin/controllers/StatControllerTest.php
+++ b/tests/application/modules/admin/controllers/StatControllerTest.php
@@ -68,7 +68,7 @@ class Admin_StatControllerRecherchesInfructueusesTest
-class Admin_StatControllerPiwikActionTest
+class Admin_StatControllerMatomoActionTest
extends Admin_AbstractControllerTestCase {
protected $_storm_default_to_volatile = true;
@@ -76,8 +76,8 @@ class Admin_StatControllerPiwikActionTest
public function setUp() {
parent::setUp();
- Class_AdminVar::set('PIWIK_AUTH_TOKEN', 'anierstauie-ua/ive');
- Class_AdminVar::set('JS_STAT', '<!-- Piwik -->
+ Class_AdminVar::set('MATOMO_AUTH_TOKEN', 'anierstauie-ua/ive');
+ Class_AdminVar::set('JS_STAT', '<!-- Matomo -->
<script type="text/javascript">
try {
var url = window.location.href ;
@@ -142,24 +142,24 @@ if ( (url.match ( new RegExp ( "/recherche/" ) )) && ($(\'.resultats_page\').len
_paq.push([\'trackPageView\']);
_paq.push([\'enableLinkTracking\']);
(function() {
- var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.server.st/";
- _paq.push([\'setTrackerUrl\', u+\'piwik.php\']);
+ var u=(("https:" == document.location.protocol) ? "https" : "http") + "://matomo.server.st/";
+ _paq.push([\'setTrackerUrl\', u+\'matomo.php\']);
_paq.push([\'setSiteId\', 9999]);
var d=document, g=d.createElement(\'script\'), s=d.getElementsByTagName(\'script\')[0]; g.type=\'text/javascript\';
- g.defer=true; g.async=true; g.src=u+\'piwik.js\'; s.parentNode.insertBefore(g,s);
+ g.defer=true; g.async=true; g.src=u+\'matomo.js\'; s.parentNode.insertBefore(g,s);
})();
} catch ( err ) {}
</script>
-<noscript><p><img src="http://piwik.server.st/piwik.php?idsite=9999" style="border:0;" alt="" /></p></noscript>
-<!-- End Piwik Code -->');
+<noscript><p><img src="http://matomo.server.st/matomo.php?idsite=9999" style="border:0;" alt="" /></p></noscript>
+<!-- End Matomo Code -->');
- $this->dispatch('/admin/stat/piwik', true);
+ $this->dispatch('/admin/stat/matomo', true);
}
/** @test */
public function iframeSrcShouldNotContainsProtocol() {
- $this->assertXPath('//iframe[starts-with(@src, "//piwik.server.st")]',
+ $this->assertXPath('//iframe[starts-with(@src, "//matomo.server.st")]',
$this->_response->getBody());
}
}
\ No newline at end of file
diff --git a/tests/application/modules/admin/controllers/enssib.fr.html b/tests/application/modules/admin/controllers/enssib.fr.html
index 8a7e6f8d60f740db24bfb9da75dd87b4a0350d44..dff394c34f2bc8c111eb0fb994e5935528da8283 100644
--- a/tests/application/modules/admin/controllers/enssib.fr.html
+++ b/tests/application/modules/admin/controllers/enssib.fr.html
@@ -576,7 +576,7 @@
</script>
<script type="text/javascript">
<!--//--><![CDATA[//><!--
-var _paq = _paq || [];(function(){var u=(("https:" == document.location.protocol) ? "" : "http://www.enssib.fr/piwik/");_paq.push(["setSiteId", "1"]);_paq.push(["setTrackerUrl", u+"piwik.php"]);_paq.push(["setDoNotTrack", 1]);_paq.push(["trackPageView"]);_paq.push(["setIgnoreClasses", ["no-tracking","colorbox"]]);_paq.push(["enableLinkTracking"]);var d=document,g=d.createElement("script"),s=d.getElementsByTagName("script")[0];g.type="text/javascript";g.defer=true;g.async=true;g.src=u+"piwik.js";s.parentNode.insertBefore(g,s);})();
+var _paq = _paq || [];(function(){var u=(("https:" == document.location.protocol) ? "" : "http://www.enssib.fr/matomo/");_paq.push(["setSiteId", "1"]);_paq.push(["setTrackerUrl", u+"matomo.php"]);_paq.push(["setDoNotTrack", 1]);_paq.push(["trackPageView"]);_paq.push(["setIgnoreClasses", ["no-tracking","colorbox"]]);_paq.push(["enableLinkTracking"]);var d=document,g=d.createElement("script"),s=d.getElementsByTagName("script")[0];g.type="text/javascript";g.defer=true;g.async=true;g.src=u+"matomo.js";s.parentNode.insertBefore(g,s);})();
//--><!]]>
</script>
<script type="text/javascript" src="http://www.enssib.fr/sites/www/files/js/js_MpKfe1sTh5JIVGCZ17DsAuT1rqAC38MLLlkjqjQ1X_k.js"></script>
@@ -586,7 +586,7 @@ var _paq = _paq || [];(function(){var u=(("https:" == document.location.protocol
<script type="text/javascript" src="http://www.enssib.fr/sites/www/files/js/js_ZCgiO0pXCwurcKLOtv0FP6xmULSWKvKgKtn15MtAle4.js"></script>
<script type="text/javascript">
<!--//--><![CDATA[//><!--
-jQuery.extend(Drupal.settings, {"basePath":"\/","pathPrefix":"","ajaxPageState":{"theme":"enssib","theme_token":"XhojEjuKoEDBQMH40fF83wbaojQn4mOO7i5VW5B9V8c","jquery_version":"1.10","js":{"0":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/jquery\/1.10\/jquery.min.js":1,"misc\/jquery.once.js":1,"misc\/drupal.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.core.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.widget.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/external\/jquery.cookie.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/misc\/jquery.form.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.mouse.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.draggable.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.droppable.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.sortable.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.button.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.position.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.resizable.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.dialog.min.js":1,"misc\/ajax.js":1,"sites\/all\/modules\/contrib\/jquery_update\/js\/jquery_update.js":1,"sites\/all\/modules\/contrib\/admin_menu\/admin_devel\/admin_devel.js":1,"sites\/all\/modules\/contrib\/button_field\/js\/button_field.ajax.js":1,"public:\/\/languages\/fr_Np55hzn09APffb7Qx6JAhdazIXdVfByTCyRDBe-F_GI.js":1,"sites\/all\/modules\/contrib\/views_slideshow\/js\/views_slideshow.js":1,"sites\/all\/modules\/contrib\/views\/js\/base.js":1,"misc\/progress.js":1,"sites\/all\/modules\/contrib\/homebox\/homebox.js":1,"sites\/all\/modules\/contrib\/homebox\/includes\/tipsy\/jquery.tipsy.js":1,"sites\/all\/libraries\/jquery.cycle\/jquery.cycle.all.min.js":1,"sites\/all\/modules\/contrib\/views_slideshow\/contrib\/views_slideshow_cycle\/js\/views_slideshow_cycle.js":1,"sites\/all\/modules\/contrib\/piwik\/piwik.js":1,"sites\/all\/modules\/contrib\/views\/js\/ajax_view.js":1,"sites\/all\/modules\/features\/enssib_emploi\/js\/emploi.js":1,"sites\/all\/modules\/features\/enssib_suivi_candidatures\/js\/webform_validator.js":1,"sites\/all\/themes\/enssib\/js\/variables.js":1,"sites\/all\/themes\/enssib\/js\/behaviours.js":1,"sites\/all\/themes\/enssib\/js\/enssib.js":1,"sites\/all\/themes\/enssib\/js\/jquery.colorbox-min.js":1,"sites\/all\/themes\/enssib\/js\/jquery.flexslider-min.js":1,"sites\/all\/themes\/enssib\/js\/spamspan.js":1},"css":{"modules\/system\/system.base.css":1,"modules\/system\/system.menus.css":1,"modules\/system\/system.messages.css":1,"modules\/system\/system.theme.css":1,"misc\/ui\/jquery.ui.button.css":1,"misc\/ui\/jquery.ui.resizable.css":1,"misc\/ui\/jquery.ui.dialog.css":1,"sites\/all\/modules\/contrib\/simplenews\/simplenews.css":1,"modules\/aggregator\/aggregator.css":1,"modules\/comment\/comment.css":1,"sites\/all\/modules\/contrib\/date\/date_api\/date.css":1,"modules\/field\/theme\/field.css":1,"modules\/node\/node.css":1,"modules\/search\/search.css":1,"modules\/user\/user.css":1,"sites\/all\/modules\/contrib\/workflow\/workflow_admin_ui\/workflow_admin_ui.css":1,"modules\/forum\/forum.css":1,"sites\/all\/modules\/contrib\/views\/css\/views.css":1,"sites\/all\/modules\/contrib\/ctools\/css\/ctools.css":1,"sites\/all\/modules\/contrib\/tagclouds\/tagclouds.css":1,"sites\/all\/modules\/contrib\/views_slideshow\/views_slideshow.css":1,"sites\/all\/modules\/contrib\/homebox\/includes\/tipsy\/tipsy.css":1,"sites\/all\/modules\/contrib\/commerce\/modules\/cart\/theme\/commerce_cart.theme.css":1,"sites\/all\/modules\/contrib\/views_slideshow\/contrib\/views_slideshow_cycle\/views_slideshow_cycle.css":1,"sites\/all\/themes\/enssib\/css\/styles.css":1,"sites\/all\/themes\/enssib\/css\/enssib.css":1,"sites\/all\/themes\/enssib\/css\/print.css":1}},"urlIsAjaxTrusted":{"\/offres-d-emploi":true,"\/":true},"views":{"ajax_path":"\/views\/ajax","ajaxViews":{"views_dom_id:f92469cd31adf7d758711fa42a3eef13":{"view_name":"offres_d_emploi","view_display_id":"block_2","view_args":"","view_path":"home","view_base_path":"offres-d-emploi","view_dom_id":"f92469cd31adf7d758711fa42a3eef13","pager_element":0},"views_dom_id:a63d63bdbb9ae5fb822a145ec4a1f25b":{"view_name":"actualites_news","view_display_id":"block_caroussel","view_args":"","view_path":"home","view_base_path":"actualites","view_dom_id":"a63d63bdbb9ae5fb822a145ec4a1f25b","pager_element":0}}},"viewsSlideshow":{"actualites_news-block_caroussel":{"methods":{"goToSlide":["viewsSlideshowPager","viewsSlideshowSlideCounter","viewsSlideshowCycle"],"nextSlide":["viewsSlideshowPager","viewsSlideshowSlideCounter","viewsSlideshowCycle"],"pause":["viewsSlideshowControls","viewsSlideshowCycle"],"play":["viewsSlideshowControls","viewsSlideshowCycle"],"previousSlide":["viewsSlideshowPager","viewsSlideshowSlideCounter","viewsSlideshowCycle"],"transitionBegin":["viewsSlideshowPager","viewsSlideshowSlideCounter"],"transitionEnd":[]},"paused":0}},"viewsSlideshowPager":{"actualites_news-block_caroussel":{"bottom":{"type":"viewsSlideshowPagerFields"}}},"viewsSlideshowPagerFields":{"actualites_news-block_caroussel":{"bottom":{"activatePauseOnHover":0}}},"viewsSlideshowCycle":{"#views_slideshow_cycle_main_actualites_news-block_caroussel":{"num_divs":12,"id_prefix":"#views_slideshow_cycle_main_","div_prefix":"#views_slideshow_cycle_div_","vss_id":"actualites_news-block_caroussel","effect":"scrollUp","transition_advanced":1,"timeout":5000,"speed":700,"delay":0,"sync":1,"random":0,"pause":1,"pause_on_click":0,"action_advanced":1,"start_paused":0,"remember_slide":0,"remember_slide_days":1,"pause_when_hidden":0,"pause_when_hidden_type":"full","amount_allowed_visible":"","nowrap":0,"fixed_height":1,"items_per_slide":3,"wait_for_image_load":1,"wait_for_image_load_timeout":3000,"cleartype":0,"cleartypenobg":0,"advanced_options":"{}"}},"piwik":{"trackMailto":1}});
+jQuery.extend(Drupal.settings, {"basePath":"\/","pathPrefix":"","ajaxPageState":{"theme":"enssib","theme_token":"XhojEjuKoEDBQMH40fF83wbaojQn4mOO7i5VW5B9V8c","jquery_version":"1.10","js":{"0":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/jquery\/1.10\/jquery.min.js":1,"misc\/jquery.once.js":1,"misc\/drupal.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.core.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.widget.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/external\/jquery.cookie.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/misc\/jquery.form.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.mouse.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.draggable.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.droppable.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.sortable.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.button.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.position.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.resizable.min.js":1,"sites\/all\/modules\/contrib\/jquery_update\/replace\/ui\/ui\/minified\/jquery.ui.dialog.min.js":1,"misc\/ajax.js":1,"sites\/all\/modules\/contrib\/jquery_update\/js\/jquery_update.js":1,"sites\/all\/modules\/contrib\/admin_menu\/admin_devel\/admin_devel.js":1,"sites\/all\/modules\/contrib\/button_field\/js\/button_field.ajax.js":1,"public:\/\/languages\/fr_Np55hzn09APffb7Qx6JAhdazIXdVfByTCyRDBe-F_GI.js":1,"sites\/all\/modules\/contrib\/views_slideshow\/js\/views_slideshow.js":1,"sites\/all\/modules\/contrib\/views\/js\/base.js":1,"misc\/progress.js":1,"sites\/all\/modules\/contrib\/homebox\/homebox.js":1,"sites\/all\/modules\/contrib\/homebox\/includes\/tipsy\/jquery.tipsy.js":1,"sites\/all\/libraries\/jquery.cycle\/jquery.cycle.all.min.js":1,"sites\/all\/modules\/contrib\/views_slideshow\/contrib\/views_slideshow_cycle\/js\/views_slideshow_cycle.js":1,"sites\/all\/modules\/contrib\/matomo\/matomo.js":1,"sites\/all\/modules\/contrib\/views\/js\/ajax_view.js":1,"sites\/all\/modules\/features\/enssib_emploi\/js\/emploi.js":1,"sites\/all\/modules\/features\/enssib_suivi_candidatures\/js\/webform_validator.js":1,"sites\/all\/themes\/enssib\/js\/variables.js":1,"sites\/all\/themes\/enssib\/js\/behaviours.js":1,"sites\/all\/themes\/enssib\/js\/enssib.js":1,"sites\/all\/themes\/enssib\/js\/jquery.colorbox-min.js":1,"sites\/all\/themes\/enssib\/js\/jquery.flexslider-min.js":1,"sites\/all\/themes\/enssib\/js\/spamspan.js":1},"css":{"modules\/system\/system.base.css":1,"modules\/system\/system.menus.css":1,"modules\/system\/system.messages.css":1,"modules\/system\/system.theme.css":1,"misc\/ui\/jquery.ui.button.css":1,"misc\/ui\/jquery.ui.resizable.css":1,"misc\/ui\/jquery.ui.dialog.css":1,"sites\/all\/modules\/contrib\/simplenews\/simplenews.css":1,"modules\/aggregator\/aggregator.css":1,"modules\/comment\/comment.css":1,"sites\/all\/modules\/contrib\/date\/date_api\/date.css":1,"modules\/field\/theme\/field.css":1,"modules\/node\/node.css":1,"modules\/search\/search.css":1,"modules\/user\/user.css":1,"sites\/all\/modules\/contrib\/workflow\/workflow_admin_ui\/workflow_admin_ui.css":1,"modules\/forum\/forum.css":1,"sites\/all\/modules\/contrib\/views\/css\/views.css":1,"sites\/all\/modules\/contrib\/ctools\/css\/ctools.css":1,"sites\/all\/modules\/contrib\/tagclouds\/tagclouds.css":1,"sites\/all\/modules\/contrib\/views_slideshow\/views_slideshow.css":1,"sites\/all\/modules\/contrib\/homebox\/includes\/tipsy\/tipsy.css":1,"sites\/all\/modules\/contrib\/commerce\/modules\/cart\/theme\/commerce_cart.theme.css":1,"sites\/all\/modules\/contrib\/views_slideshow\/contrib\/views_slideshow_cycle\/views_slideshow_cycle.css":1,"sites\/all\/themes\/enssib\/css\/styles.css":1,"sites\/all\/themes\/enssib\/css\/enssib.css":1,"sites\/all\/themes\/enssib\/css\/print.css":1}},"urlIsAjaxTrusted":{"\/offres-d-emploi":true,"\/":true},"views":{"ajax_path":"\/views\/ajax","ajaxViews":{"views_dom_id:f92469cd31adf7d758711fa42a3eef13":{"view_name":"offres_d_emploi","view_display_id":"block_2","view_args":"","view_path":"home","view_base_path":"offres-d-emploi","view_dom_id":"f92469cd31adf7d758711fa42a3eef13","pager_element":0},"views_dom_id:a63d63bdbb9ae5fb822a145ec4a1f25b":{"view_name":"actualites_news","view_display_id":"block_caroussel","view_args":"","view_path":"home","view_base_path":"actualites","view_dom_id":"a63d63bdbb9ae5fb822a145ec4a1f25b","pager_element":0}}},"viewsSlideshow":{"actualites_news-block_caroussel":{"methods":{"goToSlide":["viewsSlideshowPager","viewsSlideshowSlideCounter","viewsSlideshowCycle"],"nextSlide":["viewsSlideshowPager","viewsSlideshowSlideCounter","viewsSlideshowCycle"],"pause":["viewsSlideshowControls","viewsSlideshowCycle"],"play":["viewsSlideshowControls","viewsSlideshowCycle"],"previousSlide":["viewsSlideshowPager","viewsSlideshowSlideCounter","viewsSlideshowCycle"],"transitionBegin":["viewsSlideshowPager","viewsSlideshowSlideCounter"],"transitionEnd":[]},"paused":0}},"viewsSlideshowPager":{"actualites_news-block_caroussel":{"bottom":{"type":"viewsSlideshowPagerFields"}}},"viewsSlideshowPagerFields":{"actualites_news-block_caroussel":{"bottom":{"activatePauseOnHover":0}}},"viewsSlideshowCycle":{"#views_slideshow_cycle_main_actualites_news-block_caroussel":{"num_divs":12,"id_prefix":"#views_slideshow_cycle_main_","div_prefix":"#views_slideshow_cycle_div_","vss_id":"actualites_news-block_caroussel","effect":"scrollUp","transition_advanced":1,"timeout":5000,"speed":700,"delay":0,"sync":1,"random":0,"pause":1,"pause_on_click":0,"action_advanced":1,"start_paused":0,"remember_slide":0,"remember_slide_days":1,"pause_when_hidden":0,"pause_when_hidden_type":"full","amount_allowed_visible":"","nowrap":0,"fixed_height":1,"items_per_slide":3,"wait_for_image_load":1,"wait_for_image_load_timeout":3000,"cleartype":0,"cleartypenobg":0,"advanced_options":"{}"}},"matomo":{"trackMailto":1}});
//--><!]]>
</script>
</body>
diff --git a/tests/db/UpgradeDBTest.php b/tests/db/UpgradeDBTest.php
index 65895b80de7aa3e1a0267926fa654275ab942cfd..706d9e1b1ec0187364872b4ca917b8b2dbea9944 100644
--- a/tests/db/UpgradeDBTest.php
+++ b/tests/db/UpgradeDBTest.php
@@ -2271,3 +2271,13 @@ class UpgradeDB_355_Test extends UpgradeDBTestCase {
$datas['valeur']);
}
}
+
+
+
+
+class UpgradeDB_356_Test extends UpgradeDBTestCase {
+ public function prepare() {}
+
+ /** @test */
+ public function placeholderForPiwikToMatomoMigrationPatch() {}
+}
\ No newline at end of file
diff --git a/tests/library/Class/WebService/WebAnalyticsClientTest.php b/tests/library/Class/WebService/WebAnalyticsClientTest.php
index ccfb737a6cdb312cf56c5d1aeb60322f54f8173f..47feb1c3962e4b1eb23ea0679e567f7a21dba94e 100644
--- a/tests/library/Class/WebService/WebAnalyticsClientTest.php
+++ b/tests/library/Class/WebService/WebAnalyticsClientTest.php
@@ -144,24 +144,24 @@ class Class_WebService_WebAnalyticsClientInstanciationWithWrongGoogleAnalyticsAn
-class Class_WebService_WebAnalyticsClientInstanciationWithVarPiwikAndNoDomainNameTest extends Storm_Test_ModelTestCase {
+class Class_WebService_WebAnalyticsClientInstanciationWithVarMatomoAndNoDomainNameTest extends Storm_Test_ModelTestCase {
public function setUp() {
parent::setUp();
Class_AdminVar::newInstanceWithId('JS_STAT', ['valeur' => "<script type=\"text/javascript\">
var _paq = _paq || [];
- _paq.push([\"setDomains\", [\"*.sandbox.pergame.net/piwik/piwik.php\"]]);
+ _paq.push([\"setDomains\", [\"*.sandbox.pergame.net/matomo/matomo.php\"]]);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
- var u=\"//sandbox.pergame.net/piwik/\";
- _paq.push(['setTrackerUrl', u+'piwik.php']);
+ var u=\"//sandbox.pergame.net/matomo/\";
+ _paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', 8]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
- g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+ g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
</script>
-<noscript><p><img src=\"//sandbox.pergame.net/piwik/piwik.php?idsite=1\" style=\"border:0;\" alt=\"\" /></p></noscript>"]);
+<noscript><p><img src=\"//sandbox.pergame.net/matomo/matomo.php?idsite=1\" style=\"border:0;\" alt=\"\" /></p></noscript>"]);
$this->_web_analytics_client = new Class_WebService_Analytics_Client();
}
@@ -174,8 +174,8 @@ class Class_WebService_WebAnalyticsClientInstanciationWithVarPiwikAndNoDomainNam
/** @test */
- public function trackerUrlShouldBeSandboxPiwik() {
- $this->assertEquals('//sandbox.pergame.net/piwik/piwik.php',
+ public function trackerUrlShouldBeSandboxMatomo() {
+ $this->assertEquals('//sandbox.pergame.net/matomo/piwik.php',
$this->_web_analytics_client->getTrackerUrl());
}
}
diff --git a/tests/scenarios/piwik/PiwikTest.php b/tests/scenarios/matomo/MatomoTest.php
similarity index 76%
rename from tests/scenarios/piwik/PiwikTest.php
rename to tests/scenarios/matomo/MatomoTest.php
index 358bdbff8c8b9e19b0b3c1840e2a338692a5b97f..5d274039e1b626b0626fa8600ac1eb40431c6063 100644
--- a/tests/scenarios/piwik/PiwikTest.php
+++ b/tests/scenarios/matomo/MatomoTest.php
@@ -18,11 +18,11 @@
* along with BOKEH; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-class PiwikFixtures {
+class MatomoFixtures {
use Storm_Test_THelpers;
- public function enablePiwik() {
+ public function enableMatomo() {
$this->authToken();
$this->jsStat();
}
@@ -30,7 +30,7 @@ class PiwikFixtures {
public function authToken() {
$this->fixture('Class_AdminVar',
- ['id' => 'PIWIK_AUTH_TOKEN',
+ ['id' => 'MATOMO_AUTH_TOKEN',
'valeur' => '789456123456789']);
}
@@ -40,25 +40,25 @@ class PiwikFixtures {
['id' => 'JS_STAT',
'valeur' => "<script type=\"text/javascript\">
var _paq = _paq || [];
- _paq.push([\"setDomains\", [\"*.sandbox.pergame.net/piwik/piwik.php\"]]);
+ _paq.push([\"setDomains\", [\"*.sandbox.pergame.net/matomo/matomo.php\"]]);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
- var u=\"//sandbox.pergame.net/piwik/\";
- _paq.push(['setTrackerUrl', u+'piwik.php']);
+ var u=\"//sandbox.pergame.net/matomo/\";
+ _paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', '8']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
- g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+ g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
</script>
-<noscript><p><img src=\"//sandbox.pergame.net/piwik/piwik.php?idsite=1\" style=\"border:0;\" alt=\"\" /></p></noscript>"]);
+<noscript><p><img src=\"//sandbox.pergame.net/matomo/matomo.php?idsite=1\" style=\"border:0;\" alt=\"\" /></p></noscript>"]);
}
public function customJsStat() {
$this->fixture('Class_AdminVar',
['id' => 'JS_STAT',
- 'valeur' => "<!-- Piwik -->
+ 'valeur' => "<!-- Matomo -->
<script type=\"text/javascript\">
try {
var url = window.location.href ;
@@ -123,26 +123,26 @@ if ( (url.match ( new RegExp ( \"/recherche/\" ) )) && ($('.resultats_page').len
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
- var u=((\"https:\" == document.location.protocol) ? \"https\" : \"http\") + \"://piwik.mabib.fr/\";
- _paq.push(['setTrackerUrl', u+'piwik.php']);
+ var u=((\"https:\" == document.location.protocol) ? \"https\" : \"http\") + \"://matomo.mabib.fr/\";
+ _paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', 13]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
- g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+ g.defer=true; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
} catch ( err ) {}
</script>
-<noscript><p><img src=\"http://piwik.mabib.fr/piwik.php?idsite=13\" style=\"border:0;\" alt=\"\" /></p></noscript>
-<!-- End Piwik Code -->"]);
+<noscript><p><img src=\"http://matomo.mabib.fr/matomo.php?idsite=13\" style=\"border:0;\" alt=\"\" /></p></noscript>
+<!-- End Matomo Code -->"]);
}
}
-class PiwikJsStatConfigurationParsingTest extends ModelTestCase {
+class MatomoJsStatConfigurationParsingTest extends ModelTestCase {
public function setUp() {
parent::setUp();
- (new PiwikFixtures())->jsStat();
+ (new MatomoFixtures())->jsStat();
$this->_web_analytics_client = new Class_WebService_Analytics_Client();
}
@@ -154,8 +154,8 @@ class PiwikJsStatConfigurationParsingTest extends ModelTestCase {
/** @test */
- public function trackerUrlShouldBeSandboxPiwik() {
- $this->assertEquals('//sandbox.pergame.net/piwik/piwik.php',
+ public function trackerUrlShouldBeSandboxMatomo() {
+ $this->assertEquals('//sandbox.pergame.net/matomo/piwik.php',
$this->_web_analytics_client->getTrackerUrl());
}
}
@@ -163,11 +163,11 @@ class PiwikJsStatConfigurationParsingTest extends ModelTestCase {
-class PiwikAlternateJsStatConfigurationParsingTest extends ModelTestCase {
+class MatomoAlternateJsStatConfigurationParsingTest extends ModelTestCase {
public function setUp() {
parent::setUp();
- (new PiwikFixtures())->customJsStat();
+ (new MatomoFixtures())->customJsStat();
$this->_web_analytics_client = new Class_WebService_Analytics_Client();
}
@@ -179,8 +179,8 @@ class PiwikAlternateJsStatConfigurationParsingTest extends ModelTestCase {
/** @test */
- public function trackerUrlShouldBeMaBibPiwik() {
- $this->assertEquals('//piwik.mabib.fr/piwik.php',
+ public function trackerUrlShouldBeMaBibMatomo() {
+ $this->assertEquals('//matomo.mabib.fr/piwik.php',
$this->_web_analytics_client->getTrackerUrl());
}
}
@@ -188,7 +188,7 @@ class PiwikAlternateJsStatConfigurationParsingTest extends ModelTestCase {
-abstract class PiwikLeftMenuTestCase extends ViewHelperTestCase {
+abstract class MatomoLeftMenuTestCase extends ViewHelperTestCase {
protected
$_storm_default_to_volatile = true,
$html;
@@ -215,7 +215,7 @@ abstract class PiwikLeftMenuTestCase extends ViewHelperTestCase {
-class PiwikAdminLeftMenuWithOutPiwikTokenTest extends PiwikLeftMenuTestCase {
+class MatomoAdminLeftMenuWithOutMatomoTokenTest extends MatomoLeftMenuTestCase {
public function setUp() {
parent::setUp();
@@ -224,43 +224,43 @@ class PiwikAdminLeftMenuWithOutPiwikTokenTest extends PiwikLeftMenuTestCase {
/** @test */
- public function piwikStatsLinkShouldNotBePresent() {
- $this->assertNotXPath($this->html, '//a[contains(@href, "admin/stat/piwik")]');
+ public function matomoStatsLinkShouldNotBePresent() {
+ $this->assertNotXPath($this->html, '//a[contains(@href, "admin/stat/matomo")]');
}
}
-class PiwikAdminLeftMenuWithPiwikTokenTest extends PiwikLeftMenuTestCase {
+class MatomoAdminLeftMenuWithMatomoTokenTest extends MatomoLeftMenuTestCase {
public function setUp() {
parent::setUp();
- (new PiwikFixtures())->enablePiwik();
+ (new MatomoFixtures())->enableMatomo();
$this->html = $this->helper->Admin_ContentNav();
}
/** @test */
- public function piwikStatsLinkShouldBePresent() {
- $this->assertXPathContentContains($this->html, '//a[contains(@href, "admin/stat/piwik")]', 'Piwik');
+ public function matomoStatsLinkShouldBePresent() {
+ $this->assertXPathContentContains($this->html, '//a[contains(@href, "admin/stat/matomo")]', 'Matomo');
}
/** @test */
- public function piwikIcoShouldBePresent() {
- $this->assertXPath($this->html, '//img[contains(@src, "/icons/menu/piwik_24.png")]');
+ public function matomoIcoShouldBePresent() {
+ $this->assertXPath($this->html, '//img[contains(@src, "/icons/menu/matomo_24.png")]');
}
}
-class PiwikStatControllerPiwikActionTest extends Admin_AbstractControllerTestCase {
+class MatomoStatControllerMatomoActionTest extends Admin_AbstractControllerTestCase {
public function setUp() {
parent::setUp();
- (new PiwikFixtures())->enablePiwik();
+ (new MatomoFixtures())->enableMatomo();
- $this->dispatch('/admin/stat/piwik', true);
+ $this->dispatch('/admin/stat/matomo', true);
}
@@ -272,7 +272,7 @@ class PiwikStatControllerPiwikActionTest extends Admin_AbstractControllerTestCas
/** @test */
public function pageShouldContainsDashboardFrame() {
- $this->assertXPath('//iframe[@src="//sandbox.pergame.net/piwik/index.php?module=Widgetize&action=iframe&moduleToWidgetize=Dashboard&actionToWidgetize=index&period=week&date=today&idSite=8&token_auth=789456123456789"]', $this->_response->getBody());
+ $this->assertXPath('//iframe[@src="//sandbox.pergame.net/matomo/index.php?module=Widgetize&action=iframe&moduleToWidgetize=Dashboard&actionToWidgetize=index&period=week&date=today&idSite=8&token_auth=789456123456789"]', $this->_response->getBody());
}
}
@@ -281,14 +281,14 @@ class PiwikStatControllerPiwikActionTest extends Admin_AbstractControllerTestCas
/**
* @see http://forge.afi-sa.fr/issues/52810
*/
-class PiwikStatControllerPiwikActionWithBothPiwikAndGoogleAnalyticsTest
+class MatomoStatControllerMatomoActionWithBothMatomoAndGoogleAnalyticsTest
extends Admin_AbstractControllerTestCase {
protected $_storm_default_to_volatile = true;
public function setUp() {
parent::setUp();
- (new PiwikFixtures())->enablePiwik();
+ (new MatomoFixtures())->enableMatomo();
$this->fixture('Class_AdminVar',
['id' => 'JS_STAT',
'valeur' => '<script type="text/javascript">
@@ -298,16 +298,16 @@ var _paq = _paq || [];
_paq.push([\'trackPageView\']);
_paq.push([\'enableLinkTracking\']);
(function() {
- var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.myserver.com/";
- _paq.push([\'setTrackerUrl\', u+\'piwik.php\']);
+ var u=(("https:" == document.location.protocol) ? "https" : "http") + "://matomo.myserver.com/";
+ _paq.push([\'setTrackerUrl\', u+\'matomo.php\']);
_paq.push([\'setSiteId\', 9999]);
var d=document, g=d.createElement(\'script\'), s=d.getElementsByTagName(\'script\')[0]; g.type=\'text/javascript\';
- g.defer=true; g.async=true; g.src=u+\'piwik.js\'; s.parentNode.insertBefore(g,s);
+ g.defer=true; g.async=true; g.src=u+\'matomo.js\'; s.parentNode.insertBefore(g,s);
})();
} catch ( err ) {}
</script>
-<noscript><p><img src="http://piwik.myserver.com/piwik.php?idsite=9999" style="border:0;" alt="" /></p></noscript>
-<!-- End Piwik Code -->
+<noscript><p><img src="http://matomo.myserver.com/matomo.php?idsite=9999" style="border:0;" alt="" /></p></noscript>
+<!-- End Matomo Code -->
<script>
(function(i,s,o,g,r,a,m){i[\'GoogleAnalyticsObject\']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -320,7 +320,7 @@ _paq.push([\'enableLinkTracking\']);
</script>']);
- $this->dispatch('/admin/stat/piwik', true);
+ $this->dispatch('/admin/stat/matomo', true);
}