aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-06-23 16:00:37 -0700
committerFriendika <info@friendika.com>2011-06-23 16:00:37 -0700
commit8242fb4bf0215a96de2633d7f8492644fbca3f9c (patch)
tree5b5268d6de4c01c77392af0835296efd2d0ff1db
parent5633430a19624423ddd98655518d8a765f081230 (diff)
parentb1e2b1c1e13b2a9af3ff2091116052fa881314e7 (diff)
downloadvolse-hubzilla-8242fb4bf0215a96de2633d7f8492644fbca3f9c.tar.gz
volse-hubzilla-8242fb4bf0215a96de2633d7f8492644fbca3f9c.tar.bz2
volse-hubzilla-8242fb4bf0215a96de2633d7f8492644fbca3f9c.zip
Merge branch 'pull'
-rw-r--r--addon/piwik/admin.tpl4
-rw-r--r--addon/piwik/piwik.php29
2 files changed, 27 insertions, 6 deletions
diff --git a/addon/piwik/admin.tpl b/addon/piwik/admin.tpl
new file mode 100644
index 000000000..0edd06210
--- /dev/null
+++ b/addon/piwik/admin.tpl
@@ -0,0 +1,4 @@
+{{ inc field_input.tpl with $field=$baseurl }}{{ endinc }}
+{{ inc field_input.tpl with $field=$siteid }}{{ endinc }}
+{{ inc field_checkbox.tpl with $field=$optout }}{{ endinc }}
+<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
diff --git a/addon/piwik/piwik.php b/addon/piwik/piwik.php
index 032f84f4b..3cc136d29 100644
--- a/addon/piwik/piwik.php
+++ b/addon/piwik/piwik.php
@@ -18,10 +18,10 @@
* Add the following two lines to your .htconfig.php file:
*
* $a->config['piwik']['baseurl'] = 'www.example.com/piwik/';
- * $a->config['piwik']['sideid'] = '1';
+ * $a->config['piwik']['siteid'] = '1';
* $a->config['piwik']['optout'] = true; // set to false to disable
*
- * Change the sideid to the ID that the Piwik tracker for your Friendika
+ * Change the siteid to the ID that the Piwik tracker for your Friendika
* installation has. Alter the baseurl to fit your needs, don't care
* about http/https but beware to put the trailing / at the end of your
* setting.
@@ -54,13 +54,13 @@ function piwik_analytics($a,&$b) {
* Get the configuration variables from the .htconfig file.
*/
$baseurl = get_config('piwik','baseurl');
- $sideod = get_config('piwik','sideid');
+ $siteid = get_config('piwik','siteid');
$optout = get_config('piwik','optout');
/*
- * Add the Piwik code for the side.
+ * Add the Piwik code for the site.
*/
- $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\", 8);\r\n piwikTracker.trackPageView();\r\n piwikTracker.enableLinkTracking();\r\n }\r\n catch( err ) {}\r\n </script>\r\n<noscript><p><img src=\"http://".$baseurl."/piwik.php?idsite=8\" style=\"border:0\" alt=\"\" /></p></noscript>\r\n <!-- End Piwik Tracking Tag --> </div>";
+ $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=\"http://".$baseurl."/piwik.php?idsite=".$siteid."\" style=\"border:0\" alt=\"\" /></p></noscript>\r\n <!-- End Piwik Tracking Tag --> </div>";
/*
* If the optout variable is set to true then display the notice
* otherwise just include the above code into the page.
@@ -70,4 +70,21 @@ function piwik_analytics($a,&$b) {
}
}
-
+function piwik_plugin_admin (&$a, &$o) {
+ $t = file_get_contents( dirname(__file__)."/admin.tpl");
+ $o = replace_macros( $t, array(
+ '$submit' => t('Submit'),
+ '$baseurl' => array('baseurl', t('Piwik Base URL'), get_config('piwik','baseurl' ), ''),
+ '$siteid' => array('siteid', t('Site ID'), get_config('piwik','siteid' ), ''),
+ '$optout' => array('optout', t('Show opt-out cookie link?'), get_config('piwik','optout' ), ''),
+ ));
+}
+function piwik_plugin_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']) : '');
+ set_config('piwik', 'baseurl', $url);
+ set_config('piwik', 'siteid', $id);
+ set_config('piwik', 'optout', $optout);
+ info( t('Settings updated.'). EOL);
+}