X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=piwik%2Fpiwik.php;h=c6c8ea9e037ebe97f1bd50051404579ae2fded4b;hb=c3e93f1ed9a487f823bcc75ddd43024334c25bfc;hp=b7d326e5b88e8e99579d3ca07be56d842126e578;hpb=f4c9908e0c0778ba99948a36dc18b44315aadaa3;p=friendica-addons.git

diff --git a/piwik/piwik.php b/piwik/piwik.php
index b7d326e5..c6c8ea9e 100755
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -2,7 +2,7 @@
 /**
  * Name: Piwik Analytics
  * Description: Piwik Analytics Plugin for Friendica
- * Version: 1.1
+ * Version: 1.3
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  * Author: Klaus Weidenbach
  */
@@ -15,7 +15,9 @@
  *   License: 3-clause BSD license
  *
  *   Configuration:
- *     Add the following lines to your .htconfig.php file:
+ *     Use the administration panel to configure the Piwik tracking addon, or
+ *     in case you don't use this add the following lines to your .htconfig.php
+ *     file:
  *
  *     $a->config['piwik']['baseurl'] = 'www.example.com/piwik/';
  *     $a->config['piwik']['siteid'] = '1';
@@ -28,6 +30,8 @@
  *     setting.
  */
 
+use Friendica\Core\Config;
+
 function piwik_install() {
 	register_hook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
 
@@ -52,20 +56,20 @@ function piwik_analytics($a,&$b) {
 	/*
 	 *   Get the configuration variables from the .htconfig file.
 	 */
-	$baseurl = get_config('piwik','baseurl');
-	$siteid  = get_config('piwik','siteid');
-	$optout  = get_config('piwik','optout');
-	$async   = get_config('piwik','async');
+	$baseurl = Config::get('piwik','baseurl');
+	$siteid  = Config::get('piwik','siteid');
+	$optout  = Config::get('piwik','optout');
+	$async   = Config::get('piwik','async');
 
 	/*
 	 *   Add the Piwik tracking code for the site.
 	 *   If async is set to true use asynchronous tracking
 	 */
 	if ($async) {
-	  $a->page['htmlhead'] .= "<!-- Piwik --> <script type=\"text/javascript\">\r\nvar _paq = _paq || [];\r\n(function(){ var u=((\"https:\" == document.location.protocol) ? \"https://".$baseurl."\" : \"http://".$baseurl."\");\r\n_paq.push(['setSiteId', ".$siteid."]);\r\n_paq.push(['setTrackerUrl', u+'piwik.php']);\r\n_paq.push(['trackPageView']);\r\n_paq.push(['enableLinkTracking']);\r\nvar d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';\r\ng.defer=true; g.async=true; g.src=u+'piwik.js';\r\ns.parentNode.insertBefore(g,s); })();\r\n </script>\r\n<!-- End Piwik Code -->\r\n";
+	  $b .= "<!-- Piwik --> <script type=\"text/javascript\"> var _paq = _paq || []; _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u=((\"https:\" == document.location.protocol) ? \"https\" : \"http\") + \"://".$baseurl."\"; _paq.push(['setTrackerUrl', u+'piwik.php']); _paq.push(['setSiteId', ".$siteid."]); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> <!-- End Piwik Code -->\r\n";
 	  $b .= "<div id='piwik-code-block'> <!-- Piwik -->\r\n<noscript><p><img src=\"//".$baseurl."piwik.php?idsite=".$siteid."\" style=\"border:0\" alt=\"\" /></p></noscript>\r\n <!-- End Piwik Tracking Tag --> </div>";
 	} else {
-		$b .= "<div id='piwik-code-block'> <!-- Piwik -->\r\n <script type=\"text/javascript\">\r\n var pkBaseURL = ((\"https:\" == document.location.protocol) ? \"https://".$baseurl."\" : \"http://".$baseurl."\");\r\n document.write(unescape(\"%3Cscript src='\" + pkBaseURL + \"piwik.js' type='text/javascript'%3E%3C/script%3E\"));\r\n </script>\r\n<script type=\"text/javascript\">\r\n try {\r\n var piwikTracker = Piwik.getTracker(pkBaseURL + \"piwik.php\", ".$siteid.");\r\n piwikTracker.trackPageView();\r\n piwikTracker.enableLinkTracking();\r\n }\r\n catch( err ) {}\r\n </script>\r\n<noscript><p><img src=\"//".$baseurl."piwik.php?idsite=".$siteid."\" style=\"border:0\" alt=\"\" /></p></noscript>\r\n <!-- End Piwik Tracking Tag --> </div>";
+	  $b .= "<!-- Piwik --> <script type=\"text/javascript\"> var _paq = _paq || []; _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u=((\"https:\" == document.location.protocol) ? \"https\" : \"http\") + \"://".$baseurl."\"; _paq.push(['setTrackerUrl', u+'piwik.php']); _paq.push(['setSiteId', ".$siteid."]); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; g.defer=true; g.async=false; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> <!-- End Piwik Code -->\r\n";
 	}
 
 	/*
@@ -85,10 +89,10 @@ function piwik_plugin_admin (&$a, &$o) {
 	$t = get_markup_template( "admin.tpl", "addon/piwik/" );
 	$o = replace_macros( $t, array(
 		'$submit' => t('Save Settings'),
-		'$baseurl' => array('baseurl', t('Piwik Base URL'), get_config('piwik','baseurl' ), t('Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)')),
-		'$siteid' => array('siteid', t('Site ID'), get_config('piwik','siteid' ), ''),
-		'$optout' => array('optout', t('Show opt-out cookie link?'), get_config('piwik','optout' ), ''),
-		'$async' => array('async', t('Asynchronous tracking'), get_config('piwik','async' ), ''),
+		'$piwikbaseurl' => array('baseurl', t('Piwik Base URL'), Config::get('piwik','baseurl' ), t('Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)')),
+		'$siteid' => array('siteid', t('Site ID'), Config::get('piwik','siteid' ), ''),
+		'$optout' => array('optout', t('Show opt-out cookie link?'), Config::get('piwik','optout' ), ''),
+		'$async' => array('async', t('Asynchronous tracking'), Config::get('piwik','async' ), ''),
 	));
 }
 function piwik_plugin_admin_post (&$a) {
@@ -96,11 +100,9 @@ function piwik_plugin_admin_post (&$a) {
 	$id = ((x($_POST, 'siteid')) ? trim($_POST['siteid']) : '');
 	$optout = ((x($_POST, 'optout')) ? trim($_POST['optout']) : '');
 	$async = ((x($_POST, 'async')) ? trim($_POST['async']) : '');
-	set_config('piwik', 'baseurl', $url);
-	set_config('piwik', 'siteid', $id);
-	set_config('piwik', 'optout', $optout);
-	set_config('piwik', 'async', $async);
+	Config::set('piwik', 'baseurl', $url);
+	Config::set('piwik', 'siteid', $id);
+	Config::set('piwik', 'optout', $optout);
+	Config::set('piwik', 'async', $async);
 	info( t('Settings updated.'). EOL);
 }
-;
-	  $b .=