8.2.5

application/Espo/Core/Formula/Parser.php

@@ -867,7 +867,10 @@ class Parser
                         break;
                     }
 
-                    if ($expressionOutOfParenthesisList[$index]) {
+                    if (
+                        $expressionOutOfParenthesisList[$index] &&
+                        !$this->isAtAnotherOperator($index, $operator, $modifiedExpression)
+                    ) {
                         break;
                     }
 
@@ -878,38 +881,26 @@ class Parser
                     continue;
                 }
 
-                $possibleRightOperator = null;
+                if ($operator === '+' || $operator === '-') {
+                    $j = $index - 1;
 
-                if (strlen($operator) === 1) {
-                    if ($index < strlen($expression) - 1) {
-                        $possibleRightOperator = trim($operator . $modifiedExpression[$index + 1]);
+                    while ($j >= 0) {
+                        $char = $expression[$j];
+
+                        if ($this->isWhiteSpace($char)) {
+                            $j--;
+
+                            continue;
+                        }
+
+                        if (array_key_exists($char, $this->operatorMap)) {
+                            continue 2;
+                        }
+
+                        break;
                     }
                 }
 
-                if (
-                    $possibleRightOperator &&
-                    $possibleRightOperator != $operator &&
-                    !empty($this->operatorMap[$possibleRightOperator])
-                ) {
-                    continue;
-                }
-
-                $possibleLeftOperator = null;
-
-                if (strlen($operator) === 1) {
-                    if ($index > 0) {
-                        $possibleLeftOperator = trim($modifiedExpression[$index - 1] . $operator);
-                    }
-                }
-
-                if (
-                    $possibleLeftOperator &&
-                    $possibleLeftOperator != $operator &&
-                    !empty($this->operatorMap[$possibleLeftOperator])
-                ) {
-                    continue;
-                }
-
                 $firstPart = substr($expression, 0, $index);
                 $secondPart = substr($expression, $index + strlen($operator));
 
@@ -1056,6 +1047,43 @@ class Parser
         return new Attribute($expression);
     }
 
+    private function isAtAnotherOperator(int $index, string $operator, string $expression): bool
+    {
+        $possibleRightOperator = null;
+
+        if (strlen($operator) === 1) {
+            if ($index < strlen($expression) - 1) {
+                $possibleRightOperator = trim($operator . $expression[$index + 1]);
+            }
+        }
+
+        if (
+            $possibleRightOperator &&
+            $possibleRightOperator != $operator &&
+            !empty($this->operatorMap[$possibleRightOperator])
+        ) {
+            return true;
+        }
+
+        $possibleLeftOperator = null;
+
+        if (strlen($operator) === 1) {
+            if ($index > 0) {
+                $possibleLeftOperator = trim($expression[$index - 1] . $operator);
+            }
+        }
+
+        if (
+            $possibleLeftOperator &&
+            $possibleLeftOperator != $operator &&
+            !empty($this->operatorMap[$possibleLeftOperator])
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * @param (StatementRef|IfRef|WhileRef)[] $statementList
      * @throws SyntaxError

application/Espo/Core/Htmlizer/Htmlizer.php

@@ -842,6 +842,10 @@ class Htmlizer
 
     private function handleIteration(string $template): string
     {
+        if ($template === '') {
+            return $template;
+        }
+
         if (!extension_loaded('dom')) {
             $this->log?->warning("Extension 'dom' is not enabled. HTML templating functionality is restricted.");
 

application/Espo/Resources/metadata/app/regExpPatterns.json

@@ -29,11 +29,11 @@
         "isSystem": true
     },
     "uriOptionalProtocol": {
-        "pattern": "([a-zA-Z0-9]+\\:\\/\\/)?[a-zA-Z0-9%\\.\\/\\?\\:@\\-_=#$!+*\\(\\)',]+\\.([a-zA-Z0-9%\\&\\.\\/\\?\\:@\\-_=#$!+*\\(\\)',])*",
+        "pattern": "([a-zA-Z0-9]+\\:\\/\\/)?[a-zA-Z0-9%\\.\\/\\?\\:@\\-_=#$!+*\\(\\)',]+\\.([a-zA-Z0-9%\\&\\.\\/\\?\\:@\\-_=#$!+*\\(\\)',~])*",
         "isSystem": true
     },
     "uri": {
-        "pattern": "([a-zA-Z0-9]+\\:\\/\\/){1}[a-zA-Z0-9%\\.\\/\\?\\:@\\-_=#$!+*\\(\\)',]+\\.([a-zA-Z0-9%\\&\\.\\/\\?\\:@\\-_=#$!+*\\(\\)',])*",
+        "pattern": "([a-zA-Z0-9]+\\:\\/\\/){1}[a-zA-Z0-9%\\.\\/\\?\\:@\\-_=#$!+*\\(\\)',]+\\.([a-zA-Z0-9%\\&\\.\\/\\?\\:@\\-_=#$!+*\\(\\)',~])*",
         "isSystem": true
     }
 }

client/modules/crm/src/views/calendar/calendar.js

@@ -624,8 +624,8 @@ class CalendarView extends View {
         if (this.allDayScopeList.includes(event.scope)) {
             event.allDay = event.allDayCopy = true;
 
-            if (!notInitial && end) {
-                start = end;
+            if (/*!notInitial &&*/ end) {
+                start = end.clone();
 
                 if (
                     !event.dateEndDate &&
@@ -636,6 +636,10 @@ class CalendarView extends View {
                 }
             }
 
+            if (start.isSame(end)) {
+                end.add(1, 'days');
+            }
+
             if (start) {
                 event.start = start.toDate();
             }

client/src/views/fields/url-multiple.js

@@ -53,13 +53,32 @@ class UrlMultipleFieldView extends ArrayFieldView {
             value = this.strip(value);
         }
 
-        if (value === decodeURI(value)) {
-            value = encodeURI(value);
+        try {
+            if (value === decodeURI(value)) {
+                value = encodeURI(value);
+            }
+        } catch (e) {
+            console.warn(`Malformed URI ${value}.`);
         }
 
         super.addValueFromUi(value);
     }
 
+    /**
+     * @private
+     * @param {string} value
+     * @return {string}
+     */
+    decodeURI(value) {
+        try {
+            return decodeURI(value);
+        } catch (e) {
+            console.warn(`Malformed URI ${value}.`);
+
+            return value;
+        }
+    }
+
     /**
      * @param {string} value
      * @return {string}
@@ -88,7 +107,7 @@ class UrlMultipleFieldView extends ArrayFieldView {
             return $('<a>')
                 .attr('href', this.prepareUrl(value))
                 .attr('target', '_blank')
-                .text(decodeURI(value));
+                .text(this.decodeURI(value));
         });
 
         return $list
@@ -111,7 +130,7 @@ class UrlMultipleFieldView extends ArrayFieldView {
                 .attr('href', this.prepareUrl(value))
                 .css('user-drag', 'none')
                 .attr('target', '_blank')
-                .text(decodeURI(value))
+                .text(this.decodeURI(value))
         );
 
         return $item.get(0).outerHTML;

client/src/views/fields/url.js

@@ -70,7 +70,7 @@ class UrlFieldView extends VarcharFieldView {
                     return;
                 }
 
-                const decoded = parsedValue ? decodeURI(parsedValue) : '';
+                const decoded = parsedValue ? this.decodeURI(parsedValue) : '';
 
                 this.$element.val(decoded);
             });
@@ -80,7 +80,22 @@ class UrlFieldView extends VarcharFieldView {
     getValueForDisplay() {
         const value = this.model.get(this.name);
 
-        return value ? decodeURI(value) : null;
+        return value ? this.decodeURI(value) : null;
+    }
+
+    /**
+     * @private
+     * @param {string} value
+     * @return {string}
+     */
+    decodeURI(value) {
+        try {
+            return decodeURI(value);
+        } catch (e) {
+            console.warn(`Malformed URI ${value}.`);
+
+            return value;
+        }
     }
 
     /**
@@ -94,8 +109,14 @@ class UrlFieldView extends VarcharFieldView {
             value = this.strip(value);
         }
 
-        if (value === decodeURI(value)) {
-            value = encodeURI(value);
+        try {
+            if (value === decodeURI(value)) {
+                value = encodeURI(value);
+            }
+        } catch (e) {
+            console.warn(`Malformed URI ${value}.`);
+
+            return value;
         }
 
         return value;

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "espocrm",
-  "version": "8.2.4",
+  "version": "8.2.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "espocrm",
-      "version": "8.2.4",
+      "version": "8.2.5",
       "hasInstallScript": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "espocrm",
-  "version": "8.2.4",
+  "version": "8.2.5",
   "description": "Open-source CRM.",
   "repository": {
     "type": "git",

tests/unit/Espo/Core/Formula/EvaluatorTest.php

@@ -1392,4 +1392,34 @@ class EvaluatorTest extends \PHPUnit\Framework\TestCase
 
         $this->assertEquals("=", $vars->a);
     }
+
+    public function testAssignAndLogical1(): void
+    {
+        $expression = "\$a = 'a' == 'a'";
+
+        $vars = (object) [];
+
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $this->evaluator->process($expression, null, $vars);
+
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $this->evaluator->process($expression);
+
+        $this->assertTrue($vars->a);
+    }
+
+    public function testAssignAndLogical2(): void
+    {
+        $expression = "\$a = 'a' == 'a' && 'b' == 'b'";
+
+        $vars = (object) [];
+
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $this->evaluator->process($expression, null, $vars);
+
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $this->evaluator->process($expression);
+
+        $this->assertTrue($vars->a);
+    }
 }