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

diff --git a/piwik/piwik.php b/piwik/piwik.php
index 1487f370..d461cfd4 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -31,12 +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\Util\Config\ConfigFileLoader;
+use Friendica\DI;
+use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\Strings;
 
 function piwik_install() {
@@ -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'));
@@ -65,15 +57,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'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/piwik/piwik.css' . '" media="all" />';
+	DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/piwik/piwik.css' . '" media="all" />';
 
 	/*
 	 *   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.
@@ -92,21 +84,21 @@ function piwik_analytics($a,&$b) {
 	 */
 	if ($optout) {
 		$b .= "<div id='piwik-optout-link'>";
-		$b .= L10n::t("This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool.");
+		$b .= DI::l10n()->t("This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool.");
 		$b .= " ";
 		$the_url =  "http://".$baseurl ."index.php?module=CoreAdminHome&action=optOut";
-		$b .= L10n::t("If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).", $the_url);
+		$b .= DI::l10n()->t("If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).", $the_url);
 		$b .= "</div>";
 	}
 }
 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('Matomo (Piwik) Base URL'), Config::get('piwik','baseurl' ), L10n::t('Absolute path to your Matomo (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) {
@@ -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(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);
 }