[FEATURE] Save site in all log entries

in2code-de · Feb 22, 2024 · 7f0c8fb · 7f0c8fb
1 parent a538923
commit 7f0c8fb
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 6 deletions.
diff --git a/Classes/Domain/Model/Log.php b/Classes/Domain/Model/Log.php
@@ -49,6 +49,7 @@ class Log extends AbstractModel
     protected ?Visitor $visitor = null;
     protected ?DateTime $crdate = null;
     protected string $properties = '';
+    protected string $site = '';
 
     public function getVisitor(): ?Visitor
     {
@@ -179,6 +180,17 @@ protected function getPropertyByKey(string $key): string
         return $property;
     }
 
+    public function getSite(): string
+    {
+        return $this->site;
+    }
+
+    public function setSite(string $site): self
+    {
+        $this->site = $site;
+        return $this;
+    }
+
     public static function getIdentifiedStatus(): array
     {
         return [

diff --git a/Classes/Domain/Service/LogService.php b/Classes/Domain/Service/LogService.php
@@ -10,6 +10,7 @@
 use In2code\Lux\Domain\Model\Visitor;
 use In2code\Lux\Domain\Repository\LogRepository;
 use In2code\Lux\Domain\Repository\VisitorRepository;
+use In2code\Lux\Utility\FrontendUtility;
 use In2code\Luxenterprise\Domain\Model\AbTestingPage;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException;
@@ -302,8 +303,13 @@ protected function log(int $status, Visitor $visitor, array $properties = []): v
     {
         $logRepository = GeneralUtility::makeInstance(LogRepository::class);
         $visitorRepository = GeneralUtility::makeInstance(VisitorRepository::class);
+        $siteService = GeneralUtility::makeInstance(SiteService::class);
+        $siteIdentifier = $siteService->getSiteIdentifierFromPageIdentifier(FrontendUtility::getCurrentPageIdentifier());
 
-        $log = GeneralUtility::makeInstance(Log::class)->setStatus($status)->setPropertiesArray($properties);
+        $log = GeneralUtility::makeInstance(Log::class)
+            ->setStatus($status)
+            ->setPropertiesArray($properties)
+            ->setSite($siteIdentifier);
         $logRepository->add($log);
         $visitor->addLog($log);
         if ($visitor->getUid() > 0) {

diff --git a/Classes/Utility/FrontendUtility.php b/Classes/Utility/FrontendUtility.php
@@ -12,7 +12,11 @@ class FrontendUtility
 {
     public static function getCurrentPageIdentifier(): int
     {
-        return self::getTyposcriptFrontendController()->id;
+        $typoscriptFrontendController = self::getTyposcriptFrontendController();
+        if (self::getTyposcriptFrontendController() === null) {
+            return 0;
+        }
+        return $typoscriptFrontendController->id;
     }
 
     /**
@@ -62,11 +66,11 @@ public static function isFrontendMode(): bool
     }
 
     /**
-     * @return TypoScriptFrontendController
+     * @return ?TypoScriptFrontendController
      * @SuppressWarnings(PHPMD.Superglobals)
      */
-    protected static function getTyposcriptFrontendController()
+    protected static function getTyposcriptFrontendController(): ?TypoScriptFrontendController
     {
-        return $GLOBALS['TSFE'];
+        return $GLOBALS['TSFE'] ?? null;
     }
 }
diff --git a/Configuration/TCA/tx_lux_domain_model_log.php b/Configuration/TCA/tx_lux_domain_model_log.php
@@ -21,7 +21,7 @@
         'hideTable' => true,
     ],
     'types' => [
-        '1' => ['showitem' => 'crdate,status,properties,visitor'],
+        '1' => ['showitem' => 'crdate,status,properties,site,visitor'],
     ],
     'columns' => [
         'sys_language_uid' => [
@@ -87,6 +87,15 @@
                 'readOnly' => true,
             ],
         ],
+        'site' => [
+            'exclude' => true,
+            'label' => 'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:' . Log::TABLE_NAME . '.site',
+            'config' => [
+                'type' => 'input',
+                'size' => 30,
+                'readOnly' => true,
+            ],
+        ],
         'visitor' => [
             'exclude' => true,
             'label' => 'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:' . Log::TABLE_NAME . '.visitor',

diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf
@@ -319,6 +319,10 @@
 				<source>Properties</source>
 				<target state="translated">Eigenschaften</target>
 			</trans-unit>
+			<trans-unit id="tx_lux_domain_model_log.site">
+				<source>Site</source>
+				<target state="translated">Site</target>
+			</trans-unit>
 			<trans-unit id="tx_lux_domain_model_log.visitor">
 				<source>Lead</source>
 				<target state="translated">Lead</target>

diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
@@ -242,6 +242,9 @@
 			<trans-unit id="tx_lux_domain_model_log.properties">
 				<source>Properties</source>
 			</trans-unit>
+			<trans-unit id="tx_lux_domain_model_log.site">
+				<source>Site</source>
+			</trans-unit>
 			<trans-unit id="tx_lux_domain_model_log.visitor">
 				<source>Lead</source>
 			</trans-unit>

diff --git a/ext_tables.sql b/ext_tables.sql
@@ -460,6 +460,7 @@ CREATE TABLE tx_lux_domain_model_log (
 
 	status tinyint(4) unsigned DEFAULT '0' NOT NULL,
 	properties text NOT NULL,
+	site varchar(255) DEFAULT '' NOT NULL,
 
 	tstamp int(11) unsigned DEFAULT '0' NOT NULL,
 	crdate int(11) unsigned DEFAULT '0' NOT NULL,