Merge pull request #897 from tobiasd/20191004-gnot

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

diff --git a/piwik/piwik.php b/piwik/piwik.php
index b8dd8731deac0e79f3d0dad7533d6c1afd47b25b..cd41ad7b1040124e23e93237e03bc6a281951439 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
@@ -16,7 +16,7 @@
  *
  *   Configuration:
  *     Use the administration panel to configure the Piwik tracking addon, or
- *     in case you don't use this add the following lines to your config/addon.ini.php
+ *     in case you don't use this add the following lines to your config/addon.config.php
  *     file:
  *
  *     [piwik]
@@ -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\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.ini.php');
+       $a->getConfigCache()->load($loader->loadAddonConfig('piwik'));
 }
 
 function piwik_analytics($a,&$b) {
@@ -66,7 +68,7 @@ function piwik_analytics($a,&$b) {
        $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/piwik/piwik.css' . '" media="all" />';
 
        /*
-        *   Get the configuration variables from the config/addon.ini.php file.
+        *   Get the configuration variables from the config/addon.config.php file.
         */
        $baseurl = Config::get('piwik', 'baseurl');
        $siteid  = Config::get('piwik', 'siteid');
@@ -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,17 +103,17 @@ 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' ), ''],
        ]);
 }
 function piwik_addon_admin_post (&$a) {
-       $url = ((x($_POST, 'baseurl')) ? Strings::removeTags(trim($_POST['baseurl'])) : '');
-       $id = ((x($_POST, 'siteid')) ? trim($_POST['siteid']) : '');
-       $optout = ((x($_POST, 'optout')) ? trim($_POST['optout']) : '');
-       $async = ((x($_POST, 'async')) ? trim($_POST['async']) : '');
+       $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);