From add1bcf48d372f98438d09db91f99e29f0446b0a Mon Sep 17 00:00:00 2001
From: Luca <lucas@devcode.it>
Date: Tue, 21 Feb 2023 18:16:21 +0100
Subject: [PATCH] Aggiornamento versione fullcalendar

Fix minori
---
 include/top.php                         | 2 +-
 modules/checklists/modutil.php          | 2 +-
 package.json                            | 2 +-
 plugins/importFE/actions.php            | 2 +-
 src/HTMLBuilder/Manager/FileManager.php | 9 ++++++++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/include/top.php b/include/top.php
index f91543d07..f5785fdad 100755
--- a/include/top.php
+++ b/include/top.php
@@ -130,7 +130,7 @@ if (Auth::check()) {
     echo '
                 allegati: {
                     messaggio: "'.tr('Clicca o trascina qui per caricare uno o più file').'",
-                    maxFilesize: "'.tr('Max upload: _SIZE_ MB').'",
+                    maxFilesize: "'.tr('Dimensione massima: _SIZE_ MB').'",
                     errore: "'.tr('Errore').'",
                     modifica: "'.tr('Modifica allegato').'",
                     elimina: "'.tr('Vuoi eliminare questo file?').'",
diff --git a/modules/checklists/modutil.php b/modules/checklists/modutil.php
index deb748846..8027ef8da 100755
--- a/modules/checklists/modutil.php
+++ b/modules/checklists/modutil.php
@@ -31,7 +31,7 @@ function renderChecklist($check, $level = 0)
     if (intval($check->assignedUsers->pluck('id')->toArray())>0){
         $result .= '<span class="label label-default">'. implode(',', $check->assignedUsers->pluck('username')->toArray()).'</span>';
     }else{
-        $result .= '<span class="label label-danger">'. tr('Nessun utente asseganto').'</span>';
+        $result .= '<span class="label label-danger">'. tr('Nessun utente assegnato').'</span>';
     }
 
     if (empty($check->user) || $check->user->id == $user->id) {
diff --git a/package.json b/package.json
index 7bdf18cc1..82746b2d8 100755
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "private": true,
     "main": "gulpfile.js",
     "dependencies": {
-        "@fullcalendar/moment": "^6.0.3",
+        "@fullcalendar/moment": "^6.1.4",
         "admin-lte": "^2.4.18",
         "autocompleter": "^6.1.1",
         "autonumeric": "^4.6.0",
diff --git a/plugins/importFE/actions.php b/plugins/importFE/actions.php
index 6b1250f14..71e69da53 100755
--- a/plugins/importFE/actions.php
+++ b/plugins/importFE/actions.php
@@ -198,7 +198,7 @@ switch (filter('op')) {
             redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_fattura);
         } elseif (!empty($file)) {
             redirect(base_path().'/editor.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'&id_record='.$id_record.'&sequence=1');
-            flash()->warning(tr('È stata appena creata la fattura numero _NUM_ del _DATA_ (_ANAGRAFICA_)', [
+            flash()->info(tr('La fattura numero _NUM_ del _DATA_ (_ANAGRAFICA_) è stata importata correttamente', [
                 '_NUM_' => $fattura->numero,
                 '_DATA_' => dateFormat($fattura->data),
                 '_ANAGRAFICA_' => $fattura->anagrafica->ragione_sociale,
diff --git a/src/HTMLBuilder/Manager/FileManager.php b/src/HTMLBuilder/Manager/FileManager.php
index acbf1054f..699b9d0ca 100755
--- a/src/HTMLBuilder/Manager/FileManager.php
+++ b/src/HTMLBuilder/Manager/FileManager.php
@@ -48,7 +48,14 @@ class FileManager implements ManagerInterface
         // ID del form
         $attachment_id = 'attachments_'.$options['id_module'].'_'.$options['id_plugin'];
 
-        $upload_max_filesize = ini_get('upload_max_filesize');
+        if (ini_get('upload_max_filesize') < ini_get('post_max_size')){
+            $upload_max_filesize = ini_get('upload_max_filesize');
+        }else if (ini_get('upload_max_filesize') > ini_get('post_max_size')){
+            $upload_max_filesize = ini_get('post_max_size');
+        }else{
+            $upload_max_filesize = ini_get('upload_max_filesize');
+        }
+
         $upload_max_filesize = substr($upload_max_filesize, 0, -1);
 
         $dbo = database();