From de77dec883d8efc0afef02d37b9c9994d144ba8b Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Fri, 29 Mar 2024 15:26:00 +0000
Subject: [PATCH] started with template fixes

---
 .../Interfaces/DatabaseExchanger/import.tpl.php     | 13 +++++++------
 Admin/Routes/Web/Api.php                            |  2 ++
 Controller/BackendController.php                    |  2 --
 Theme/Backend/exchange-export.tpl.php               |  4 +---
 Theme/Backend/exchange-import.tpl.php               |  6 +++---
 tests/Interfaces/OMS/import.tpl.php                 |  2 +-
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Admin/Install/Interfaces/DatabaseExchanger/import.tpl.php b/Admin/Install/Interfaces/DatabaseExchanger/import.tpl.php
index 6f7572d..045b5dc 100755
--- a/Admin/Install/Interfaces/DatabaseExchanger/import.tpl.php
+++ b/Admin/Install/Interfaces/DatabaseExchanger/import.tpl.php
@@ -15,6 +15,7 @@ declare(strict_types=1);
 use Modules\Exchange\Models\NullExchangeSetting;
 use phpOMS\DataStorage\Database\Connection\ConnectionFactory;
 use phpOMS\DataStorage\Database\Connection\NullConnection;
+use phpOMS\DataStorage\Database\DatabaseStatus;
 use phpOMS\DataStorage\Database\DatabaseType;
 use phpOMS\DataStorage\Database\SchemaMapper;
 use phpOMS\Uri\UriFactory;
@@ -64,8 +65,8 @@ if (!empty($settingData)) {
     $importSchemaMapper = new SchemaMapper($importConnection);
     $exportSchemaMapper = new SchemaMapper($exportConnection);
 
-    $importTables = $importSchemaMapper->getTables();
-    $exportTables = $exportSchemaMapper->getTables();
+    $importTables = $importConnection->status === DatabaseStatus::OK ? $importSchemaMapper->getTables() : [];
+    $exportTables = $exportConnection->status === DatabaseStatus::OK ? $exportSchemaMapper->getTables() : [];
 
     $currentImportTableFields = empty($importTables) ? [] : $importSchemaMapper->getFields($importTables[0]);
     $currentExportTableFields = empty($exportTables) ? [] : $exportSchemaMapper->getFields($exportTables[0]);
@@ -317,14 +318,14 @@ $isNew = $currentSetting->id === 0;
         <div class="portlet-body">
             <div class="form-group">
                 <label for="iTitle"><?= $this->getHtml('Column1'); ?></label>
-                <input type="text" id="iTitle" name="column1title" placeholder="<?= $this->getHtml('Title'); ?>">
+                <input type="text" id="iTitle" name="column1title">
             </div>
 
             <div class="form-group">
                 <label for="iTitle"><?= $this->getHtml('Filter1'); ?></label>
                 <div class="ipt-wrap">
                     <div class="ipt-first">
-                        <input type="text" id="iTitle" name="title" placeholder="<?= $this->getHtml('Title'); ?>">
+                        <input type="text" id="iTitle" name="title">
                     </div>
                     <div class="ipt-second">
                         <select nma="column1comparison">
@@ -340,14 +341,14 @@ $isNew = $currentSetting->id === 0;
 
             <div class="form-group">
                 <label for="iTitle"><?= $this->getHtml('Column2'); ?></label>
-                <input type="text" id="iTitle" name="column2title" placeholder="<?= $this->getHtml('Title'); ?>">
+                <input type="text" id="iTitle" name="column2title">
             </div>
 
             <div class="form-group">
                 <label for="iTitle"><?= $this->getHtml('Filter2'); ?></label>
                 <div class="ipt-wrap">
                     <div class="ipt-first">
-                        <input type="text" id="iTitle" name="title" placeholder="<?= $this->getHtml('Title'); ?>">
+                        <input type="text" id="iTitle" name="title">
                     </div>
                     <div class="ipt-second">
                         <select name="column2comparison">
diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index 9701572..9daf960 100755
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -22,6 +22,7 @@ return [
         [
             'dest'       => '\Modules\Exchange\Controller\ApiController:apiExchangeImport',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -33,6 +34,7 @@ return [
         [
             'dest'       => '\Modules\Exchange\Controller\ApiController:apiExchangeExport',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 1b6729a..434ffef 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -189,7 +189,6 @@ final class BackendController extends Controller
         $view->data['db']        = $this->app->dbPool->get();
 
         $lang = \is_file($langFile = $interface->source->getAbsolutePath() . '/'
-                . $interface->source->name
                 . '/Lang/' . $response->header->l11n->language . '.lang.php'
             ) ? include $langFile : [];
 
@@ -228,7 +227,6 @@ final class BackendController extends Controller
         $view->data['db']        = $this->app->dbPool->get();
 
         $lang = \is_file($langFile = $interface->source->getAbsolutePath() . '/'
-                . $interface->source->name
                 . '/Lang/' . $response->header->l11n->language . '.lang.php'
             ) ? include $langFile : [];
 
diff --git a/Theme/Backend/exchange-export.tpl.php b/Theme/Backend/exchange-export.tpl.php
index 83f0e6f..8023960 100755
--- a/Theme/Backend/exchange-export.tpl.php
+++ b/Theme/Backend/exchange-export.tpl.php
@@ -19,6 +19,4 @@ echo $this->data['nav']->render();
 
 $interface = $this->data['interface'];
 
-include $interface->source->getAbsolutePath() . '/'
-    . $interface->source->name . '/'
-    . 'export.tpl.php';
+include $interface->source->getAbsolutePath() . '/export.tpl.php';
diff --git a/Theme/Backend/exchange-import.tpl.php b/Theme/Backend/exchange-import.tpl.php
index f7deca6..4f853ec 100755
--- a/Theme/Backend/exchange-import.tpl.php
+++ b/Theme/Backend/exchange-import.tpl.php
@@ -19,6 +19,6 @@ echo $this->data['nav']->render();
 
 $interface = $this->data['interface'];
 
-include $interface->source->getAbsolutePath() . '/'
-    . $interface->source->name . '/'
-    . 'import.tpl.php';
+$a = $interface->source->getAbsolutePath();
+
+include $interface->source->getAbsolutePath() . '/import.tpl.php';
diff --git a/tests/Interfaces/OMS/import.tpl.php b/tests/Interfaces/OMS/import.tpl.php
index b41e5b4..d03fc42 100755
--- a/tests/Interfaces/OMS/import.tpl.php
+++ b/tests/Interfaces/OMS/import.tpl.php
@@ -23,7 +23,7 @@ $lang = $this->getData('lang');
                     <table class="layout wf-100" style="table-layout: fixed">
                         <tbody>
                         <tr><td><label for="iFile"><?= $this->getHtml('File'); ?></label>
-                        <tr><td><input type="file" id="iFile" name="file" placeholder="<?= $this->getHtml('File'); ?>" required>
+                        <tr><td><input type="file" id="iFile" name="file" required>
                     </table>
                 </div>
                 <div class="portlet-foot">