*
* 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]
* 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\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, Config\ConfigCacheLoader $loader)
{
- $a->loadConfigFile(__DIR__. '/config/piwik.ini.php');
+ $a->getConfig()->loadConfigArray($loader->loadConfigFile('piwik'));
}
function piwik_analytics($a,&$b) {
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/piwik/piwik.css' . '" media="all" />';
/*
- * 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');
]);
}
function piwik_addon_admin_post (&$a) {
- $url = ((x($_POST, 'baseurl')) ? notags(trim($_POST['baseurl'])) : '');
- $id = ((x($_POST, 'siteid')) ? trim($_POST['siteid']) : '');
- $optout = ((x($_POST, 'optout')) ? trim($_POST['optout']) : '');
- $async = ((x($_POST, 'async')) ? trim($_POST['async']) : '');
+ $url = (!empty($_POST['baseurl']) ? Strings::escapeTags(trim($_POST['baseurl'])) : '');
+ $id = (!empty($_POST['siteid']) ? trim($_POST['siteid']) : '');
+ $optout = (!empty($_POST['optout']) ? trim($_POST['optout']) : '');
+ $async = (!empty($_POST['async']) ? trim($_POST['async']) : '');
Config::set('piwik', 'baseurl', $url);
Config::set('piwik', 'siteid', $id);
Config::set('piwik', 'optout', $optout);