Merge pull request #197 from Icinga/use-ipl-fileelement

Use ipl file element
Icinga · Aug 10, 2023 · b1dd215 · b1dd215
2 parents 971c7e9 + 3103b62
commit b1dd215
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 3,502 deletions.
diff --git a/configuration.php b/configuration.php
@@ -4,17 +4,10 @@
 
 namespace Icinga\Module\Reporting {
 
-    use Icinga\Application\Version;
-
     /** @var \Icinga\Application\Modules\Module $this */
 
     $this->provideCssFile('system-report.css');
 
-    if (version_compare(Version::VERSION, '2.9.0', '<')) {
-        $this->provideJsFile('vendor/flatpickr.min.js');
-        $this->provideCssFile('vendor/flatpickr.min.css');
-    }
-
     $this->menuSection(N_('Reporting'))->add(N_('Reports'), array(
         'url' => 'reporting/reports',
     ));

diff --git a/library/Reporting/Web/Forms/TemplateForm.php b/library/Reporting/Web/Forms/TemplateForm.php
@@ -5,12 +5,12 @@
 namespace Icinga\Module\Reporting\Web\Forms;
 
 use Exception;
+use GuzzleHttp\Psr7\UploadedFile;
 use Icinga\Authentication\Auth;
 use Icinga\Module\Reporting\Database;
 use ipl\Html\Contract\FormSubmitElement;
 use ipl\Html\Html;
 use ipl\Web\Compat\CompatForm;
-use reportingipl\Html\FormElement\FileElement;
 
 class TemplateForm extends CompatForm
 {
@@ -65,18 +65,19 @@ protected function assemble()
 
         $this->add(Html::tag('h2', $this->translate('Cover Page Settings')));
 
-        $this->addElement(new FileElement('cover_page_background_image', [
-            'label'  => $this->translate('Background Image'),
-            'accept' => 'image/png, image/jpeg'
-        ]));
+        $this->addElement('file', 'cover_page_background_image', [
+            'label'       => $this->translate('Background Image'),
+            'accept'      => ['image/png', 'image/jpeg', 'image/jpg'],
+            'destination' => sys_get_temp_dir()
+        ]);
 
         if (
             $this->template !== null
             && isset($this->template->settings['cover_page_background_image'])
         ) {
             $this->add(Html::tag(
                 'p',
-                ['style' => ['margin-left: 14em;']],
+                ['class' => 'override-uploaded-file-hint'],
                 $this->translate('Upload a new background image to override the existing one')
             ));
 
@@ -85,18 +86,19 @@ protected function assemble()
             ]);
         }
 
-        $this->addElement(new FileElement('cover_page_logo', [
-            'label'  => $this->translate('Logo'),
-            'accept' => 'image/png, image/jpeg'
-        ]));
+        $this->addElement('file', 'cover_page_logo', [
+            'label'       => $this->translate('Logo'),
+            'accept'      => ['image/png', 'image/jpeg', 'image/jpg'],
+            'destination' => sys_get_temp_dir()
+        ]);
 
         if (
             $this->template !== null
             && isset($this->template->settings['cover_page_logo'])
         ) {
             $this->add(Html::tag(
                 'p',
-                ['style' => ['margin-left: 14em;']],
+                ['class' => 'override-uploaded-file-hint'],
                 $this->translate('Upload a new logo to override the existing one')
             ));
 
@@ -158,17 +160,14 @@ public function onSuccess()
         $settings = $this->getValues();
 
         try {
-            /** @var $uploadedFile \GuzzleHttp\Psr7\UploadedFile */
-            foreach ($this->getRequest()->getUploadedFiles() as $name => $uploadedFile) {
-                if ($uploadedFile->getError() === UPLOAD_ERR_NO_FILE) {
-                    continue;
+            foreach ($settings as $name => $setting) {
+                if ($setting instanceof UploadedFile) {
+                    $settings[$name] = [
+                        'mime_type' => $setting->getClientMediaType(),
+                        'size'      => $setting->getSize(),
+                        'content'   => base64_encode((string) $setting->getStream())
+                    ];
                 }
-
-                $settings[$name] = [
-                    'mime_type' => $uploadedFile->getClientMediaType(),
-                    'size'      => $uploadedFile->getSize(),
-                    'content'   => base64_encode((string) $uploadedFile->getStream())
-                ];
             }
 
             $db = $this->getDb();
@@ -250,10 +249,11 @@ protected function addColumnSettings($name, $label)
 
         switch ($this->getValue($type, 'none')) {
             case 'image':
-                $this->addElement(new FileElement($value, [
-                    'label'  => 'Image',
-                    'accept' => 'image/png, image/jpeg'
-                ]));
+                $this->addElement('file', $value, [
+                    'label'       => 'Image',
+                    'accept'      => ['image/png', 'image/jpeg', 'image/jpg'],
+                    'destination' => sys_get_temp_dir()
+                ]);
 
                 if (
                     $this->template !== null
@@ -262,7 +262,7 @@ protected function addColumnSettings($name, $label)
                 ) {
                     $this->add(Html::tag(
                         'p',
-                        ['style' => ['margin-left: 14em;']],
+                        ['class' => 'override-uploaded-file-hint'],
                         'Upload a new image to override the existing one'
                     ));
                 }

diff --git a/library/vendor/ipl/Html/src/FormElement/FileElement.php b/library/vendor/ipl/Html/src/FormElement/FileElement.php
diff --git a/public/css/module.less b/public/css/module.less
@@ -185,6 +185,10 @@
   border-top: 1px solid @gray-lighter;
 }
 
+.icinga-controls .override-uploaded-file-hint {
+  margin-left: 14em;
+}
+
 /* Form fallback styles, remove once <=2.9.5 support is dropped */
 
 .icinga-controls {