X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=piwik%2Fpiwik.php;h=d461cfd4fdade81aa494f4d4b3306fa4f1ba88c4;hb=b062142800482af361771001f532b61eb2f3b3ca;hp=d96eba09f6a2fa213c40ae38662c0604212c1b31;hpb=44d7a0b617acfc6f4dde38d856adafab419701a9;p=friendica-addons.git diff --git a/piwik/piwik.php b/piwik/piwik.php index d96eba09..d461cfd4 100644 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -1,7 +1,7 @@ * Author: Klaus Weidenbach @@ -30,30 +30,24 @@ * 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; + +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() { - 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'); - - 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.config.php'); + $a->getConfigCache()->load($loader->loadAddonConfig('piwik')); } function piwik_analytics($a,&$b) { @@ -63,15 +57,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'] .= ''; + 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. @@ -90,31 +84,30 @@ function piwik_analytics($a,&$b) { */ if ($optout) { $b .= "