X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=piwik%2Fpiwik.php;h=cd41ad7b1040124e23e93237e03bc6a281951439;hb=f573907bd210bbf19be9ad938d75394ba609ad70;hp=b8dd8731deac0e79f3d0dad7533d6c1afd47b25b;hpb=1ac32c622e9a89c90642d0529f6103e96514b8f0;p=friendica-addons.git diff --git a/piwik/piwik.php b/piwik/piwik.php index b8dd8731..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/addon.ini.php + * in case you don't use this add the following lines to your config/addon.config.php * file: * * [piwik] @@ -30,30 +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::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::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) { @@ -66,7 +68,7 @@ function piwik_analytics($a,&$b) { $a->page['htmlhead'] .= ''; /* - * Get the configuration variables from the config/addon.ini.php file. + * Get the configuration variables from the config/addon.config.php file. */ $baseurl = Config::get('piwik', 'baseurl'); $siteid = Config::get('piwik', 'siteid'); @@ -90,10 +92,10 @@ function piwik_analytics($a,&$b) { */ if ($optout) { $b .= "