clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #361 from tobiasd/20160728-piwik 

Piwik addon, baseurl as variable name has problems with Friendica
This commit is contained in:
Michael Vogel 2016-07-28 20:14:44 +02:00 committed by GitHub
parent 3c044a30c6 12777e0a87
commit bf7922d05e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
piwik/piwik.php
View File

@ -2,7 +2,7 @@
/** /**
* Name: Piwik Analytics * Name: Piwik Analytics
* Description: Piwik Analytics Plugin for Friendica * Description: Piwik Analytics Plugin for Friendica
* Version: 1.2 * Version: 1.3
* Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias> * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
* Author: Klaus Weidenbach * Author: Klaus Weidenbach
*/ */
@ -87,7 +87,7 @@ function piwik_plugin_admin (&$a, &$o) {
$t = get_markup_template( "admin.tpl", "addon/piwik/" ); $t = get_markup_template( "admin.tpl", "addon/piwik/" );
$o = replace_macros( $t, array( $o = replace_macros( $t, array(
'$submit' => t('Save Settings'), '$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)')), '$piwikbaseurl' => 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' ), ''), '$siteid' => array('siteid', t('Site ID'), get_config('piwik','siteid' ), ''),
'$optout' => array('optout', t('Show opt-out cookie link?'), get_config('piwik','optout' ), ''), '$optout' => array('optout', t('Show opt-out cookie link?'), get_config('piwik','optout' ), ''),
'$async' => array('async', t('Asynchronous tracking'), get_config('piwik','async' ), ''), '$async' => array('async', t('Asynchronous tracking'), get_config('piwik','async' ), ''),

2
piwik/templates/admin.tpl
View File

@ -1,4 +1,4 @@
{{include file="field_input.tpl" field=$baseurl}} {{include file="field_input.tpl" field=$piwikbaseurl}}
{{include file="field_input.tpl" field=$siteid}} {{include file="field_input.tpl" field=$siteid}}
{{include file="field_checkbox.tpl" field=$optout}} {{include file="field_checkbox.tpl" field=$optout}}
{{include file="field_checkbox.tpl" field=$async}} {{include file="field_checkbox.tpl" field=$async}}