Supplement emoji

[friendica-addons.git] / piwik / piwik.php

diff --git a/piwik/piwik.php b/piwik/piwik.php
index ad89d0f3e3e18645bd7af1bb20e70cb267e1edf5..8c4f91df556a826757b6cd6527cec9ec5bfaae26 100644 (file)
--- 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
@@ -31,28 +31,20 @@
  *     setting.
  */
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Util\Strings;
+use Friendica\DI;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 
 function piwik_install() {
        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");
+       Logger::notice("installed piwik addon");
 }
 
-function piwik_uninstall() {
-       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, Config\Cache\ConfigCacheLoader $loader)
+function piwik_load_config(\Friendica\App $a, ConfigFileLoader $loader)
 {
        $a->getConfigCache()->load($loader->loadAddonConfig('piwik'));
 }
@@ -64,15 +56,15 @@ function piwik_analytics($a,&$b) {
         *   associated CSS file. We just have to tell Friendica to get it
         *   into the page header.
         */
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/piwik/piwik.css' . '" media="all" />';
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/piwik/piwik.css' . '" media="all" />';
 
        /*
         *   Get the configuration variables from the config/addon.config.php file.
         */
-       $baseurl = Config::get('piwik', 'baseurl');
-       $siteid  = Config::get('piwik', 'siteid');
-       $optout  = Config::get('piwik', 'optout');
-       $async   = Config::get('piwik', 'async');
+       $baseurl = DI::config()->get('piwik', 'baseurl');
+       $siteid  = DI::config()->get('piwik', 'siteid');
+       $optout  = DI::config()->get('piwik', 'optout');
+       $async   = DI::config()->get('piwik', 'async');
 
        /*
         *   Add the Piwik tracking code for the site.
@@ -91,31 +83,30 @@ 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 .= DI::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 .= DI::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>";
        }
 }
 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)')],
-               '$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' ), ''],
+               '$submit' => DI::l10n()->t('Save Settings'),
+               '$piwikbaseurl' => ['baseurl', DI::l10n()->t('Matomo (Piwik) Base URL'), DI::config()->get('piwik','baseurl' ), DI::l10n()->t('Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)')],
+               '$siteid' => ['siteid', DI::l10n()->t('Site ID'), DI::config()->get('piwik','siteid' ), ''],
+               '$optout' => ['optout', DI::l10n()->t('Show opt-out cookie link?'), DI::config()->get('piwik','optout' ), ''],
+               '$async' => ['async', DI::l10n()->t('Asynchronous tracking'), DI::config()->get('piwik','async' ), ''],
        ]);
 }
 function piwik_addon_admin_post (&$a) {
-       $url = (!empty($_POST['baseurl']) ? Strings::escapeTags(trim($_POST['baseurl'])) : '');
-       $id = (!empty($_POST['siteid']) ? trim($_POST['siteid']) : '');
-       $optout = (!empty($_POST['optout']) ? trim($_POST['optout']) : '');
-       $async = (!empty($_POST['async']) ? trim($_POST['async']) : '');
-       Config::set('piwik', 'baseurl', $url);
-       Config::set('piwik', 'siteid', $id);
-       Config::set('piwik', 'optout', $optout);
-       Config::set('piwik', 'async', $async);
-       info(L10n::t('Settings updated.'). EOL);
+       $url = trim($_POST['baseurl'] ?? '');
+       $id = trim($_POST['siteid'] ?? '');
+       $optout = trim($_POST['optout'] ?? '');
+       $async = trim($_POST['async'] ?? '');
+       DI::config()->set('piwik', 'baseurl', $url);
+       DI::config()->set('piwik', 'siteid', $id);
+       DI::config()->set('piwik', 'optout', $optout);
+       DI::config()->set('piwik', 'async', $async);
 }