X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=piwik%2Fpiwik.php;h=d461cfd4fdade81aa494f4d4b3306fa4f1ba88c4;hb=b062142800482af361771001f532b61eb2f3b3ca;hp=7a1cb5813776a001100e333a31122f2db2f1f42b;hpb=6243e55e526ae602d1ebffff8d8201d15c70a2e4;p=friendica-addons.git diff --git a/piwik/piwik.php b/piwik/piwik.php old mode 100755 new mode 100644 index 7a1cb581..d461cfd4 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -1,13 +1,13 @@ * Author: Klaus Weidenbach */ -/* Piwik Analytics Plugin for Friendica +/* Piwik Analytics Addon for Friendica * * Author: Tobias Diekershoff * tobias.diekershoff@gmx.net @@ -16,13 +16,14 @@ * * 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 .htconfig.php + * in case you don't use this add the following lines to your config/addon.config.php * file: * - * $a->config['piwik']['baseurl'] = 'www.example.com/piwik/'; - * $a->config['piwik']['siteid'] = '1'; - * $a->config['piwik']['optout'] = true; // set to false to disable - * $a->config['piwik']['async'] = false; // set to true to enable + * [piwik] + * baseurl = example.com/piwik/ + * sideid = 1 + * optout = true ;set to false to disable + * async = false ;set to true to enable * * Change the siteid to the ID that the Piwik tracker for your Friendica * installation has. Alter the baseurl to fit your needs, don't care @@ -30,34 +31,41 @@ * setting. */ +use Friendica\Core\Hook; +use Friendica\Core\Logger; +use Friendica\Core\Renderer; +use Friendica\DI; +use Friendica\Util\ConfigFileLoader; +use Friendica\Util\Strings; + function piwik_install() { - register_hook('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("installed piwik plugin"); + Logger::log("installed piwik addon"); } -function piwik_uninstall() { - unregister_hook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics'); - - logger("uninstalled piwik plugin"); +function piwik_load_config(\Friendica\App $a, ConfigFileLoader $loader) +{ + $a->getConfigCache()->load($loader->loadAddonConfig('piwik')); } 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. */ - $a->page['htmlhead'] .= ''; + DI::page()['htmlhead'] .= ''; /* - * Get the configuration variables from the .htconfig file. + * Get the configuration variables from the config/addon.config.php file. */ - $baseurl = get_config('piwik','baseurl'); - $siteid = get_config('piwik','siteid'); - $optout = get_config('piwik','optout'); - $async = get_config('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. @@ -76,31 +84,30 @@ function piwik_analytics($a,&$b) { */ if ($optout) { $b .= "