From 42e39e48971a5f5932b85e5d39aa1e9c4d135431 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sun, 28 Jan 2024 11:27:15 +0100
Subject: [PATCH] Correct merge

---
 html/css/style-classic7.css      |  2 --
 include/class/document.class.php |  2 +-
 include/constant.php             |  2 +-
 include/sql/patch/upgrade192.sql | 10 ++++++++++
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 include/sql/patch/upgrade192.sql

diff --git a/html/css/style-classic7.css b/html/css/style-classic7.css
index 3a5990fc9..00cc18cd7 100644
--- a/html/css/style-classic7.css
+++ b/html/css/style-classic7.css
@@ -44,7 +44,6 @@ input:focus {
     font-style: italic;
     background-color:transparent;
     font-size: 100%;
-    font-weight: 1.0;
     padding: 0px;
     margin: 0px;
     font-family: sans-serif;
@@ -504,7 +503,6 @@ a.detail
     font-family: 'openSansRegular';
     text-decoration: underline;
     display: block;
-    color: #eb2208;
     font-weight: normal;
     background-color: transparent;
 }
diff --git a/include/class/document.class.php b/include/class/document.class.php
index b55d58e7d..6a6881d25 100644
--- a/include/class/document.class.php
+++ b/include/class/document.class.php
@@ -492,7 +492,7 @@ class Document
                 $this->d_filename=$_FILES['file_upload']['name'][$i];
                 $this->d_mimetype=$_FILES['file_upload']['type'][$i];
                 if ( isset($aDescription[$i])) {
-                    $description=$aDescription[$i];
+                    $description=strip_tags($aDescription[$i]??"");
                 }
                 $this->d_description=$description;
                 // insert into  the table
diff --git a/include/constant.php b/include/constant.php
index 05c93f435..375b47214 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -123,7 +123,7 @@ if (!defined("NOALYSS_PACKAGE_REPOSITORY")) {
 if (!defined("SYSINFO_DISPLAY")) {
     define("SYSINFO_DISPLAY", TRUE);
 }
-define("DBVERSION", 192);
+define("DBVERSION", 193);
 define("MONO_DATABASE", 25);
 define("DBVERSIONREPO", 20);
 define('NOTFOUND', '--not found--');
diff --git a/include/sql/patch/upgrade192.sql b/include/sql/patch/upgrade192.sql
new file mode 100644
index 000000000..920f2cf42
--- /dev/null
+++ b/include/sql/patch/upgrade192.sql
@@ -0,0 +1,10 @@
+begin;
+create table action_comment_document (acd_id bigint generated by default  as identity primary key
+    , document_id bigint references document(d_id) on delete cascade on update cascade,
+                                      action_gestion_comment_id bigint references action_gestion_comment(agc_id) on delete cascade on update cascade);
+
+alter table action_comment_document
+    add constraint action_comment_document_un
+        unique (document_id, action_gestion_comment_id);
+insert into version (val,v_description) values (193,' 2332: Suivi : ajout fichier lié aux commentaires');
+commit;
\ No newline at end of file