X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=piwik%2Fpiwik.php;h=9c0708c595942393fe03d62a6705e75969590bbf;hb=86e24c747e8f8534ee8e5805f6e5e73c400b88b6;hp=ad89d0f3e3e18645bd7af1bb20e70cb267e1edf5;hpb=2e33d99f187ce10cab56c68841d3a768c41b4699;p=friendica-addons.git diff --git a/piwik/piwik.php b/piwik/piwik.php index ad89d0f3..9c0708c5 100644 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -1,7 +1,7 @@ * Author: Klaus Weidenbach @@ -31,48 +31,41 @@ * setting. */ -use Friendica\Core\Config; +use Friendica\App; 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(App $a, ConfigFileLoader $loader) { $a->getConfigCache()->load($loader->loadAddonConfig('piwik')); } -function piwik_analytics($a,&$b) { - +function piwik_analytics(App $a, array &$b) +{ /* * 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 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 +84,30 @@ function piwik_analytics($a,&$b) { */ if ($optout) { $b .= "