Remove br from save and add to presentation

iszmais · Jul 2, 2024 · e5f24f0 · e5f24f0
1 parent 64600db
commit e5f24f0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/Modules/DataCollection/classes/Content/class.ilDclRecordListGUI.php b/Modules/DataCollection/classes/Content/class.ilDclRecordListGUI.php
@@ -203,7 +203,7 @@ public function listRecords(bool $use_tableview_filter = false): void
             if ($ilSetting->get('advanced_editing_javascript_editor')) {
                 $desc = "<div class='ilDclTableDescription'>" . $desc . "</div>";
             } else {
-                $desc = "<div class='ilDclTableDescription'>" . nl2br(ilUtil::stripSlashes($desc)) . "</div>";
+                $desc = "<div class='ilDclTableDescription'>" .  nl2br(htmlspecialchars($desc, ENT_QUOTES | ENT_SUBSTITUTE, 'utf-8')) . "</div>";
             }
         }
         $this->tpl->setContent($desc . $list->getHTML());

diff --git a/Modules/DataCollection/classes/Fields/Text/class.ilDclTextFieldModel.php b/Modules/DataCollection/classes/Fields/Text/class.ilDclTextFieldModel.php
@@ -88,7 +88,7 @@ public function checkValidity($value, ?int $record_id = null): bool
                 //for text it has to be case insensitive.
                 $record_value = $record->getRecordFieldValue($this->getId());
 
-                if (strtolower((string) $this->normalizeValue($record_value)) == strtolower((string) $this->normalizeValue(nl2br($value)))
+                if (strtolower((string) $this->normalizeValue($record_value)) == strtolower((string) $this->normalizeValue($value))
                     && ($record->getId() != $record_id
                         || $record_id == 0)
                 ) {

diff --git a/Modules/DataCollection/classes/Fields/Text/class.ilDclTextRecordFieldModel.php b/Modules/DataCollection/classes/Fields/Text/class.ilDclTextRecordFieldModel.php
@@ -133,7 +133,7 @@ public function parseValue($value)
         if ($this->getField()->getProperty(ilDclBaseFieldModel::PROP_TEXTAREA)
             && !$this->getField()->getProperty(ilDclBaseFieldModel::PROP_URL)
         ) {
-            return nl2br($value);
+            return $value;
         }
 
         return $value;

diff --git a/Modules/DataCollection/classes/Fields/Text/class.ilDclTextRecordRepresentation.php b/Modules/DataCollection/classes/Fields/Text/class.ilDclTextRecordRepresentation.php
@@ -83,7 +83,7 @@ public function getHTML(bool $link = true, array $options = []): string
                 'renderRecord'
             ) . '">' . $value . '</a>';
         } else {
-            $html = (is_array($value) && isset($value['link'])) ? $value['link'] : $value;
+            $html = (is_array($value) && isset($value['link'])) ? $value['link'] : nl2br($value);
         }
 
         if (!$html) {

diff --git a/Modules/DataCollection/classes/Setup/class.ilDataCollectionDBUpdateSteps9.php b/Modules/DataCollection/classes/Setup/class.ilDataCollectionDBUpdateSteps9.php
@@ -175,4 +175,16 @@ public function step_11(): void
             [ilDclDatatype::INPUTFORMAT_MOB]
         );
     }
+
+    public function step_12(): void
+    {
+        $this->db->manipulateF(
+            'UPDATE il_dcl_stloc1_value v '.
+            'INNER JOIN il_dcl_record_field rf ON rf.id = v.record_field_id ' .
+            'INNER JOIN il_dcl_field f ON f.id = rf.field_id ' .
+            'SET v.value = REPLACE(v.value, "<br />", "\r\n") WHERE f.datatype_id = %s',
+            [ilDBConstants::T_INTEGER],
+            [ilDclDatatype::INPUTFORMAT_TEXT]
+        );
+    }
 }