Merge branch '3.6-rc'

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

diff --git a/piwik/piwik.php b/piwik/piwik.php
index 279c82e2ab243b4650b6f43de91bc2e9de4f836b..213125d2779879015859745306440bd438c239aa 100644 (file)
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -1,13 +1,13 @@
 <?php
 /**
  * Name: Piwik Analytics
- * Description: Piwik Analytics Plugin for Friendica
+ * Description: Piwik Analytics Addon for Friendica
  * Version: 1.3
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  * Author: Klaus Weidenbach
  */
 
-/*   Piwik Analytics Plugin for Friendica
+/*   Piwik Analytics Addon for Friendica
  *
  *   Author: Tobias Diekershoff
  *           tobias.diekershoff@gmx.net
@@ -29,23 +29,26 @@
  *     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\L10n;
 
 function piwik_install() {
-       register_hook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
+       Addon::registerHook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
 
-       logger("installed piwik plugin");
+       logger("installed piwik addon");
 }
 
 function piwik_uninstall() {
-       unregister_hook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
+       Addon::unregisterHook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
 
-       logger("uninstalled piwik plugin");
+       logger("uninstalled piwik addon");
 }
 
 function piwik_analytics($a,&$b) {
 
        /*
-        *   styling of every HTML block added by this plugin is done in the
+        *   styling of every HTML block added by this addon is done in the
         *   associated CSS file. We just have to tell Friendica to get it
         *   into the page header.
         */
@@ -76,31 +79,31 @@ function piwik_analytics($a,&$b) {
         */
        if ($optout) {
                $b .= "<div id='piwik-optout-link'>";
-               $b .= 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.piwik.org'>Piwik</a> analytics tool.");
                $b .= " ";
                $the_url =  "http://".$baseurl ."index.php?module=CoreAdminHome&action=optOut";
-               $b .= sprintf(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 Piwik from tracking further visits of the site</a> (opt-out).", $the_url);
                $b .= "</div>";
        }
 }
-function piwik_plugin_admin (&$a, &$o) {
+function piwik_addon_admin (&$a, &$o) {
        $t = get_markup_template( "admin.tpl", "addon/piwik/" );
-       $o = replace_macros( $t, array(
-               '$submit' => t('Save Settings'),
-               '$piwikbaseurl' => array('baseurl', t('Piwik Base URL'), get_config('piwik','baseurl' ), t('Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)')),
-               '$siteid' => array('siteid', t('Site ID'), get_config('piwik','siteid' ), ''),
-               '$optout' => array('optout', t('Show opt-out cookie link?'), get_config('piwik','optout' ), ''),
-               '$async' => array('async', t('Asynchronous tracking'), get_config('piwik','async' ), ''),
-       ));
+       $o = replace_macros( $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' ), ''],
+       ]);
 }
-function piwik_plugin_admin_post (&$a) {
+function piwik_addon_admin_post (&$a) {
        $url = ((x($_POST, 'baseurl')) ? notags(trim($_POST['baseurl'])) : '');
        $id = ((x($_POST, 'siteid')) ? trim($_POST['siteid']) : '');
        $optout = ((x($_POST, 'optout')) ? trim($_POST['optout']) : '');
        $async = ((x($_POST, 'async')) ? trim($_POST['async']) : '');
-       set_config('piwik', 'baseurl', $url);
-       set_config('piwik', 'siteid', $id);
-       set_config('piwik', 'optout', $optout);
-       set_config('piwik', 'async', $async);
-       info( t('Settings updated.'). EOL);
+       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);
 }