it-at-m · ThomasAFink · Nov 12, 2024 · Nov 14, 2024 · Nov 14, 2024 · Nov 14, 2024
diff --git a/mellon/src/Mellon/Collection.php b/mellon/src/Mellon/Collection.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/Condition.php b/mellon/src/Mellon/Condition.php
@@ -7,7 +7,6 @@
  */
 class Condition
 {
-
     protected $collection = [];
 
     public function __construct(Valid ...$validList)

diff --git a/mellon/src/Mellon/Exception.php b/mellon/src/Mellon/Exception.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/Failure/Exception.php b/mellon/src/Mellon/Failure/Exception.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/Failure/Message.php b/mellon/src/Mellon/Failure/Message.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/Failure/MessageList.php b/mellon/src/Mellon/Failure/MessageList.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/Parameter.php b/mellon/src/Mellon/Parameter.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
@@ -12,7 +13,6 @@
   */
 abstract class Parameter
 {
-
     /**
       * value of parameter
       *

diff --git a/mellon/src/Mellon/Unvalidated.php b/mellon/src/Mellon/Unvalidated.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/Valid.php b/mellon/src/Mellon/Valid.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
@@ -13,7 +14,6 @@
   */
 class Valid extends \BO\Mellon\Parameter
 {
-
     /**
       * validation errors
       *

diff --git a/mellon/src/Mellon/ValidArray.php b/mellon/src/Mellon/ValidArray.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
  **/
@@ -11,7 +12,6 @@
   */
 class ValidArray extends \BO\Mellon\Valid
 {
-
     /**
      * Allow native arrays anc class replacements
      *
@@ -21,7 +21,8 @@ class ValidArray extends \BO\Mellon\Valid
      */
     public function isArray($message = 'no valid array')
     {
-        if (is_array($this->value)
+        if (
+            is_array($this->value)
             || (
                 $this->value instanceof \Traversable
                 && $this->value instanceof \Countable

diff --git a/mellon/src/Mellon/ValidBool.php b/mellon/src/Mellon/ValidBool.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
  **/
@@ -11,7 +12,6 @@
   */
 class ValidBool extends Valid
 {
-
     /**
      * Allow only boolean values like
      * Allowed values are:

diff --git a/mellon/src/Mellon/ValidDate.php b/mellon/src/Mellon/ValidDate.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/ValidDatetime.php b/mellon/src/Mellon/ValidDatetime.php
@@ -1,12 +1,13 @@
 <?php
+
 /**
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
  **/
 
 namespace BO\Mellon;
 
-use \DateTimeImmutable;
-use \DateTime;
+use DateTimeImmutable;
+use DateTime;
 
 class ValidDatetime extends Valid
 {

diff --git a/mellon/src/Mellon/ValidFile.php b/mellon/src/Mellon/ValidFile.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
@@ -44,7 +45,8 @@ public function isFile($name = 'fileupload', $message = 'No valid file found.')
     public function hasType($type = 'jpeg', $message = 'Invalid file type.')
     {
         if (isset($_FILES[$this->fileName])) {
-            if ((! empty($_FILES[$this->fileName]["type"])) &&
+            if (
+                (! empty($_FILES[$this->fileName]["type"])) &&
                 ($_FILES[$this->fileName]['type'] != $this->acceptableTypes[$type])
             ) {
                 $this->setFailure($message);

diff --git a/mellon/src/Mellon/ValidJson.php b/mellon/src/Mellon/ValidJson.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
@@ -14,7 +15,6 @@
   */
 class ValidJson extends Valid
 {
-
     protected $originalJsonString = null;
     protected $defaultJsonString = '{}';
 

diff --git a/mellon/src/Mellon/ValidMail.php b/mellon/src/Mellon/ValidMail.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/ValidNumber.php b/mellon/src/Mellon/ValidNumber.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
  **/
@@ -11,7 +12,6 @@
   */
 class ValidNumber extends Valid
 {
-
     /**
      * Allow only integer numbers
      *

diff --git a/mellon/src/Mellon/ValidPath.php b/mellon/src/Mellon/ValidPath.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
  **/

diff --git a/mellon/src/Mellon/ValidString.php b/mellon/src/Mellon/ValidString.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
  **/
@@ -11,7 +12,6 @@
   */
 class ValidString extends Valid
 {
-
     /**
      * Allow strings smaller than 64kb and do htmlspecialchars()
      *

diff --git a/mellon/src/Mellon/ValidUrl.php b/mellon/src/Mellon/ValidUrl.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/ValidationException.php b/mellon/src/Mellon/ValidationException.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/Validator.php b/mellon/src/Mellon/Validator.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/zmsadmin/js/page/availabilityDay/form/conflicts.js b/zmsadmin/js/page/availabilityDay/form/conflicts.js
@@ -11,26 +11,31 @@ const renderConflictList = (conflictList) => {
     let conflictDatesByMessage = [];
     conflictList.map(collection => {
         collection.conflicts.map((conflict) => {
-            if (! conflictDatesByMessage[conflict.message]) {
-                Object.assign({}, conflictDatesByMessage[conflict.message] = []);
+            const existingConflict = conflictDatesByMessage.find(
+                item => item.message === conflict.message
+            );
+
+            if (existingConflict) {
+                existingConflict.dates.push(formatDate(collection.date));
+            } else {
+                conflictDatesByMessage.push({
+                    message: conflict.message,
+                    dates: [formatDate(collection.date)]
+                });
             }
-            conflictDatesByMessage[conflict.message].push(formatDate(collection.date))
-        })
-    })
+        });
+    });
 
     return (
-        Object.keys(conflictDatesByMessage).map((key, index) => {
-            return (
-                <div key={index}>
-                    <div><strong>{ conflictDatesByMessage[key].join(", ")  }</strong></div>
-                    <div key={index}>- {key}</div>
-                </div>
-            )
-        })
-    )
-
-
-}
+        conflictDatesByMessage.map((item, index) => (
+            <div key={index} style={{ marginBottom: '1rem' }}>
+                {/* Convert newlines in the message to <br /> tags */}
+                <div dangerouslySetInnerHTML={{ __html: item.message.replace(/\n/g, '<br />') }} />
-                <div dangerouslySetInnerHTML={{ __html: item.message.replace(/\n/g, '<br />') }} />
+import DOMPurify from 'dompurify';
+// ... other imports
+
+// Line 33 update:
+                <div dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(item.message.replace(/\n/g, '<br />')) }} />
-                <div dangerouslySetInnerHTML={{ __html: item.message.replace(/\n/g, '<br />') }} />
+// Line 33 update:
+                <div style={{ whiteSpace: 'pre-line' }}>{item.message}</div>
-                <div dangerouslySetInnerHTML={{ __html: item.message.replace(/\n/g, '<br />') }} />
+import DOMPurify from 'dompurify';
+// ... other imports
+
+// Line 33 update:
+                <div dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(item.message.replace(/\n/g, '<br />')) }} />
-                <div dangerouslySetInnerHTML={{ __html: item.message.replace(/\n/g, '<br />') }} />
+// Line 33 update:
+                <div style={{ whiteSpace: 'pre-line' }}>{item.message}</div>
+            </div>
+        ))
+    );
+};
+
 
 const Conflicts = (props) => {
     const conflicts = Object.keys(props.conflictList).map(key => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ @@
      */
     class Condition
     {
         protected $collection = [];
         public function __construct(Valid ...$validList)
@@ Expand Down @@