From 41e7b2251d0d1f99245ecdf9999a3a6ad2bd16d4 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Tue, 2 Jan 2024 23:34:18 +0000
Subject: [PATCH] update

---
 Controller/ApiController.php                  | 17 ++---
 Controller/BackendController.php              | 14 ++--
 Controller/CliController.php                  |  6 --
 Models/PermissionCategory.php                 |  2 +-
 .../InlinePreview/inline-preview.tpl.php      |  2 +-
 .../Backend/Components/Media/archive.tpl.php  |  2 +-
 Theme/Backend/Components/Media/csv.tpl.php    |  2 +-
 Theme/Backend/Components/Media/list.tpl.php   |  2 +-
 .../Components/Media/spreadsheet.tpl.php      |  2 +-
 Theme/Backend/Components/Upload/BaseView.php  |  7 ++
 .../Components/Upload/upload-list.tpl.php     | 75 ++++++++++---------
 Theme/Backend/media-file-create.tpl.php       |  2 +-
 tests/Controller/ApiControllerTest.php        |  1 +
 13 files changed, 71 insertions(+), 63 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 026d525..28f0365 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -41,7 +41,6 @@ use phpOMS\Application\ApplicationAbstract;
 use phpOMS\Asset\AssetType;
 use phpOMS\Autoloader;
 use phpOMS\Localization\BaseStringL11n;
-use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\RequestAbstract;
@@ -1045,11 +1044,11 @@ final class ApiController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
-     * @param HttpRequest  $request  Request
-     * @param HttpResponse $response Response
-     * @param array        $data     Generic data
+     * @param \phpOMS\Message\Http\HttpRequest $request  Request
+     * @param HttpResponse                     $response Response
+     * @param array                            $data     Generic data
      *
      * @return void
      *
@@ -1192,11 +1191,11 @@ final class ApiController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
-     * @param Media        $media    Media
-     * @param HttpRequest  $request  Request
-     * @param HttpResponse $response Response
+     * @param Media                            $media    Media
+     * @param \phpOMS\Message\Http\HttpRequest $request  Request
+     * @param HttpResponse                     $response Response
      *
      * @return View
      *
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index c677c6f..25edb25 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -50,7 +50,7 @@ final class BackendController extends Controller
     use FileUploaderTrait;
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -185,7 +185,7 @@ final class BackendController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -367,7 +367,7 @@ final class BackendController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -397,7 +397,7 @@ final class BackendController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -430,7 +430,7 @@ final class BackendController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -450,7 +450,7 @@ final class BackendController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -473,7 +473,7 @@ final class BackendController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
diff --git a/Controller/CliController.php b/Controller/CliController.php
index 97bb0b8..210e8de 100644
--- a/Controller/CliController.php
+++ b/Controller/CliController.php
@@ -14,13 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Media\Controller;
 
-use Model\SettingMapper;
 use Modules\Media\Models\MediaMapper;
