X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=piwik%2Fpiwik.php;h=6dba45a347c1466215b1ed6a91be4941869b0284;hb=86b2d830a5da62f90c22b5d3f15921a60de25f37;hp=9e43cd5f184d31b1144cc67a824a3a3d8ba6b338;hpb=7aa076074252cac1a7e6fa0bc5e667e1dfbc2e6c;p=friendica-addons.git
diff --git a/piwik/piwik.php b/piwik/piwik.php
index 9e43cd5f..6dba45a3 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -1,7 +1,7 @@
* Author: Klaus Weidenbach
@@ -31,11 +31,11 @@
* setting.
*/
-use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
+use Friendica\DI;
+use Friendica\Util\ConfigFileLoader;
use Friendica\Util\Strings;
function piwik_install() {
@@ -52,9 +52,9 @@ function piwik_uninstall() {
Logger::log("uninstalled piwik addon");
}
-function piwik_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader)
+function piwik_load_config(\Friendica\App $a, ConfigFileLoader $loader)
{
- $a->getConfig()->loadConfigArray($loader->loadAddonConfig('piwik'));
+ $a->getConfigCache()->load($loader->loadAddonConfig('piwik'));
}
function piwik_analytics($a,&$b) {
@@ -64,15 +64,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.
@@ -91,21 +91,21 @@ function piwik_analytics($a,&$b) {
*/
if ($optout) {
$b .= "
";
}
}
function piwik_addon_admin (&$a, &$o) {
$t = Renderer::getMarkupTemplate( "admin.tpl", "addon/piwik/" );
$o = Renderer::replaceMacros( $t, [
- '$submit' => L10n::t('Save Settings'),
- '$piwikbaseurl' => ['baseurl', L10n::t('Piwik Base URL'), Config::get('piwik','baseurl' ), L10n::t('Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)')],
- '$siteid' => ['siteid', L10n::t('Site ID'), Config::get('piwik','siteid' ), ''],
- '$optout' => ['optout', L10n::t('Show opt-out cookie link?'), Config::get('piwik','optout' ), ''],
- '$async' => ['async', L10n::t('Asynchronous tracking'), Config::get('piwik','async' ), ''],
+ '$submit' => DI::l10n()->t('Save Settings'),
+ '$piwikbaseurl' => ['baseurl', DI::l10n()->t('Matomo (Piwik) Base URL'), DI::config()->get('piwik','baseurl' ), DI::l10n()->t('Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)')],
+ '$siteid' => ['siteid', DI::l10n()->t('Site ID'), DI::config()->get('piwik','siteid' ), ''],
+ '$optout' => ['optout', DI::l10n()->t('Show opt-out cookie link?'), DI::config()->get('piwik','optout' ), ''],
+ '$async' => ['async', DI::l10n()->t('Asynchronous tracking'), DI::config()->get('piwik','async' ), ''],
]);
}
function piwik_addon_admin_post (&$a) {
@@ -113,9 +113,9 @@ function piwik_addon_admin_post (&$a) {
$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);
- Config::set('piwik', 'async', $async);
- info(L10n::t('Settings updated.'). EOL);
+ DI::config()->set('piwik', 'baseurl', $url);
+ DI::config()->set('piwik', 'siteid', $id);
+ DI::config()->set('piwik', 'optout', $optout);
+ DI::config()->set('piwik', 'async', $async);
+ info(DI::l10n()->t('Settings updated.'). EOL);
}