Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion Template/Tag/EtrackerTag.web.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
}
}
}
//Proxy Domain
if(etrackerConfig.enableEtrackerProxyDomain){
window['et_proxy_redirect'] = "\/\/"+etrackerConfig.etrackerProxyDomain;
}

if (!hasBeenLoaded && etrackerID) {
hasBeenLoaded = true;
Expand All @@ -44,7 +48,18 @@
if (etrackerConfig.etrackerDNT) {
script.setAttribute('data-respect-dnt', 'true');
}
script.src = '//code.etracker.com/code/e.js';
//custom cookie domain
if (etrackerConfig.enableEtrackerCookieDomain) {
script.setAttribute('data-cookie-domain', etrackerConfig.etrackerCookieDomain);
}
//custom tracking domain
if (etrackerConfig.enableEtrackerProxyDomain) {
script.src = '//' + etrackerConfig.etrackerProxyDomain + '/code/e.js';
}
//default etracker domain
else {
script.src = '//code.etracker.com/code/e.js';
}
script.setAttribute('async', '');
s.parentNode.insertBefore(script, s);
}
Expand Down
31 changes: 31 additions & 0 deletions Template/Variable/EtrackerConfigurationVariable.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

use Piwik\Piwik;
use Piwik\Settings\FieldConfig;
use Piwik\Validators\CharacterLength;

Check failure on line 14 in Template/Variable/EtrackerConfigurationVariable.php

View workflow job for this annotation

GitHub Actions / PHPCS

EtrackerConfigurationVariable.php: Type Piwik\Validators\CharacterLength is not used in this file.
use Piwik\Validators\NotEmpty;

class EtrackerConfigurationVariable extends BaseVariable
Expand Down Expand Up @@ -54,6 +55,36 @@
return trim($value);
};
}),
$this->makeSetting('enableEtrackerProxyDomain', false, FieldConfig::TYPE_BOOL, function (FieldConfig $field) {
$field->title = Piwik::translate('TagManager_EtrackerConfigurationVariableEnableProxyDomainTitle');
$field->description = Piwik::translate('TagManager_EtrackerConfigurationVariableEnableProxyDomainDescription');
}),
$this->makeSetting('etrackerProxyDomain', '', FieldConfig::TYPE_STRING, function (FieldConfig $field) {
$field->condition = 'enableEtrackerProxyDomain';
$field->title = Piwik::translate('TagManager_EtrackerConfigurationVariableProxyDomainTitle');
$field->description = Piwik::translate('TagManager_EtrackerConfigurationVariableProxyDomainDescription');
$field->customFieldComponent = self::FIELD_VARIABLE_COMPONENT;
//$field->validators[] = new NotEmpty();
//$field->validators[] = new CharacterLength(4, 200);
$field->transform = function ($value) {
return trim($value);
};
}),
$this->makeSetting('enableEtrackerCookieDomain', false, FieldConfig::TYPE_BOOL, function (FieldConfig $field) {
$field->title = Piwik::translate('TagManager_EtrackerConfigurationVariableEnableCookieDomainTitle');
$field->description = Piwik::translate('TagManager_EtrackerConfigurationVariableEnableCookieDomainDescription');
}),
$this->makeSetting('etrackerCookieDomain', '', FieldConfig::TYPE_STRING, function (FieldConfig $field) {
$field->condition = 'enableEtrackerCookieDomain';
$field->title = Piwik::translate('TagManager_EtrackerConfigurationVariableCookieDomainTitle');
$field->description = Piwik::translate('TagManager_EtrackerConfigurationVariableCookieDomainDescription');
$field->customFieldComponent = self::FIELD_VARIABLE_COMPONENT;
//$field->validators[] = new NotEmpty();
//$field->validators[] = new CharacterLength(4, 200);
$field->transform = function ($value) {
return trim($value);
};
}),
$this->makeSetting('etrackerBlockCookies', true, FieldConfig::TYPE_BOOL, function (FieldConfig $field) {
$field->title = Piwik::translate('TagManager_EtrackerConfigurationVariableBlockCookiesTitle');
}),
Expand Down
8 changes: 8 additions & 0 deletions lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -928,6 +928,14 @@
"EtrackerConfigurationVariableCustTitle": "Variable et_cust",
"EtrackerConfigurationVariableCustomDimensionsTitle": "Custom Dimensions",
"EtrackerConfigurationVariableCustomDimensionsDescription": "Optionally set one or multiple custom dimensions.",
"EtrackerConfigurationVariableEnableProxyDomainTitle": "Enable etracker Tracking Domain",
"EtrackerConfigurationVariableEnableProxyDomainDescription": "Set up custom domain instead of using code.etracker.com",
"EtrackerConfigurationVariableProxyDomainTitle": "Your custom etracker Tracking Domain",
"EtrackerConfigurationVariableProxyDomainDescription": "Use hostname like e.g. 'analytics.domain.com' (without any slashes)",
"EtrackerConfigurationVariableEnableCookieDomainTitle": "Enable etracker Custom Cookie Domain",
"EtrackerConfigurationVariableEnableCookieDomainDescription": "Set up custom cookie domain instead of using www.domain.com",
"EtrackerConfigurationVariableCookieDomainTitle": "Custom Domain for setting cookies",
"EtrackerConfigurationVariableCookieDomainDescription": "Use different domain to set cookies e.g. '.domain.com' (instead of www.domain.com)",
"JavaScriptVariableNameTitle": "JavaScript Variable Name",
"JavaScriptVariableNameDescription": "The name of any variable that is available within the global scope. In case you want to access the value of a nested object, you can access the value of an object by separating each property by a dot, for example \"document.referrer\".",
"MetaContentVariableNameTitle": "Meta Name",
Expand Down
Loading