-use phpOMS\Contract\RenderableInterface;
-use phpOMS\Message\RequestAbstract;
-use phpOMS\Message\ResponseAbstract;
-use phpOMS\Security\EncryptionHelper;
-use phpOMS\Views\View;
 
 /**
  * Media controller class.
diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php
index 6d36e59..7da365d 100755
--- a/Models/PermissionCategory.php
+++ b/Models/PermissionCategory.php
@@ -17,7 +17,7 @@ namespace Modules\Media\Models;
 use phpOMS\Stdlib\Base\Enum;
 
 /**
- * Permision state enum.
+ * Permission category enum.
  *
  * @package Modules\Media\Models
  * @license OMS License 2.0
diff --git a/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php b/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php
index 8f3cb54..7401fe6 100755
--- a/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php
+++ b/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php
@@ -18,7 +18,7 @@
                     data-autocomplete="off"
                     data-src="api/media/find?search={!#mediaInput}">
                 <div id="<?= $this->id; ?>-popup" class="popup" data-active="true">
-                    <table class="default">
+                    <table class="default sticky">
                         <thead>
                             <tr>
                                 <td>ID<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
diff --git a/Theme/Backend/Components/Media/archive.tpl.php b/Theme/Backend/Components/Media/archive.tpl.php
index 8c71ff5..9dc233f 100755
--- a/Theme/Backend/Components/Media/archive.tpl.php
+++ b/Theme/Backend/Components/Media/archive.tpl.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
         <div class="tab-content">
             <input type="radio" id="media-c-tab-1" name="tabular-1" checked>
             <div class="tab">
-                <table class="default">
+                <table class="default sticky">
                 <?php
                     $archive = new ZipArchive();
                     $archive->open(($this->media->isAbsolute ? '' : __DIR__ . '/../../../../../../') . $this->media->getPath());
diff --git a/Theme/Backend/Components/Media/csv.tpl.php b/Theme/Backend/Components/Media/csv.tpl.php
index c833dfc..76ed805 100755
--- a/Theme/Backend/Components/Media/csv.tpl.php
+++ b/Theme/Backend/Components/Media/csv.tpl.php
@@ -26,7 +26,7 @@ use phpOMS\Utils\IO\Csv\CsvSettings;
             <input type="radio" id="media-c-tab-1" name="tabular-1" checked>
             <div class="tab">
                 <div class="slider">
-                <table class="default">
+                <table class="default sticky">
                 <?php
                     $f = \fopen(($this->media->isAbsolute ? '' : __DIR__ . '/../../../../../../') . $this->media->getPath(), 'r');
 
diff --git a/Theme/Backend/Components/Media/list.tpl.php b/Theme/Backend/Components/Media/list.tpl.php
index d558ea9..926e673 100755
--- a/Theme/Backend/Components/Media/list.tpl.php
+++ b/Theme/Backend/Components/Media/list.tpl.php
@@ -27,7 +27,7 @@ $next     = empty($this->media)
 <div class="portlet">
     <div class="portlet-head"><?= $this->getHtml('Media', 'Media'); ?><i class="g-icon download btn end-xs">download</i></div>
     <div class="slider">
-    <table class="default">
+    <table class="default sticky">
         <thead>
             <td>
             <td><?= $this->getHtml('Path', 'Media'); ?>
diff --git a/Theme/Backend/Components/Media/spreadsheet.tpl.php b/Theme/Backend/Components/Media/spreadsheet.tpl.php
index 867f4d4..9db8d96 100755
--- a/Theme/Backend/Components/Media/spreadsheet.tpl.php
+++ b/Theme/Backend/Components/Media/spreadsheet.tpl.php
@@ -50,7 +50,7 @@ Autoloader::addPath(__DIR__ . '/../../../../../../Resources/');
                     $csv  = \explode("\n", \trim($data, "\n"));
                     ?>
                     <div class="slider">
-                    <table class="default">
+                    <table class="default sticky">
                     <?php
                     foreach ($csv as $line)  {
                         $lineCsv = \str_getcsv($line, ';', '"');
diff --git a/Theme/Backend/Components/Upload/BaseView.php b/Theme/Backend/Components/Upload/BaseView.php
index c97e4a0..5cc98f3 100755
--- a/Theme/Backend/Components/Upload/BaseView.php
+++ b/Theme/Backend/Components/Upload/BaseView.php
@@ -54,6 +54,12 @@ class BaseView extends View
      */
     public string $name = '';
 
