X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=piwik%2Fpiwik.php;h=1487f370e363d0dd89b3ee7dfd98370725a3f031;hb=101d3603245b17bd2e6d4880e94bb27887257238;hp=3e3144fbcdd2cd91bb7f85ce341544aa2fdde63c;hpb=d836593a3b54a30f961fc17c4e48c622f1e0b8e7;p=friendica-addons.git

diff --git a/piwik/piwik.php b/piwik/piwik.php
index 3e3144fb..1487f370 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Name: Piwik Analytics
- * Description: Piwik Analytics Addon for Friendica
+ * Name: Matomo / Piwik Analytics
+ * Description: Matomo / Piwik Analytics Addon for Friendica
  * Version: 1.3
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  * Author: Klaus Weidenbach
@@ -30,30 +30,32 @@
  *     about http/https but beware to put the trailing / at the end of your
  *     setting.
  */
-use Friendica\Core\Addon;
+
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\Util\Config\ConfigFileLoader;
 use Friendica\Util\Strings;
 
 function piwik_install() {
-	Addon::registerHook('load_config', 'addon/piwik/piwik.php', 'piwik_load_config');
-	Addon::registerHook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
+	Hook::register('load_config', 'addon/piwik/piwik.php', 'piwik_load_config');
+	Hook::register('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
 
 	Logger::log("installed piwik addon");
 }
 
 function piwik_uninstall() {
-	Addon::unregisterHook('load_config', 'addon/piwik/piwik.php', 'piwik_load_config');
-	Addon::unregisterHook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
+	Hook::unregister('load_config', 'addon/piwik/piwik.php', 'piwik_load_config');
+	Hook::unregister('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
 
 	Logger::log("uninstalled piwik addon");
 }
 
-function piwik_load_config(\Friendica\App $a)
+function piwik_load_config(\Friendica\App $a, ConfigFileLoader $loader)
 {
-	$a->loadConfigFile(__DIR__ . '/config/piwik.config.php');
+	$a->getConfigCache()->load($loader->loadAddonConfig('piwik'));
 }
 
 function piwik_analytics($a,&$b) {
@@ -90,10 +92,10 @@ function piwik_analytics($a,&$b) {
 	 */
 	if ($optout) {
 		$b .= "<div id='piwik-optout-link'>";
-		$b .= L10n::t("This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool.");
+		$b .= L10n::t("This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool.");
 		$b .= " ";
 		$the_url =  "http://".$baseurl ."index.php?module=CoreAdminHome&action=optOut";
-		$b .= L10n::t("If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out).", $the_url);
+		$b .= L10n::t("If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).", $the_url);
 		$b .= "</div>";
 	}
 }
@@ -101,7 +103,7 @@ function piwik_addon_admin (&$a, &$o) {
 	$t = Renderer::getMarkupTemplate( "admin.tpl", "addon/piwik/" );
 	$o = Renderer::replaceMacros( $t, [
 		'$submit' => L10n::t('Save Settings'),
-		'$piwikbaseurl' => ['baseurl', L10n::t('Piwik Base URL'), Config::get('piwik','baseurl' ), L10n::t('Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)')],
+		'$piwikbaseurl' => ['baseurl', L10n::t('Matomo (Piwik) Base URL'), Config::get('piwik','baseurl' ), L10n::t('Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)')],
 		'$siteid' => ['siteid', L10n::t('Site ID'), Config::get('piwik','siteid' ), ''],
 		'$optout' => ['optout', L10n::t('Show opt-out cookie link?'), Config::get('piwik','optout' ), ''],
 		'$async' => ['async', L10n::t('Asynchronous tracking'), Config::get('piwik','async' ), ''],