From 4b649cd02019414888b2f8b720298757ae8420c7 Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Mon, 25 Oct 2021 16:39:37 +0200
Subject: [PATCH] Fix minori

---
 include/top.php                          | 9 +++++----
 modules/gestione_documentale/actions.php | 2 +-
 modules/newsletter/actions.php           | 2 +-
 modules/stato_servizi/edit.php           | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/top.php b/include/top.php
index c6e3843fa..bbaf487f8 100755
--- a/include/top.php
+++ b/include/top.php
@@ -213,21 +213,22 @@ if (Auth::check()) {
 					["Undo","Redo","-","Cut","Copy","Paste","PasteText","PasteFromWord","-","SpellChecker", "Scayt", "-","Link","Unlink","-","Bold","Italic","Underline","Superscript","SpecialChar","HorizontalRule","-","JustifyLeft","JustifyCenter","JustifyRight","JustifyBlock","-","NumberedList","BulletedList","Outdent","Indent","Blockquote","-","Styles","Format","Image","Table", "TextColor", "BGColor" ],
 				],
                 ckeditorToolbar_Full: [
-                    { name: "document", items : [ "Source", "ExportPdf", "Preview", "Print" ] },
+                    { name: "document", items : [ "Source", "ExportPdf", "Preview", "Print", "-", "Templates" ] },
                     { name: "clipboard", items : [ "Cut","Copy","Paste","PasteText","PasteFromWord","-","Undo","Redo" ] },
                     { name: "editing", items : [ "Find","Replace","-","SelectAll","-","SpellChecker", "Scayt" ] },
                     { name: "forms", items : [ "Form", "Checkbox", "Radio", "TextField", "Textarea", "Select", "Button", "ImageButton",
                         "HiddenField" ] },
                     "/",
-                    { name: "basicstyles", items : [ "Bold","Italic","Underline","Strike","Subscript","Superscript","-","RemoveFormat" ] },
+                    { name: "basicstyles", items : [ "Bold","Italic","Underline","Strike","Subscript","Superscript","-","CopyFormatting","RemoveFormat" ] },
                     { name: "paragraph", items : [ "NumberedList","BulletedList","-","Outdent","Indent","-","Blockquote","CreateDiv",
-                        "-","JustifyLeft","JustifyCenter","JustifyRight","JustifyBlock","-","BidiLtr","BidiRtl" ] },
+                        "-","JustifyLeft","JustifyCenter","JustifyRight","JustifyBlock","-","BidiLtr","BidiRtl","Language" ] },
                     { name: "links", items : [ "Link","Unlink","Anchor" ] },
                     { name: "insert", items : [ "Image","Flash","Table","HorizontalRule","Smiley","SpecialChar","PageBreak","Iframe" ] },
                     "/",
                     { name: "styles", items : [ "Styles","Format","Font","FontSize" ] },
                     { name: "colors", items : [ "TextColor","BGColor" ] },
-                    { name: "tools", items : [ "Maximize", "ShowBlocks","-","About" ] }
+                    { name: "tools", items : [ "Maximize", "ShowBlocks" ] },
+                    { name: "about", items: [ "About" ] }
                 ],
                 order_manager_id: "'.($dbo->isInstalled() ? Modules::get('Stato dei servizi')['id'] : '').'",
                 dataload_page_buffer: '.setting('Lunghezza in pagine del buffer Datatables').',
diff --git a/modules/gestione_documentale/actions.php b/modules/gestione_documentale/actions.php
index dce348512..4640a0d5a 100755
--- a/modules/gestione_documentale/actions.php
+++ b/modules/gestione_documentale/actions.php
@@ -36,7 +36,7 @@ switch (post('op')) {
         $dbo->update('do_documenti', [
             'idcategoria' => post('idcategoria'),
             'nome' => post('nome'),
-            'descrizione' => post('descrizione') ?: null,
+            'descrizione' => post('descrizione', true) ?: null,
             'data' => post('data') ?: null,
         ], ['id' => $id_record]);
 
diff --git a/modules/newsletter/actions.php b/modules/newsletter/actions.php
index f0d4ba719..983723f97 100755
--- a/modules/newsletter/actions.php
+++ b/modules/newsletter/actions.php
@@ -46,7 +46,7 @@ switch (filter('op')) {
         $newsletter->completed_at = filter('completed_at');
 
         $newsletter->subject = filter('subject');
-        $newsletter->content = $_POST['content']; //filter('content');
+        $newsletter->content = post('content', true); //filter('content');
 
         $newsletter->save();
 
diff --git a/modules/stato_servizi/edit.php b/modules/stato_servizi/edit.php
index efe6c1a7e..d7bb5e494 100755
--- a/modules/stato_servizi/edit.php
+++ b/modules/stato_servizi/edit.php
@@ -100,7 +100,7 @@ if (Services::isEnabled()) {
             
             if (!$risorse_in_scadenza->isEmpty()){
                 echo '
-                    <div class="alert alert-warning" role="alert"> <i class="fa fa-clock-o"></i> '.tr('Attenzione, _NUM_ risorse sono in scadenza o stanno per esaurire i crediti:', [
+                    <div class="alert alert-warning" role="alert"> <i class="fa fa-clock-o"></i> '.tr('Attenzione, alcune risorse sono in scadenza o stanno per esaurire i crediti:', [
                         '_NUM_' => $risorse_in_scadenza->count(),
                     ]).'</div>';
 
@@ -108,7 +108,7 @@ if (Services::isEnabled()) {
 
             if (!$risorse_scadute->isEmpty()){
                 echo '
-                    <div class="alert alert-danger" role="alert"> <i class="fa fa-exclamation-triangle"></i> '.tr('Attenzione, _NUM_ risorse sono scadute o hanno esaurito i crediti:', [
+                    <div class="alert alert-danger" role="alert"> <i class="fa fa-exclamation-triangle"></i> '.tr('Attenzione, alcune risorse sono scadute o hanno esaurito i crediti:', [
                         '_NUM_' => $risorse_scadute->count(),
                     ]).'</div>';
             }