X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=piwik%2Fpiwik.php;h=fd6d5fc9bab3a2d949d9cfafc94872b74e0e0ea1;hb=30b9f73f5e2392d553909bc914990cbb4871bd48;hp=b161382acd2e9a57c42ee04df2b497653ef9fbba;hpb=ce2af45897ea3263c1973802b9bf592ccb7f73e9;p=friendica-addons.git diff --git a/piwik/piwik.php b/piwik/piwik.php index b161382a..fd6d5fc9 100644 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -1,7 +1,7 @@ * Author: Klaus Weidenbach @@ -16,69 +16,75 @@ * * 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/piwik.config.php * file: * - * [piwik] - * baseurl = example.com/piwik/ - * sideid = 1 - * optout = true ;set to false to disable - * async = false ;set to true to enable + * return [ + * 'piwik' => [ + * 'baseurl' => '', + * 'sideid' => '', + * 'optout' => true, + * 'async' => false, + * 'shortendpoint' => false, + * ], + * ]; * * 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 * 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; -function piwik_install() { - Addon::registerHook('load_config', 'addon/piwik/piwik.php', 'piwik_load_config'); - Addon::registerHook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics'); - - logger("installed piwik addon"); -} +use Friendica\App; +use Friendica\Core\Hook; +use Friendica\Core\Logger; +use Friendica\Core\Renderer; +use Friendica\DI; +use Friendica\Core\Config\Util\ConfigFileManager; -function piwik_uninstall() { - Addon::unregisterHook('load_config', 'addon/piwik/piwik.php', 'piwik_load_config'); - Addon::unregisterHook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics'); +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("uninstalled piwik addon"); + Logger::notice("installed piwik addon"); } -function piwik_load_config(\Friendica\App $a) +function piwik_load_config(ConfigFileManager $loader) { - $a->loadConfigFile(__DIR__. '/config/piwik.ini.php'); + DI::app()->getConfigCache()->load($loader->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); } -function piwik_analytics($a,&$b) { - +function piwik_analytics(string &$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()->registerStylesheet('addon/piwik/piwik.css', 'all'); /* - * Get the configuration variables from the config/addon.ini.php file. + * Get the configuration values. */ - $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'); + $shortendpoint = DI::config()->get('piwik', 'shortendpoint'); /* * Add the Piwik tracking code for the site. * If async is set to true use asynchronous tracking */ + + $scriptAsyncValue = $async ? 'true' : 'false'; + $scriptPhpEndpoint = $shortendpoint ? 'js/' : 'piwik.php'; + $scriptJsEndpoint = $shortendpoint ? 'js/' : 'piwik.js'; + + $b .= " \r\n"; + if ($async) { - $b .= " \r\n"; - $b .= "