From 9f4f38bb0d97d77dab1f85c5e8d1fb5289145693 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 16 Jul 2020 19:50:53 +0300 Subject: [PATCH 1/4] webhook verify peer --- application/Espo/Core/Webhook/Sender.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/Espo/Core/Webhook/Sender.php b/application/Espo/Core/Webhook/Sender.php index a4c35ae8e5..6645b6cc6f 100644 --- a/application/Espo/Core/Webhook/Sender.php +++ b/application/Espo/Core/Webhook/Sender.php @@ -67,7 +67,7 @@ class Sender $handler = curl_init($webhook->get('url')); curl_setopt($handler, \CURLOPT_RETURNTRANSFER, true); curl_setopt($handler, \CURLOPT_FOLLOWLOCATION, true); - curl_setopt($handler, \CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($handler, \CURLOPT_SSL_VERIFYPEER, true); curl_setopt($handler, \CURLOPT_HEADER, true); curl_setopt($handler, \CURLOPT_CUSTOMREQUEST, 'POST'); curl_setopt($handler, \CURLOPT_CONNECTTIMEOUT, $connectTimeout); From f4d98f177c142538b2c847b7051393d851c41a08 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 16 Jul 2020 19:57:04 +0300 Subject: [PATCH 2/4] fix typos --- application/Espo/Resources/i18n/en_US/Admin.json | 2 +- application/Espo/Resources/i18n/en_US/Import.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/Espo/Resources/i18n/en_US/Admin.json b/application/Espo/Resources/i18n/en_US/Admin.json index 2630f41eec..9636b85193 100644 --- a/application/Espo/Resources/i18n/en_US/Admin.json +++ b/application/Espo/Resources/i18n/en_US/Admin.json @@ -269,7 +269,7 @@ "systemRequirements": "System Requirements for EspoCRM.", "apiUsers": "Separate users for integration purposes.", "webhooks": "Manage webhooks.", - "emailAddresses": "All emailes addresses stored in the system.", + "emailAddresses": "All email addresses stored in the system.", "phoneNumbers": "All phone numbers stored in the system.", "dashboardTemplates": "Deploy dashboards to users.", "layoutSets": "Collections of layouts that can be assigned to teams & portals.", diff --git a/application/Espo/Resources/i18n/en_US/Import.json b/application/Espo/Resources/i18n/en_US/Import.json index b72c70361f..2a86eb3c34 100644 --- a/application/Espo/Resources/i18n/en_US/Import.json +++ b/application/Espo/Resources/i18n/en_US/Import.json @@ -65,7 +65,7 @@ "removeDuplicates": "This will permanently remove all imported records that were recognized as duplicates.", "confirmRevert": "This will remove all imported records permanently. Are you sure?", "confirmRemoveDuplicates": "This will permanently remove all imported records that were recognized as duplicates. Are you sure?", - "confirmRemoveImportLog" : "This will remove the import log. All imported records will be kept. You won't be able to revert import results. Are you sure you?", + "confirmRemoveImportLog" : "This will remove the import log. All imported records will be kept. You won't be able to revert import results. Are you sure?", "removeImportLog": "This will remove the import log. All imported records will be kept. Use it if you are sure that import is fine." }, "fields": { From 3b25a1a001c01694b2361e71d2c17f42ba551fde Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 16 Jul 2020 19:59:46 +0300 Subject: [PATCH 3/4] error message 4 seconds --- client/src/ui.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/ui.js b/client/src/ui.js index bb296dff45..2662b20e3b 100644 --- a/client/src/ui.js +++ b/client/src/ui.js @@ -490,7 +490,7 @@ define('ui', [], function () { }, error: function (message) { - Espo.Ui.notify(message, 'error', 2000); + Espo.Ui.notify(message, 'error', 4000); }, info: function (message) { From 8fe96b140ac82f8c441cf17f2725f15f13e9307a Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 16 Jul 2020 20:14:48 +0300 Subject: [PATCH 4/4] tcpdf header --- application/Espo/Core/Pdf/Tcpdf.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/application/Espo/Core/Pdf/Tcpdf.php b/application/Espo/Core/Pdf/Tcpdf.php index 27c8374973..03da6ab085 100644 --- a/application/Espo/Core/Pdf/Tcpdf.php +++ b/application/Espo/Core/Pdf/Tcpdf.php @@ -27,6 +27,11 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ +/************************************************************************ + * This file contains code parts copied from TCPDF software library + * that is published under GNU Lesser General Public License. + ************************************************************************/ + namespace Espo\Core\Pdf; define('K_TCPDF_EXTERNAL_CONFIG', true);