X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=piwik%2Fpiwik.php;h=cd41ad7b1040124e23e93237e03bc6a281951439;hb=f573907bd210bbf19be9ad938d75394ba609ad70;hp=f001b27c27967ef8a7c621405eff6a9cc2a6f50f;hpb=e20f30888f441dcdf8d84950b27e62bc0f587eb2;p=friendica-addons.git diff --git a/piwik/piwik.php b/piwik/piwik.php index f001b27c..cd41ad7b 100644 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -1,7 +1,7 @@ * 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/local.ini.php + * in case you don't use this add the following lines to your config/addon.config.php * file: * * [piwik] @@ -30,27 +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("installed piwik addon"); + 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("uninstalled piwik addon"); + 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) { @@ -60,10 +65,10 @@ function piwik_analytics($a,&$b) { * associated CSS file. We just have to tell Friendica to get it * into the page header. */ - $a->page['htmlhead'] .= ''; + $a->page['htmlhead'] .= ''; /* - * Get the configuration variables from the config/local.ini.php file. + * Get the configuration variables from the config/addon.config.php file. */ $baseurl = Config::get('piwik', 'baseurl'); $siteid = Config::get('piwik', 'siteid'); @@ -87,28 +92,28 @@ function piwik_analytics($a,&$b) { */ if ($optout) { $b .= "