From 81cb2aaeb8795a12d98cce88fcf47a84bfbe4283 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Mon, 9 Sep 2019 13:28:53 +0300
Subject: [PATCH 1/7] fix navbar tpl

---
 client/res/templates/site/navbar.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/res/templates/site/navbar.tpl b/client/res/templates/site/navbar.tpl
index 933344685d..b81c811c95 100644
--- a/client/res/templates/site/navbar.tpl
+++ b/client/res/templates/site/navbar.tpl
@@ -1,6 +1,6 @@
 <div class="navbar navbar-inverse" role="navigation">
     <div class="navbar-header">
-        <button type="button" class="navbar-toggle" data-action="toggleCollapsable"">
+        <button type="button" class="navbar-toggle" data-action="toggleCollapsable">
             <span class="fas fa-bars"></span>
         </button>
         <div class="navbar-logo-container"><a class="navbar-brand nav-link" href="#"><img src="{{logoSrc}}" class="logo"></span></a></div>

From f5e1b7175e7fda7f8e8a93ce970c1d7f0e29b07c Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Tue, 10 Sep 2019 11:03:56 +0300
Subject: [PATCH 2/7] utils checkActionAvailability

---
 client/src/utils.js                         | 20 ++++++++++++
 client/src/views/main.js                    | 12 +++----
 client/src/views/record/list.js             | 36 +++++----------------
 client/src/views/record/panels-container.js |  8 ++---
 4 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/client/src/utils.js b/client/src/utils.js
index b4bf2bf737..d8f68f3593 100644
--- a/client/src/utils.js
+++ b/client/src/utils.js
@@ -49,6 +49,26 @@ define('utils', [], function () {
             }
         },
 