+    /**
+     * Media files
+     *
+     * @var \Modules\Media\Models\Media[]
+     * @since 1.0.0
+     */
     public array $files = [];
 
     /**
@@ -75,6 +81,7 @@ class BaseView extends View
         $this->name        = $data[1] ?? 'UNDEFINED';
         $this->virtualPath = $data[2] ?? $this->virtualPath;
         $this->files       = $data[3] ?? $this->files;
+
         return parent::render();
     }
 }
diff --git a/Theme/Backend/Components/Upload/upload-list.tpl.php b/Theme/Backend/Components/Upload/upload-list.tpl.php
index 8c1c46d..41ed1eb 100755
--- a/Theme/Backend/Components/Upload/upload-list.tpl.php
+++ b/Theme/Backend/Components/Upload/upload-list.tpl.php
@@ -21,42 +21,44 @@ use phpOMS\Uri\UriFactory;
             <div class="portlet-head"><?= $this->getHtml('Upload', 'Media', 'Backend'); ?></div>
             <form id="<?= $this->form; ?>-upload">
                 <div class="portlet-body">
-                    <table class="layout wf-100">
-                        <tbody>
-                        <tr><td><label for="iMedia"><?= $this->getHtml('Media', 'Media', 'Backend'); ?></label>
-                        <tr><td>
-                            <div class="ipt-wrap">
-                                <div class="ipt-first">
-                                    <div class="advancedInput wf-100" id="iMediaInput">
-                                        <input autocomplete="off" class="input" id="mediaInput" name="mediaFile" type="text"
-                                            data-emptyAfter="true"
-                                            data-autocomplete="off"
-                                            data-src="api/media/find?search={!#mediaInput}">
-                                        <div id="iMediaInput-popup" class="popup" data-active="true">
-                                            <table id="iMediaInput-table" class="default">
-                                                <thead>
-                                                    <tr>
-                                                        <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
-                                                        <td><?= $this->getHtml('Name', 'Media', 'Backend'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
-                                                <tbody>
-                                                    <template id="iMediaInput-rowElement" class="rowTemplate">
-                                                        <tr tabindex="-1">
-                                                            <td data-tpl-text="/id" data-tpl-value="/id" data-value=""></td>
-                                                            <td data-tpl-text="/name" data-tpl-value="/name" data-value=""></td>
-                                                        </tr>
-                                                    </template>
-                                                </tbody>
-                                            </table>
-                                        </div>
+                    <div class="form-group">
+                        <label for="mediaInput"><?= $this->getHtml('Media', 'Media', 'Backend'); ?></label>
+                        <div class="ipt-wrap">
+                            <div class="ipt-first">
+                                <div class="advancedInput wf-100" id="iMediaInput">
+                                    <input autocomplete="off" class="input" id="mediaInput" name="mediaFile" type="text"
+                                        data-emptyAfter="true"
+                                        data-autocomplete="off"
+                                        data-src="api/media/find?search={!#mediaInput}">
+                                    <div id="iMediaInput-popup" class="popup" data-active="true">
+                                        <table id="iMediaInput-table" class="default sticky">
+                                            <thead>
+                                                <tr>
+                                                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                                    <td><?= $this->getHtml('Name', 'Media', 'Backend'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                            <tbody>
+                                                <template id="iMediaInput-rowElement" class="rowTemplate">
+                                                    <tr tabindex="-1">
+                                                        <td data-tpl-text="/id" data-tpl-value="/id" data-value=""></td>
+                                                        <td data-tpl-text="/name" data-tpl-value="/name" data-value=""></td>
+                                                    </tr>
+                                                </template>
+                                            </tbody>
+                                        </table>
                                     </div>
                                 </div>
-                                <div class="ipt-second"><button><?= $this->getHtml('Select', 'Media', 'Backend'); ?></button></div>
                             </div>
-                        <tr><td><label for="iUpload"><?= $this->getHtml('Upload', 'Media', 'Backend'); ?></label>
-                        <tr><td>
+                            <div class="ipt-second"><button><?= $this->getHtml('Select', 'Media', 'Backend'); ?></button></div>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iUpload"><?= $this->getHtml('Upload', 'Media', 'Backend'); ?></label>
+                        <div class="wf-100">
                             <input type="hidden" name="virtualPath" form="<?= $this->form; ?>" value="<?= $this->virtualPath; ?>">
                             <input type="file" id="iUpload" name="upload" form="<?= $this->form; ?>" multiple>
-                    </table>
+                        </div>
+                    </div>
                 </div>
             </form>
         </div>
@@ -64,12 +66,13 @@ use phpOMS\Uri\UriFactory;
         <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Files', 'Media', 'Backend'); ?><i class="g-icon download btn end-xs">download</i></div>
                 <div class="slider">
-                <table id="iFiles" class="default">
+                <table id="iFiles" class="default sticky">
                     <thead>
                         <tr>
                             <td>
                             <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                             <td class="wf-100"><?= $this->getHtml('Name', 'Media', 'Backend'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                            <td>
                     <tbody
                         id="iMediaInput-tags"
                         class="tags"
@@ -86,8 +89,11 @@ use phpOMS\Uri\UriFactory;
                                     </label>
                                 <td data-tpl-text="/id" data-tpl-value="/id" data-value=""></td>
                                 <td data-tpl-text="/name" data-tpl-value="/name" data-value=""></td>
+                                <td>
                         </template>
-                        <?php foreach ($this->files as $file) : ?>
+                        <?php foreach ($this->files as $file) :
+                            $url = UriFactory::build('{/base}/media/single?{?}&id=' . $file->id);
+                        ?>
                             <tr data-tpl-value="/id" data-value="" data-uuid="" data-name="media-list">
                                 <td><label class="radio" for="iFile-<?= $file->id; ?>">
                                         <input id="iFile-<?= $file->id; ?>" type="radio" name="media_file" value="<?= $file->id; ?>"<?= \end($this->files)->id === $file->id ? ' checked' : ''; ?>>
@@ -95,10 +101,11 @@ use phpOMS\Uri\UriFactory;
                                     </label>
                                 <td data-tpl-text="/id" data-tpl-value="/id" data-value=""><?= $this->printHtml((string) $file->id); ?></td>
                                 <td data-tpl-text="/name" data-tpl-value="/name" data-value=""><?= $this->printHtml($file->name); ?></td>
+                                <td><a href="<?= $url; ?>"><i class="g-icon">attachment</i></a>
                         <?php endforeach; ?>
                         <?php if (empty($this->files)) : ?>
                             <tr>
-                                <td colspan="3" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
+                                <td colspan="4" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                         <?php endif; ?>
                 </table>
             </div>
diff --git a/Theme/Backend/media-file-create.tpl.php b/Theme/Backend/media-file-create.tpl.php
index 10e2e2d..4555bd7 100755
--- a/Theme/Backend/media-file-create.tpl.php
+++ b/Theme/Backend/media-file-create.tpl.php
@@ -75,7 +75,7 @@ use phpOMS\Uri\UriFactory;
                                     <option>
                                 </select>
                         <tr><td colspan="2"><label><?= $this->getHtml('GroupUser'); ?></label>
-                        <tr><td><input id="iPermission" name="group" type="text" placeholder="&#xf084;"><td><button><?= $this->getHtml('Add'); ?></button>
+                        <tr><td><input id="iPermission" name="group" type="text" placeholder=""><td><button><?= $this->getHtml('Add'); ?></button>
                     </table>
                 </form>
             </div>
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 77d84ee..079f803 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -46,6 +46,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $this->app = new class() extends ApplicationAbstract
         {
             protected string $appName = 'Api';
+
             protected int $appId = 1;
         };