Skip to content

Commit

Permalink
multpile fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
av3 committed Nov 15, 2024
1 parent 8ce83a4 commit 3f3dc40
Show file tree
Hide file tree
Showing 7 changed files with 636 additions and 551 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/lang/de/spe
### Fixed

- Error when getRootPage don't find a result
- Too short field length for domain in settings
- Missing variable for custom domains

## [0.5.2]

Expand Down
2 changes: 1 addition & 1 deletion README_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ This is still a pre-release version in the active development and testing phase.

## Requirements
* Contao 4.13 or newer (including Contao 5.3)
* PHP 8.0 or newer
* PHP 8.1 or newer
* etracker account (chargeable)

## Install
Expand Down
4 changes: 2 additions & 2 deletions contao/dca/tl_page.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
'inputType' => 'text',
'eval' => [
'tl_class' => 'w50',
'maxlength' => 16,
'maxlength' => 50,
],
'sql' => 'varchar(50) NOT NULL default \'\'',
];
Expand All @@ -92,7 +92,7 @@
'inputType' => 'text',
'eval' => [
'tl_class' => 'w50',
'maxlength' => 16,
'maxlength' => 50,
],
'sql' => 'varchar(50) NOT NULL default \'\'',
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
<!-- This material may not be reproduced, displayed, modified or distributed -->
<!-- without the express prior written permission of the copyright holder. -->
<!-- etracker tracklet 5.0 -->
<script type="text/javascript" {% if nonce is not null %}nonce="{{ nonce|raw }}"{% endif %}>
<script type="text/javascript" {% if nonce is defined and nonce is not null %}nonce="{{ nonce|raw }}"{% endif %}>
var _etrackerOnReady = [];
{% if etrackerTrackingDomain is not null %}var et_proxy_redirect = "https:\/\/{{ etrackerTrackingDomain }}";{% endif %}
{% if pagename is not null %}var et_pagename = "{{ pagename }}";{% endif %}
{% if areas is not null %}var et_areas = "{{ areas }}";{% endif %}
{% if debugmode|default(false) == true %}var _etr = {debugMode: true};{% endif %}
Expand Down
2 changes: 2 additions & 0 deletions src/EventListener/GeneratePageListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ public function __invoke(PageModel $pageModel, LayoutModel $layout, PageRegular
$objTemplate->pagename = trim($pagename);
}

$objTemplate->etrackerTrackingDomain = $rootPage->etrackerTrackingDomain;

try {
$objTemplate->et_script = $this->getScriptCode($rootPage);
$this->getParameters($objTemplate, $rootPage, $pageModel);
Expand Down
Loading

0 comments on commit 3f3dc40

Please sign in to comment.