+        checkActionAvailability: function (helper, item) {
+            var config = helper.config;
+
+            if (item.configCheck) {
+                var configCheck = item.configCheck;
+                var opposite = false;
+                if (configCheck.substr(0, 1) === '!') {
+                    opposite = true;
+                    configCheck = configCheck.substr(1);
+                }
+                var configCheckResult = config.getByPath(configCheck.split('.'));
+                if (opposite) {
+                    configCheckResult = !configCheckResult;
+                }
+                if (!configCheckResult) return false;
+            }
+
+            return true;
+        },
+
         checkActionAccess: function (acl, obj, item, isPrecise) {
             var hasAccess = true;
             if (item.acl) {
diff --git a/client/src/views/main.js b/client/src/views/main.js
index f1f64b5099..497443a014 100644
--- a/client/src/views/main.js
+++ b/client/src/views/main.js
@@ -87,15 +87,15 @@ define('views/main', 'view', function (Dep) {
             if (this.menu) {
                 ['buttons', 'actions', 'dropdown'].forEach(function (type) {
                     (this.menu[type] || []).forEach(function (item) {
+                        item = Espo.Utils.clone(item);
                         menu[type] = menu[type] || [];
-                        if (item.configCheck) {
-                            if (!this.getConfig().getByPath(item.configCheck.split('.'))) return;
-                        }
-                        if (Espo.Utils.checkActionAccess(this.getAcl(), this.model || this.scope, item)) {
-                            menu[type].push(item);
-                        }
+
+                        if (!Espo.Utils.checkActionAvailability(this.getHelper(), item)) return;
+                        if (!Espo.Utils.checkActionAccess(this.getAcl(), this.model || this.scope, item)) return;
+
                         item.name = item.name || item.action;
                         item.action = item.action || this.name;
+                        menu[type].push(item);
                     }, this);
                 }, this);
             }
diff --git a/client/src/views/record/list.js b/client/src/views/record/list.js
index 359bdd7ff3..ca380086e3 100644
--- a/client/src/views/record/list.js
+++ b/client/src/views/record/list.js
@@ -908,20 +908,10 @@ define('views/record/list', 'view', function (Dep) {
 
             (this.getMetadata().get(['clientDefs', this.scope, 'massActionList']) || []).forEach(function (item) {
                 var defs = this.getMetadata().get(['clientDefs', this.scope, 'massActionDefs', item]) || {};
-                var acl = defs.acl;
-                var aclScope = defs.aclScope;
-                if (acl || aclScope) {
-                    if (!this.getAcl().check(aclScope || this.scope, acl)) {
-                        return;
-                    }
-                }
-                var configCheck = defs.configCheck;
-                if (configCheck) {
-                    var arr = configCheck.split('.');
-                    if (!this.getConfig().getByPath(arr)) {
-                        return;
-                    }
-                }
+
+                if (!Espo.Utils.checkActionAvailability(this.getHelper(), defs)) return;
+                if (!Espo.Utils.checkActionAccess(this.getAcl(), null, defs)) return;
+
                 this.massActionList.push(item);
             }, this);
 
@@ -937,20 +927,10 @@ define('views/record/list', 'view', function (Dep) {
                 if (this.collection.url !== this.entityType) return;
                 if (~this.massActionList.indexOf(item)) {
                     var defs = this.getMetadata().get(['clientDefs', this.scope, 'massActionDefs', item]) || {};
-                    var acl = defs.acl;
-                    var aclScope = defs.aclScope;
-                    if (acl || aclScope) {
-                        if (!this.getAcl().check(aclScope || this.scope, acl)) {
-                            return;
-                        }
-                    }
-                    var configCheck = defs.configCheck;
-                    if (configCheck) {
-                        var arr = configCheck.split('.');
-                        if (!this.getConfig().getByPath(arr)) {
-                            return;
-                        }
-                    }
+
+                    if (!Espo.Utils.checkActionAvailability(this.getHelper(), defs)) return;
+                    if (!Espo.Utils.checkActionAccess(this.getAcl(), null, defs)) return;
+
                     this.checkAllResultMassActionList.push(item);
                 }
             }, this);
diff --git a/client/src/views/record/panels-container.js b/client/src/views/record/panels-container.js
index 6ebb4b510e..5763aece38 100644
--- a/client/src/views/record/panels-container.js
+++ b/client/src/views/record/panels-container.js
@@ -82,11 +82,9 @@ define('views/record/panels-container', 'view', function (Dep) {
         applyAccessToActions: function (actionList) {
             if (!actionList) return;
             actionList.forEach(function (item) {
-                if (item.configCheck) {
-                    if (!this.getConfig().getByPath(item.configCheck.split('.'))) {
-                        item.hidden = true;
-                        return;
-                    }
+                if (!Espo.Utils.checkActionAvailability(this.getHelper(), item)) {
+                    item.hidden = true;
+                    return;
                 }
                 if (Espo.Utils.checkActionAccess(this.getAcl(), this.model, item, true)) {
                     if (item.isHiddenByAcl) {

From 739cb5e98f0fbc22ec922dccb31a2e46c66cde69 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Tue, 10 Sep 2019 11:04:13 +0300
Subject: [PATCH 3/7] emailFoldersDisabled param

---
 .../Espo/Resources/metadata/clientDefs/Email.json     |  3 ++-
 client/src/views/email/list.js                        | 11 ++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/application/Espo/Resources/metadata/clientDefs/Email.json b/application/Espo/Resources/metadata/clientDefs/Email.json
index 54b54fe8e5..ae08e8f907 100644
--- a/application/Espo/Resources/metadata/clientDefs/Email.json
+++ b/application/Espo/Resources/metadata/clientDefs/Email.json
@@ -45,7 +45,8 @@
                 },
                 {
                     "label":"Folders",
-                    "link":"#EmailFolder"
+                    "link":"#EmailFolder",
+                    "configCheck": "!emailFoldersDisabled"
                 },
                 {
                     "label":"Filters",
diff --git a/client/src/views/email/list.js b/client/src/views/email/list.js
index 77a63b4dab..6a53532b26 100644
--- a/client/src/views/email/list.js
+++ b/client/src/views/email/list.js
@@ -26,7 +26,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-Espo.define('views/email/list', 'views/list', function (Dep) {
+define('views/email/list', 'views/list', function (Dep) {
 
     return Dep.extend({
 
@@ -65,13 +65,18 @@ Espo.define('views/email/list', 'views/list', function (Dep) {
             }
 
             this.foldersDisabled = this.foldersDisabled ||
-                                   this.getMetadata().get(['scopes', this.folderScope, 'disabled']) ||
-                                   !this.getAcl().checkScope(this.folderScope);
+                this.getConfig().get('emailFoldersDisabled') ||
+                this.getMetadata().get(['scopes', this.folderScope, 'disabled']) ||
+                !this.getAcl().checkScope(this.folderScope);
 
             var params = this.options.params || {};
 
             this.selectedFolderId = params.folder || this.defaultFolderId;
 
+            if (this.foldersDisabled) {
+                this.selectedFolderId = null;
+            }
+
             this.applyFolder();
         },
 

From 7ffd8a54a1c582fc417d561c720deda00187470d Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Tue, 10 Sep 2019 11:07:44 +0300
Subject: [PATCH 4/7] v

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c9cc5aab28..8483a6149e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "espocrm",
-  "version": "5.6.12",
+  "version": "5.6.13",
   "description": "",
   "main": "index.php",
   "repository": {

From 83fa22852afcd380a3553fde7bbde496a1369c56 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Tue, 10 Sep 2019 16:52:42 +0300
Subject: [PATCH 5/7] lang no quote escaping

---
 application/Espo/Core/Utils/Language.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/Espo/Core/Utils/Language.php b/application/Espo/Core/Utils/Language.php
index ef34ab992b..15bd123942 100644
--- a/application/Espo/Core/Utils/Language.php
+++ b/application/Espo/Core/Utils/Language.php
@@ -403,7 +403,6 @@ class Language
                 if (is_string($subData)) {
                     $subData = str_replace('<', '&lt;', $subData);
                     $subData = str_replace('>', '&gt;', $subData);
-                    $subData = str_replace('"', '&quot;', $subData);
                 }
             }
         }

From ac80f67533f2c68cdcdf55989244b3ea8cce269a Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Wed, 11 Sep 2019 15:55:02 +0300
Subject: [PATCH 6/7] fix view helper

---
 client/src/view-helper.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/view-helper.js b/client/src/view-helper.js
index b0d4b3272f..6e1cf179e1 100644
--- a/client/src/view-helper.js
+++ b/client/src/view-helper.js
@@ -314,6 +314,8 @@ define('view-helper', ['lib!client/lib/purify.min.js'], function () {
                 text = text.replace(item.regex, item.value);
             });
 
+            options = options || {};
+
             if (options.inline) {
                 text = marked.inlineLexer(text, []);
             } else {

From 022d9a42ecde410fd784d8af7a155383fe1815e4 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Thu, 12 Sep 2019 11:06:57 +0300
Subject: [PATCH 7/7] transfromMarkdownText

---
 client/src/view-helper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/view-helper.js b/client/src/view-helper.js
index 6e1cf179e1..a7a072e4b2 100644
--- a/client/src/view-helper.js
+++ b/client/src/view-helper.js
@@ -322,7 +322,7 @@ define('view-helper', ['lib!client/lib/purify.min.js'], function () {
                 text = marked(text);
             }
 
-            text = DOMPurify.sanitize(text);
+            text = DOMPurify.sanitize(text).toString();
 
             text = text.replace(/<a href="mailto:(.*)"/gm, '<a href="javascript:" data-email-address="$1" data-action="mailTo"');