From a72fb9353349f0979afaba533cac84f695cdd3bc Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Fri, 15 Mar 2024 20:24:38 +0000
Subject: [PATCH] code fixes

---
 Controller/ApiController.php                  | 28 ++++++++++---------
 Theme/Backend/Lang/de.lang.php                |  2 +-
 Theme/Backend/Lang/en.lang.php                |  2 +-
 .../resource-comparison-inline.tpl.php        |  4 +--
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 4652e27..50e2635 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -262,12 +262,13 @@ final class ApiController extends Controller
             ->execute();
 
         $ids = \array_map(
-            function (Report $report) : void {
-                $report->resource;
+            function (Report $report) : int {
+                return $report->resource;
             },
             $reports
         );
 
+        /** @var Resource[] $resources */
         $resources = ResourceMapper::getAll()
             ->with('owner')
             ->with('owner/l11n')
@@ -333,10 +334,10 @@ final class ApiController extends Controller
                 $mail->template = \array_merge(
                     $mail->template,
                     [
-                        '{resource.id}' => $resource->id,
-                        '{email}' => $inform->email,
+                        '{resource.id}'  => (string) $resource->id,
+                        '{email}'        => $inform->email,
                         '{resource.url}' => $resource->uri,
-                        '{owner_email}' => $resource->owner->getEmail(),
+                        '{owner_email}'  => $resource->owner->getEmail(),
                     ]
                 );
 
@@ -612,23 +613,24 @@ final class ApiController extends Controller
                         $contentNew = \Modules\Media\Controller\ApiController::loadFileContent($newPath, $extension, 'txt', ['path' => $resource->xpath]);
 
                         $contentOld = \preg_replace('/(\ {2,}|\t)/', ' ', $contentOld);
-                        $contentOld = \preg_replace('/(\s{2,})/', "\n", $contentOld);
+                        $contentOld = \preg_replace('/(\s{2,})/', "\n", $contentOld ?? '');
 
                         $contentNew = \preg_replace('/(\ {2,}|\t)/', ' ', $contentNew);
-                        $contentNew = \preg_replace('/(\s{2,})/', "\n", $contentNew);
+                        $contentNew = \preg_replace('/(\s{2,})/', "\n", $contentNew ?? '');
 
-                        // Calculate difference index
-                        $difference = \levenshtein($contentOld, $contentNew);
+                        $difference = 1;
+                        if ($contentNew !== null && $contentOld !== null) {
+                            // Calculate difference index
+                            $difference = \levenshtein($contentOld, $contentNew);
+                        }
 
                         $diffPath = \dirname($newPath) . '/_' . \basename($newPath);
 
-                        var_dump($diffPath);
-
                         \file_put_contents(
                             $diffPath,
                             \phpOMS\Utils\StringUtils::createDiffMarkup(
-                                $contentOld,
-                                $contentNew,
+                                $contentOld ?? '',
+                                $contentNew ?? '',
                                 ' '
                             )
                         );
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
index 566d302..84aa2f6 100755
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@@ -24,7 +24,7 @@ return ['OnlineResourceWatcher' => [
     'BillingSettings' => 'Billing Settings',
     'Bills'           => 'Bills',
     'By'              => 'By',
-    'Difference'              => 'Unterschiede',
+    'Difference'      => 'Unterschiede',
     'Cancel'          => 'Cancel',
     'Checked'         => 'Checked',
     'City'            => 'City',
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 1585986..573b709 100755
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -24,7 +24,7 @@ return ['OnlineResourceWatcher' => [
     'BillingSettings' => 'Billing Settings',
     'Bills'           => 'Bills',
     'By'              => 'By',
-    'Difference'              => 'Difference',
+    'Difference'      => 'Difference',
     'Cancel'          => 'Cancel',
     'Checked'         => 'Checked',
     'City'            => 'City',
diff --git a/Theme/Backend/resource-comparison-inline.tpl.php b/Theme/Backend/resource-comparison-inline.tpl.php
index 2a8720c..febacc6 100644
--- a/Theme/Backend/resource-comparison-inline.tpl.php
+++ b/Theme/Backend/resource-comparison-inline.tpl.php
@@ -69,7 +69,7 @@ use phpOMS\Uri\UriFactory;
                                 }
                             } else {
                                 $oldWebPath = '../../../../Web/Backend/img/404.svg';
-                                $type = 'img';
+                                $type       = 'img';
                             }
                         }
 
@@ -112,7 +112,7 @@ use phpOMS\Uri\UriFactory;
                             }
                         }
 
-                        $base = __DIR__ . '/../../../../';
+                        $base        = __DIR__ . '/../../../../';
                         $newDiffPath = '';
 
                         if ($type === 'pdf') {