From 562cfff6574b0ac64ea4dbcaef0a0cf7ff046186 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 4 Apr 2021 17:10:52 +0200
Subject: [PATCH] many fixes and expands and module expansions

---
 Controller/ApiController.php | 5 +++--
 Interfaces/OMS/Exporter.php  | 5 ++++-
 Interfaces/OMS/Importer.php  | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 6f6f88f..a43ae25 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -22,6 +22,7 @@ use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\NotificationLevel;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
+use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Model\Message\FormValidation;
 use phpOMS\System\File\Local\Directory;
 use phpOMS\System\MimeType;
@@ -147,7 +148,7 @@ final class ApiController extends Controller
      * Api method to export data
      *
      * @param RequestAbstract  $request  Request
-     * @param ResponseAbstract $response Response
+     * @param HttpResponse     $response Response
      * @param mixed            $data     Generic data
      *
      * @return void
@@ -156,7 +157,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiExchangeExport(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
+    public function apiExchangeExport(RequestAbstract $request, HttpResponse $response, $data = null) : void
     {
         $export = $this->exportDataFromRequest($request);
         foreach ($export['logs'] as $log) {
diff --git a/Interfaces/OMS/Exporter.php b/Interfaces/OMS/Exporter.php
index 674f464..d3819ae 100755
--- a/Interfaces/OMS/Exporter.php
+++ b/Interfaces/OMS/Exporter.php
@@ -164,6 +164,7 @@ final class Exporter extends ExporterAbstract
             }
 
             // search for translations in tpl files which are not included in the language fieles
+            $tplKeys = [];
             foreach ($themes as $theme) {
                 if (!\is_dir($themePath . $theme) || $theme === '.' || $theme === '..') {
                     continue;
@@ -184,6 +185,7 @@ final class Exporter extends ExporterAbstract
                     \preg_match_all('/(\$this\->getHtml\(\')([a-zA-Z:]+)(\'\))/', $template, $keys, \PREG_PATTERN_ORDER);
 
                     foreach ($keys[2] ?? [] as $key) {
+                        $tplKeys[\trim($module, '/')][\trim($theme, '/')][''][$key]['en'] = '';
                         if (!isset($languageArray[''][\trim($module, '/')][\trim($theme, '/')][$key])) {
                             $languageArray[\trim($module, '/')][\trim($theme, '/')][''][$key]['en'] = '';
                         }
@@ -199,7 +201,8 @@ final class Exporter extends ExporterAbstract
             foreach ($themes as $theme => $files) {
                 foreach ($files as $file => $keys) {
                     foreach ($keys as $key => $value) {
-                        $content .= "\n\"" . $module . '";"' . $theme . '";"' . $file . '";"' . $key . '"';
+                        $content .= "\n\"" . $module . '";"' . $theme . '";"' . $file . '";"';
+                        $content .= (!isset($tplKeys[$module][$theme]['']) ? '*' : '') . $key . '"';
 
                         foreach ($supportedLanguages as $language) {
                             $content .= ';"' . ($value[$language] ?? '') . '"';
diff --git a/Interfaces/OMS/Importer.php b/Interfaces/OMS/Importer.php
index 80837f3..af358b2 100755
--- a/Interfaces/OMS/Importer.php
+++ b/Interfaces/OMS/Importer.php
@@ -198,6 +198,8 @@ final class Importer extends ImporterAbstract
                         \ksort($keys);
 
                         foreach ($keys as $key => $values) {
+                            $key = \ltrim($key, '*');
+
                             \fwrite($fp,
                                 "    '" . $key . "'"
                                 . \str_repeat(' ', $keyLengths[$module][$theme][$file] - \strlen($key))