X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=piwik%2Fpiwik.php;h=d461cfd4fdade81aa494f4d4b3306fa4f1ba88c4;hb=b4f0d0bd75d000aa0408404a44a8ad995b71d651;hp=e3afb937f2dbd3a255f7383ffba6a7ef05922802;hpb=f2fc22227a0dfae8f5c85f24f1c5bfa6e5c4c245;p=friendica-addons.git

diff --git a/piwik/piwik.php b/piwik/piwik.php
index e3afb937..d461cfd4 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -31,7 +31,6 @@
  *     setting.
  */
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -46,13 +45,6 @@ function piwik_install() {
 	Logger::log("installed piwik addon");
 }
 
-function piwik_uninstall() {
-	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, ConfigFileLoader $loader)
 {
 	$a->getConfigCache()->load($loader->loadAddonConfig('piwik'));
@@ -70,10 +62,10 @@ function piwik_analytics($a,&$b) {
 	/*
 	 *   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.
@@ -103,10 +95,10 @@ function piwik_addon_admin (&$a, &$o) {
 	$t = Renderer::getMarkupTemplate( "admin.tpl", "addon/piwik/" );
 	$o = Renderer::replaceMacros( $t, [
 		'$submit' => DI::l10n()->t('Save Settings'),
-		'$piwikbaseurl' => ['baseurl', DI::l10n()->t('Matomo (Piwik) Base URL'), 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'), Config::get('piwik','siteid' ), ''],
-		'$optout' => ['optout', DI::l10n()->t('Show opt-out cookie link?'), Config::get('piwik','optout' ), ''],
-		'$async' => ['async', DI::l10n()->t('Asynchronous tracking'), Config::get('piwik','async' ), ''],
+		'$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) {
@@ -114,9 +106,8 @@ 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(DI::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);
 }