Merge branch 'release/35.8.0'

Classes/Events/ReadableReferrersEvent.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+namespace In2code\Lux\Events;
+
+final class ReadableReferrersEvent
+{
+    protected string $referrer;
+    protected array $sources;
+
+    public function __construct(string $referrer, array $sources)
+    {
+        $this->referrer = $referrer;
+        $this->sources = $sources;
+    }
+
+    public function getReferrer(): string
+    {
+        return $this->referrer;
+    }
+
+    public function setReferrer(string $referrer): self
+    {
+        $this->referrer = $referrer;
+        return $this;
+    }
+
+    public function getSources(): array
+    {
+        return $this->sources;
+    }
+
+    public function setSources(array $sources): self
+    {
+        $this->sources = $sources;
+        return $this;
+    }
+}

Documentation/Technical/Changelog/Index.md

@@ -31,6 +31,7 @@ Double check if you have cleared all caches after installing a new LUX version t
 
 | Version    | Date       | State    | TYPO3          | Description                                                                                                                                                                                           |
 |------------|------------|----------|----------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 35.8.0     | 2024-07-18 | Feature  | `11.5 + 12.4`  | Add new event to extend ReadableReferrer class, bugfix for additional checkboxes in email4link popup                                                                                                  |
 | 35.7.0     | 2024-07-12 | Feature  | `11.5 + 12.4`  | Extend redable referrer list with Google AdSense and some other platforms                                                                                                                             |
 | 35.6.0     | 2024-07-03 | Task     | `11.5 + 12.4`  | Use a typoscript constant now for default sender email and name, documentation update                                                                                                                 |
 | 35.5.0     | 2024-07-02 | Feature  | `11.5 + 12.4`  | Add new getter to visitor model to get latest A/B test, some small CSS improvements, bugfix to always use pagevisit data for pagevisit timestamps                                                     |

Documentation/Technical/Events/Index.md

@@ -24,6 +24,7 @@ Contact us if you need further events.
 | LinkClickTracker::addLinkClick()                      | \In2code\Lux\Events\Log\LinkClickEvent                                    | This event can be used when a linkclick is tracked from LUX                                                                                    |
 | NewsTracker::track()                                  | \In2code\Lux\Events\NewsTrackerEvent                                      | This event can be used when a news visit is tracked from LUX                                                                                   |
 | PageTracker::trackPage()                              | \In2code\Lux\Events\PageTrackerEvent                                      | This event can be used when a pagevisit is tracked from LUX                                                                                    |
+| Readable::__construct                                 | \In2code\Lux\Events\ReadableReferrersEvent                                | This event can be used to extend the readable referrer list                                                                                    |
 | SearchTracker::track()                                | \In2code\Lux\Events\Log\SearchEvent                                       | This event can be used when a visitor searches with a searchterm that would be tracked from LUX                                                |
 | SendAssetEmail4LinkService::sendMail()                | \In2code\Lux\Events\Log\LogEmail4linkSendEmailEvent                       | This event can be used when email4link function sends an email to the visitor                                                                  |
 | SendAssetEmail4LinkService::sendMail()                | \In2code\Lux\Events\Log\LogEmail4linkSendEmailFailedEvent                 | This event can be used when email4link function fails to send an email to the visitor (e.g. file is not allowed, file is not existing, etc...) |

Resources/Private/Build/JavaScript/Frontend/Lux.js

@@ -968,15 +968,13 @@ function LuxMain() {
     var target = link.getAttribute('target');
     var sendEmail = link.getAttribute('data-lux-email4link-sendemail') || 'false';
 
-    var formArguments = {};
     var form = that.lightboxInstance.element().querySelector('[data-lux-email4link="form"]');
-    for (var i = 0; i < form.elements.length; i++) {
-      var field = form.elements[i];
-      var name = field.getAttribute('name');
-      if (name !== null && name.indexOf('email4link[') !== -1) {
-        var value = field.value;
-        var nameParts = name.split('[');
-        name = nameParts[1].substring(0, nameParts[1].length - 1);
+    var formData = new FormData(form);
+    var formArguments = {};
+
+    for (var [key, value] of formData.entries()) {
+      if (key.startsWith('email4link[')) {
+        var name = key.split('[')[1].split(']')[0];
         formArguments[name] = value;
       }
     }

Tests/Unit/Domain/Service/Referrer/ReadableTest.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace In2code\Lux\Tests\Unit\Domain\Service;
+
+use In2code\Lux\Tests\Unit\Fixtures\Domain\Service\Referrer\ReadableFixture;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+
+/**
+ * @coversDefaultClass \In2code\Lux\Domain\Service\Referrer\Readable
+ */
+class ReadableTest extends UnitTestCase
+{
+    public static function getReadableReferrerDataProvider(): array
+    {
+        return [
+            [
+                'https://www.google.com', // Referrer URL
+                'Google Organic', // Readable name
+            ],
+            [
+                'https://t.co/anything/new',
+                'X (Twitter)',
+            ],
+            [
+                'https://syndicatedsearch.goog/abc12345',
+                'Google AdSense',
+            ],
+            [
+                'https://ads.microsoft.com/',
+                'Microsoft Advertising',
+            ],
+            [
+                'https://stackoverflow.com/questions/75556288/typo3-lux-newsletter',
+                'Stack Overflow',
+            ],
+        ];
+    }
+
+    /**
+     * @param string $referrer
+     * @param string $expectedResult
+     * @return void
+     * @dataProvider getReadableReferrerDataProvider
+     * @covers ::getReadableReferrer
+     * @covers ::getDomain
+     */
+    public function testGetReadableReferrer(string $referrer, string $expectedResult): void
+    {
+        $readable = new ReadableFixture($referrer);
+        self::assertSame($expectedResult, $readable->getReadableReferrer());
+    }
+
+    /**
+     * @return void
+     * @covers ::getOriginalReferrer
+     */
+    public function testGetOriginalReferrer(): void
+    {
+        $readable = new ReadableFixture('');
+        self::assertGreaterThan($readable->getOriginalReferrer(), 10);
+    }
+}

Tests/Unit/Fixtures/Domain/Service/Referrer/ReadableFixture.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace In2code\Lux\Tests\Unit\Fixtures\Domain\Service\Referrer;
+
+use In2code\Lux\Domain\Service\Referrer\Readable;
+
+class ReadableFixture extends Readable
+{
+    public function __construct(string $referrer = '')
+    {
+        $this->referrer = $referrer;
+    }
+}

ext_emconf.php

@@ -4,7 +4,7 @@
     'description' => 'Living User Experience - LUX - the Marketing Automation tool for TYPO3.
         Turn your visitors to leads. Identification and profiling of your visitors within your TYPO3 website.',
     'category' => 'plugin',
-    'version' => '35.7.0',
+    'version' => '35.8.0',
     'author' => 'Alex Kellner',
     'author_email' => '[email protected]',
     'author_company' => 'in2code.de',