v

Co-authored-by: David Moškoř <david.moskor@apertia.cz>

.editorconfig

@@ -4,8 +4,7 @@ root = true
 [*]
 indent_style = space
 indent_size = 4
-end_of_line = lf
+end_of_line = crlf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-

.gitattributes

@@ -8,4 +8,9 @@
 *.tpl text eol=crlf
 *.html text eol=crlf
 
+bin/command text eol=lf
+
+.gitattributes text eol=crlf
+.gitignore text eol=crlf
+
 *.png binary

.github/SECURITY.md

@@ -6,4 +6,4 @@ If you believe you have discovered a vulnerability in EspoCRM please contacts us
 
 ## Supported versions
 
-For severe vulnerabilities we provide fixes for 2 minor versions (the second number in the version string) back from the current stable version. Separate patches or manual fix guidelines will be provided for more old versions.
+For severe vulnerabilities we provide fixes for 2 minor versions (the second number in the version string) back from the current stable version.

.github/workflows/test-integration.yml

@@ -19,7 +19,6 @@ jobs:
         image: mysql:8.0
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: false
-          MYSQ_USER: root
           MYSQL_ROOT_PASSWORD: password
           MYSQL_DATABASE: integration_test
         ports:
@@ -28,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.1']
+        php-versions: ['8.0', '8.1', '8.2']
         branches: ['master']
 
     steps:

.github/workflows/test.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['8.0', '8.1', '8.2']
 
     steps:
     - uses: actions/checkout@v2

.htaccess

@@ -24,11 +24,6 @@ Options -Indexes
     # Skip redirect for `client` dir.
     RewriteRule ^client/ - [L]
 
-# {#dev}
-    # Skip redirect for `node_modules` dir. Actual only for dev environment.
-    RewriteRule ^node_modules/ - [L]
-# {/dev}
-
     # Store base path.
     RewriteCond %{REQUEST_URI}::$1 ^(.*?/)(.*)::\2$
     RewriteRule ^(.*)$ - [E=BASE:%1]

.idea/.gitignore

@@ -0,0 +1,6 @@
+*
+!.gitignore
+!/codeStyles
+!/fileTemplates
+!/inspectionProfiles
+!misc.xml

.idea/codeStyles/Project.xml

@@ -0,0 +1,20 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <PHPCodeStyleSettings>
+      <option name="GROUP_USE_WRAP" value="2" />
+      <option name="VARIABLE_NAMING_STYLE" value="CAMEL_CASE" />
+      <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
+      <option name="FORCE_EMPTY_METHODS_IN_ONE_LINE" value="true" />
+    </PHPCodeStyleSettings>
+    <codeStyleSettings language="PHP">
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+      <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="ALIGN_MULTILINE_FOR" value="false" />
+      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/fileTemplates/includes/PHP File Header.php

@@ -0,0 +1,27 @@
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-${YEAR} Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/

.idea/fileTemplates/internal/JavaScript File.js

@@ -0,0 +1 @@
+#parse("PHP File Header.php")

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,19 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="DuplicatedCode" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6ConvertVarToLetConst" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSIgnoredPromiseFromCall" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpDocMissingThrowsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpDocSignatureIsNotCompleteInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpMissingFieldTypeInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpMissingParamTypeInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpMissingReturnTypeInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpStanGlobal" enabled="false" level="WEAK WARNING" enabled_by_default="false">
+      <option name="config" value="$PROJECT_DIR$/phpstan.neon" />
+    </inspection_tool>
+    <inspection_tool class="PhpSwitchStatementWitSingleBranchInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PsalmAdvanceCallableParamsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TrivialIfJS" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>

.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpEntryPointsManager">
+    <pattern value="\Espo\Controllers\*" member="*Action*" />
+    <pattern value="\Espo\Modules\*\Controllers\*" member="*Action*" />
+  </component>
+</project>

Gruntfile.js

@@ -2,7 +2,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -32,36 +32,41 @@
 const fs = require('fs');
 const cp = require('child_process');
 const path = require('path');
+const buildUtils = require('./js/build-utils');
 
 module.exports = grunt => {
 
     const pkg = grunt.file.readJSON('package.json');
     const bundleConfig = require('./frontend/bundle-config.json');
+    const libs = require('./frontend/libs.json');
 
-    let jsFilesToBundle = getBundleLibList().concat(bundleConfig.jsFiles);
-    let jsFilesToCopy = getCopyLibDataList();
+    const originalLibDir = 'client/lib/original';
 
-    let libFilesToMinify = jsFilesToCopy
+    let bundleJsFileList = buildUtils.getPreparedBundleLibList(libs).concat(originalLibDir + '/espo.js');
+    let copyJsFileList = buildUtils.getCopyLibDataList(libs);
+
+    let minifyLibFileList = copyJsFileList
         .filter(item => item.minify)
-        .reduce((map, item) => (
-            map[item.dest] = item.dest,
-            map
-        ), {});
+        .map(item => {
+            return {
+                dest: item.dest,
+                src: item.originalDest,
+            };
+        });
 
     let currentPath = path.dirname(fs.realpathSync(__filename));
 
     let themeList = [];
 
     fs.readdirSync('application/Espo/Resources/metadata/themes').forEach(file => {
-        themeList.push(file.substr(0, file.length - 5));
+        themeList.push(file.substring(0, file.length - 5));
     });
 
     let cssminFilesData = {};
-
     let lessData = {};
 
     themeList.forEach(theme => {
-        let name = camelCaseToHyphen(theme);
+        let name = buildUtils.camelCaseToHyphen(theme);
 
         let files = {};
 
@@ -71,14 +76,12 @@ module.exports = grunt => {
         cssminFilesData['client/css/espo/'+name+'.css'] = 'client/css/espo/'+name+'.css';
         cssminFilesData['client/css/espo/'+name+'-iframe.css'] = 'client/css/espo/'+name+'-iframe.css';
 
-        let o = {
+        lessData[theme] = {
             options: {
                 yuicompress: true,
             },
             files: files,
         };
-
-        lessData[theme] = o;
     });
 
     grunt.initConfig({
@@ -118,7 +121,7 @@ module.exports = grunt => {
                     'build/tmp/client/custom/modules/*',
                     '!build/tmp/client/custom/modules/dummy.txt',
                 ]
-            }
+            },
         },
 
         less: lessData,
@@ -142,11 +145,11 @@ module.exports = grunt => {
                     banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
                 },
                 files: {
-                    'client/lib/espo.min.js': jsFilesToBundle,
+                    'client/lib/espo.min.js': bundleJsFileList,
                 },
             },
             lib: {
-                files: libFilesToMinify,
+                files: minifyLibFileList,
             },
         },
 
@@ -172,7 +175,7 @@ module.exports = grunt => {
                 dest: 'build/tmp/client',
             },
             frontendLib: {
-                files: jsFilesToCopy,
+                files: copyJsFileList,
             },
             backend: {
                 expand: true,
@@ -246,15 +249,33 @@ module.exports = grunt => {
                 ],
             },
         },
+    });
 
+    grunt.registerTask('espo-bundle', () => {
+        const Bundler = require('./js/bundler');
+
+        let contents = (new Bundler()).bundle(bundleConfig.jsFiles);
+
+        if (!fs.existsSync(originalLibDir)) {
+            fs.mkdirSync(originalLibDir);
+        }
+
+        fs.writeFileSync(originalLibDir + '/espo.js', contents, 'utf8');
+    });
+
+    grunt.registerTask('prepare-lib-original', () => {
+        // Even though `npm ci` runs the same script, 'clean:start' deletes files.
+        cp.execSync("node js/scripts/prepare-lib-original");
+    });
+
+    grunt.registerTask('prepare-lib', () => {
+        cp.execSync("node js/scripts/prepare-lib");
     });
 
     grunt.registerTask('chmod-folders', () => {
         cp.execSync(
             "find . -type d -exec chmod 755 {} +",
-            {
-                cwd: 'build/EspoCRM-' + pkg.version,
-            }
+            {cwd: 'build/EspoCRM-' + pkg.version}
         );
     });
 
@@ -360,7 +381,7 @@ module.exports = grunt => {
     });
 
     grunt.registerTask('upgrade', () => {
-        cp.execSync("node diff --all --vendor", {stdio: 'inherit'});
+        cp.execSync("node diff --closest", {stdio: 'inherit'});
     });
 
     grunt.registerTask('unit-tests-run', () => {
@@ -375,7 +396,7 @@ module.exports = grunt => {
         cp.execSync("composer run-script setConfigParams", {stdio: 'ignore'});
     });
 
-    grunt.registerTask('zip', () => {
+    grunt.registerTask('zip', function () { // Don't change to arrow-function.
         const archiver = require('archiver');
 
         let resolve = this.async();
@@ -404,8 +425,9 @@ module.exports = grunt => {
 
         archive
             .directory(currentPath + '/build/' + folder, folder)
-            .pipe(zipOutput)
-            .finalize();
+            .pipe(zipOutput);
+
+        archive.finalize();
     });
 
     grunt.registerTask('npm-install', () => {
@@ -423,8 +445,11 @@ module.exports = grunt => {
     grunt.registerTask('internal', [
         'less',
         'cssmin',
+        'espo-bundle',
+        'prepare-lib-original',
         'uglify:bundle',
         'copy:frontendLib',
+        'prepare-lib',
         'uglify:lib',
     ]);
 
@@ -487,77 +512,3 @@ module.exports = grunt => {
         'offline',
     ]);
 };
-
-function getBundleLibList() {
-    const libs = require('./frontend/libs.json');
-
-    let list = [];
-
-    libs.forEach(item => {
-        if (!item.bundle) {
-            return;
-        }
-
-        if (item.files) {
-            item.files.forEach(item  => {
-                list.push(item.src);
-            });
-
-            return;
-        }
-
-        if (!item.src) {
-            throw new Error("No lib src.");
-        }
-
-        list.push(item.src);
-    });
-
-    return list;
-}
-
-function getCopyLibDataList() {
-    const libs = require('./frontend/libs.json');
-
-    let list = [];
-
-    libs.forEach(item => {
-        if (item.bundle) {
-            return;
-        }
-
-        let minify = item.minify;
-
-        if (item.files) {
-            item.files.forEach(item => {
-                list.push({
-                    src: item.src,
-                    dest: item.dest || 'client/lib/' + item.src.split('/').pop(),
-                    minify: minify,
-                });
-            });
-
-            return;
-        }
-
-        if (!item.src) {
-            throw new Error("No lib src.");
-        }
-
-        list.push({
-            src: item.src,
-            dest: item.dest || 'client/lib/' + item.src.split('/').pop(),
-            minify: minify,
-        });
-    });
-
-    return list;
-}
-
-function camelCaseToHyphen(string){
-    if (string === null) {
-        return string;
-    }
-
-    return string.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-}

README.md

@@ -10,7 +10,7 @@ It's a web application with a frontend designed as a single page application and
 
 ### Requirements
 
-* PHP 7.4 and later (with pdo, json, gd, openssl, zip, imap, mbstring, curl extensions);
+* PHP 8.0 and later;
 * MySQL 5.7 (and later), or MariaDB 10.1 (and later).
 
 For more information about server configuration see [this article](https://docs.espocrm.com/administration/server-configuration/).

application/Espo/Binding.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,9 +27,19 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Binding;
+namespace Espo;
 
-class DefaultBinding implements BindingProcessor
+use Espo\Core\Binding\Binder;
+use Espo\Core\Binding\BindingProcessor;
+use Espo\Core\Binding\Key\NamedClassKey;
+
+/**
+ * Default binding for the dependency injection framework. Custom binding should be set up in
+ * `Espo\Modules\{ModuleName}\Binding` or `Espo\Custom\Binding`.
+ *
+ * @link https://docs.espocrm.com/development/di/#binding.
+ */
+class Binding implements BindingProcessor
 {
     public function process(Binder $binder): void
     {
@@ -108,7 +118,7 @@ class DefaultBinding implements BindingProcessor
         );
 
         $binder->bindService(
-            'Espo\\Core\\SelectBuilderFactory',
+            'Espo\\Core\\Select\\SelectBuilderFactory',
             'selectBuilderFactory'
         );
 
@@ -128,7 +138,7 @@ class DefaultBinding implements BindingProcessor
         );
 
         $binder->bindService(
-            'Espo\\Core\\Utils\\HookManager',
+            'Espo\\Core\\HookManager',
             'hookManager'
         );
 
@@ -153,12 +163,12 @@ class DefaultBinding implements BindingProcessor
         );
 
         $binder->bindService(
-            'Espo\\Core\\Utils\\Language $baseLanguage',
+            NamedClassKey::create('Espo\\Core\\Utils\\Language', 'baseLanguage'),
             'baseLanguage'
         );
 
         $binder->bindService(
-            'Espo\\Core\\Utils\\Language $defaultLanguage',
+            NamedClassKey::create('Espo\\Core\\Utils\\Language', 'defaultLanguage'),
             'defaultLanguage'
         );
 
@@ -173,7 +183,7 @@ class DefaultBinding implements BindingProcessor
         );
 
         $binder->bindService(
-            'Espo\\Core\\AclManager $internalAclManager',
+            NamedClassKey::create('Espo\\Core\\AclManager', 'internalAclManager'),
             'internalAclManager'
         );
 
@@ -219,6 +229,35 @@ class DefaultBinding implements BindingProcessor
             'Espo\\Core\\Sms\\Sender',
             'Espo\\Core\\Sms\\SenderFactory'
         );
+
+        $binder->bindImplementation(
+            'Espo\\Core\\Authentication\\Jwt\\KeyFactory',
+            'Espo\\Core\\Authentication\\Jwt\\DefaultKeyFactory'
+        );
+
+        $binder
+            ->for('Espo\\Core\\Authentication\\Oidc\\TokenValidator')
+            ->bindImplementation(
+                'Espo\\Core\\Authentication\\Jwt\\SignatureVerifierFactory',
+                'Espo\\Core\\Authentication\\Oidc\\DefaultSignatureVerifierFactory'
+            );
+
+        $binder
+            ->for('Espo\\Core\\Authentication\\Oidc\\Login')
+            ->bindImplementation(
+                'Espo\\Core\\Authentication\\Oidc\\UserProvider',
+                'Espo\\Core\\Authentication\\Oidc\\DefaultUserProvider'
+            );
+
+        $binder->bindImplementation(
+            'Espo\\Core\\Mail\\Importer\\ParentFinder',
+            'Espo\\Core\\Mail\\Importer\\DefaultParentFinder'
+        );
+
+        $binder->bindImplementation(
+            'Espo\\Core\\Mail\\Importer\\DuplicateFinder',
+            'Espo\\Core\\Mail\\Importer\\DefaultDuplicateFinder'
+        );
     }
 
     private function bindAcl(Binder $binder): void

application/Espo/Classes/Acl/ActionHistoryRecord/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,16 +29,13 @@
 
 namespace Espo\Classes\Acl\ActionHistoryRecord;
 
+use Espo\Entities\ActionHistoryRecord;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
+use Espo\Core\Acl\OwnershipOwnChecker;
 
 /**
- * @implements OwnershipOwnChecker<\Espo\Entities\ActionHistoryRecord>
+ * @implements OwnershipOwnChecker<ActionHistoryRecord>
  */
 class OwnershipChecker implements OwnershipOwnChecker
 {

application/Espo/Classes/Acl/Attachment/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,22 +29,17 @@
 
 namespace Espo\Classes\Acl\Attachment;
 
-use Espo\Entities\{
-    User,
-    Note,
-    Attachment,
-};
-
+use Espo\Entities\Attachment;
+use Espo\Entities\Note;
+use Espo\Entities\Settings;
+use Espo\Entities\User;
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    ORM\EntityManager,
-    AclManager,
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-};
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
+use Espo\Core\AclManager;
+use Espo\Core\ORM\EntityManager;
 
 /**
  * @implements AccessEntityCREDChecker<Attachment>
@@ -53,9 +48,8 @@ class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $aclManager;
-
-    private $entityManager;
+    private AclManager $aclManager;
+    private EntityManager $entityManager;
 
     public function __construct(
         DefaultAccessChecker $defaultAccessChecker,
@@ -71,7 +65,7 @@ class AccessChecker implements AccessEntityCREDChecker
     {
         /** @var Attachment $entity */
 
-        if ($entity->get('parentType') === 'Settings') {
+        if ($entity->get('parentType') === Settings::ENTITY_TYPE) {
             // Allow the logo.
             return true;
         }
@@ -99,7 +93,7 @@ class AccessChecker implements AccessEntityCREDChecker
             return false;
         }
 
-        if ($parent->getEntityType() === 'Note') {
+        if ($parent->getEntityType() === Note::ENTITY_TYPE) {
             /** @var Note $parent */
             $result = $this->checkEntityReadNoteParent($user, $parent);
 
@@ -145,7 +139,7 @@ class AccessChecker implements AccessEntityCREDChecker
 
         if ($note->getTargetType() === Note::TARGET_USERS) {
             $isRelated = $this->entityManager
-                ->getRDBRepository('Note')
+                ->getRDBRepository(Note::ENTITY_TYPE)
                 ->getRelation($note, 'users')
                 ->isRelated($user);
 

application/Espo/Classes/Acl/Attachment/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,16 +29,13 @@
 
 namespace Espo\Classes\Acl\Attachment;
 
+use Espo\Entities\Attachment;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
+use Espo\Core\Acl\OwnershipOwnChecker;
 
 /**
- * @implements OwnershipOwnChecker<\Espo\Entities\Attachment>
+ * @implements OwnershipOwnChecker<Attachment>
  */
 class OwnershipChecker implements OwnershipOwnChecker
 {

application/Espo/Classes/Acl/AuthToken/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,24 +29,20 @@
 
 namespace Espo\Classes\Acl\AuthToken;
 
+use Espo\Entities\AuthToken;
 use Espo\Entities\User;
-
-use Espo\Core\{
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-};
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
 
 /**
- * @implements AccessEntityCREDChecker<\Espo\Entities\AuthToken>
+ * @implements AccessEntityCREDChecker<AuthToken>
  */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $defaultAccessChecker;
-
     public function __construct(DefaultAccessChecker $defaultAccessChecker)
     {
         $this->defaultAccessChecker = $defaultAccessChecker;

application/Espo/Classes/Acl/Email/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -31,19 +31,15 @@ namespace Espo\Classes\Acl\Email;
 
 use Espo\Entities\User;
 use Espo\Entities\Email;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\Table,
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDSChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-};
+use Espo\Core\Acl\AccessEntityCREDSChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Table;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
 
 /**
- * @implements AccessEntityCREDSChecker<\Espo\Entities\Email>
+ * @implements AccessEntityCREDSChecker<Email>
  */
 class AccessChecker implements AccessEntityCREDSChecker
 {
@@ -104,7 +100,7 @@ class AccessChecker implements AccessEntityCREDSChecker
                 return true;
             }
 
-            /** @var string[] */
+            /** @var string[] $assignedUserIdList */
             $assignedUserIdList = $entity->getLinkMultipleIdList('assignedUsers');
 
             if (
@@ -129,7 +125,10 @@ class AccessChecker implements AccessEntityCREDSChecker
             return false;
         }
 
-        if ($entity->get('status') !== 'Sent' && $entity->get('status') !== 'Archived') {
+        if (
+            $entity->getStatus() !== Email::STATUS_SENT &&
+            $entity->getStatus() !== Email::STATUS_ARCHIVED
+        ) {
             return true;
         }
 

application/Espo/Classes/Acl/Email/AssignmentChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -30,12 +30,8 @@
 namespace Espo\Classes\Acl\Email;
 
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\DefaultAssignmentChecker,
-};
+use Espo\Core\Acl\DefaultAssignmentChecker;
 
 class AssignmentChecker extends DefaultAssignmentChecker
 {

application/Espo/Classes/Acl/Email/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -34,15 +34,13 @@ use Espo\Entities\Email;
 
 use Espo\ORM\Entity;
 
-use Espo\Core\{
-    Acl\DefaultOwnershipChecker,
-    Acl\OwnershipOwnChecker,
-    Acl\OwnershipTeamChecker,
-};
+use Espo\Core\Acl\DefaultOwnershipChecker;
+use Espo\Core\Acl\OwnershipOwnChecker;
+use Espo\Core\Acl\OwnershipTeamChecker;
 
 /**
- * @implements OwnershipOwnChecker<\Espo\Entities\Email>
- * @implements OwnershipTeamChecker<\Espo\Entities\Email>
+ * @implements OwnershipOwnChecker<Email>
+ * @implements OwnershipTeamChecker<Email>
  */
 class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
 {

application/Espo/Classes/Acl/EmailFilter/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,51 +29,56 @@
 
 namespace Espo\Classes\Acl\EmailFilter;
 
+use Espo\Entities\EmailAccount;
 use Espo\Entities\User;
-
+use Espo\Entities\EmailFilter;
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-    ORM\EntityManager,
-};
+use Espo\Core\Acl\OwnershipOwnChecker;
+use Espo\Core\ORM\EntityManager;
 
 /**
- * @implements OwnershipOwnChecker<\Espo\Entities\EmailFilter>
+ * @implements OwnershipOwnChecker<EmailFilter>
  */
 class OwnershipChecker implements OwnershipOwnChecker
 {
-    private $entityManager;
+    private EntityManager $entityManager;
 
     public function __construct(EntityManager $entityManager)
     {
         $this->entityManager = $entityManager;
     }
 
+    /**
+     * @param EmailFilter $entity
+     */
     public function checkOwn(User $user, Entity $entity): bool
     {
-        if (!$entity->has('parentId') || !$entity->has('parentType')) {
+        if ($entity->isGlobal()) {
             return false;
         }
 
-        $parentType = $entity->get('parentType');
-        $parentId = $entity->get('parentId');
+        $parentType = $entity->getParentType();
+        $parentId = $entity->getParentId();
 
         if (!$parentType || !$parentId) {
             return false;
         }
 
-        $parent = $this->entityManager->getEntity($parentType, $parentId);
+        $parent = $this->entityManager->getEntityById($parentType, $parentId);
 
         if (!$parent) {
             return false;
         }
 
-        if ($parent->getEntityType() === 'User') {
+        if ($parent->getEntityType() === User::ENTITY_TYPE) {
             return $parent->getId() === $user->getId();
         }
 
-        if ($parent->has('assignedUserId') && $parent->get('assignedUserId') === $user->getId()) {
+        if (
+            $parent instanceof EmailAccount &&
+            $parent->has('assignedUserId') &&
+            $parent->get('assignedUserId') === $user->getId()
+        ) {
             return true;
         }
 

application/Espo/Classes/Acl/Import/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,19 +29,16 @@
 
 namespace Espo\Classes\Acl\Import;
 
+use Espo\Entities\Import;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\ScopeData,
-    Acl\AccessEntityReadChecker,
-    Acl\AccessEntityDeleteChecker,
-};
+use Espo\Core\Acl\AccessEntityDeleteChecker;
+use Espo\Core\Acl\AccessEntityReadChecker;
+use Espo\Core\Acl\ScopeData;
 
 /**
- * @implements AccessEntityReadChecker<\Espo\Entities\Import>
- * @implements AccessEntityDeleteChecker<\Espo\Entities\Import>
+ * @implements AccessEntityReadChecker<Import>
+ * @implements AccessEntityDeleteChecker<Import>
  */
 class AccessChecker implements AccessEntityReadChecker, AccessEntityDeleteChecker
 {

application/Espo/Classes/Acl/Note/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,41 +29,34 @@
 
 namespace Espo\Classes\Acl\Note;
 
+use Espo\Entities\Note;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-    AclManager,
-    ORM\EntityManager,
-    Utils\Config,
-};
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
+use Espo\Core\AclManager;
+use Espo\Core\ORM\EntityManager;
+use Espo\Core\Utils\Config;
 
 use DateTime;
 use Exception;
 
 /**
- * @implements AccessEntityCREDChecker<\Espo\Entities\Note>
+ * @implements AccessEntityCREDChecker<Note>
  */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
     private const EDIT_PERIOD = '7 days';
-
     private const DELETE_PERIOD = '1 month';
 
-    private $defaultAccessChecker;
-
-    private $aclManager;
-
-    private $entityManager;
-
-    private $config;
+    private DefaultAccessChecker $defaultAccessChecker;
+    private AclManager $aclManager;
+    private EntityManager $entityManager;
+    private Config $config;
 
     public function __construct(
         DefaultAccessChecker $defaultAccessChecker,
@@ -77,6 +70,9 @@ class AccessChecker implements AccessEntityCREDChecker
         $this->config = $config;
     }
 
+    /**
+     * @param Note $entity
+     */
     public function checkEntityCreate(User $user, Entity $entity, ScopeData $data): bool
     {
         $parentId = $entity->get('parentId');
@@ -95,6 +91,62 @@ class AccessChecker implements AccessEntityCREDChecker
         return false;
     }
 
+    /**
+     * @param Note $entity
+     */
+    public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        $parentId = $entity->getParentId();
+        $parentType = $entity->getParentType();
+
+        if ($parentId && $parentType) {
+            $parent = $this->entityManager->getEntityById($parentType, $parentId);
+
+            if (!$parent) {
+                return false;
+            }
+
+            return $this->aclManager->checkEntityStream($user, $parent);
+        }
+
+        if ($entity->getType() !== Note::TYPE_POST) {
+            return false;
+        }
+
+        if ($entity->getCreatedById() === $user->getId()) {
+            return true;
+        }
+
+        if ($entity->getTargetType() === Note::TARGET_ALL) {
+            return true;
+        }
+
+        if ($entity->getTargetType() === Note::TARGET_TEAMS) {
+            $targetTeamIdList = $entity->getLinkMultipleIdList('teams') ?? [];
+
+            foreach ($user->getTeamIdList() as $teamId) {
+                if (in_array($teamId, $targetTeamIdList)) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        if ($entity->getTargetType() === Note::TARGET_USERS) {
+            return in_array($user->getId(), $entity->getLinkMultipleIdList('users') ?? []);
+        }
+
+        return false;
+    }
+
+    /**
+     * @param Note $entity
+     */
     public function checkEntityEdit(User $user, Entity $entity, ScopeData $data): bool
     {
         if ($user->isAdmin()) {
@@ -106,7 +158,7 @@ class AccessChecker implements AccessEntityCREDChecker
         }
 
         if (!$this->aclManager->checkOwnershipOwn($user, $entity)) {
-            return true;
+            return false;
         }
 
         $createdAt = $entity->get('createdAt');
@@ -134,6 +186,9 @@ class AccessChecker implements AccessEntityCREDChecker
         return true;
     }
 
+    /**
+     * @param Note $entity
+     */
     public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
     {
         if ($user->isAdmin()) {
@@ -145,7 +200,7 @@ class AccessChecker implements AccessEntityCREDChecker
         }
 
         if (!$this->aclManager->checkOwnershipOwn($user, $entity)) {
-            return true;
+            return false;
         }
 
         $createdAt = $entity->get('createdAt');

application/Espo/Classes/Acl/Note/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,22 +29,22 @@
 
 namespace Espo\Classes\Acl\Note;
 
+use Espo\Entities\Note;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
+use Espo\Core\Acl\OwnershipOwnChecker;
 
 /**
- * @implements OwnershipOwnChecker<\Espo\Entities\Note>
+ * @implements OwnershipOwnChecker<Note>
  */
 class OwnershipChecker implements OwnershipOwnChecker
 {
+    /**
+     * @param Note $entity
+     */
     public function checkOwn(User $user, Entity $entity): bool
     {
-        if ($entity->get('type') === 'Post' && $user->getId() === $entity->get('createdById')) {
+        if ($entity->getType() === Note::TYPE_POST && $user->getId() === $entity->getCreatedById()) {
             return true;
         }
 

application/Espo/Classes/Acl/Notification/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,16 +29,13 @@
 
 namespace Espo\Classes\Acl\Notification;
 
+use Espo\Entities\Notification;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
+use Espo\Core\Acl\OwnershipOwnChecker;
 
 /**
- * @implements OwnershipOwnChecker<\Espo\Entities\Notification>
+ * @implements OwnershipOwnChecker<Notification>
  */
 class OwnershipChecker implements OwnershipOwnChecker
 {

application/Espo/Classes/Acl/Portal/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,27 +29,24 @@
 
 namespace Espo\Classes\Acl\Portal;
 
+use Espo\Entities\Portal;
 use Espo\Entities\User;
-
-use Espo\Core\{
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-    Acl\Table,
-    AclManager,
-};
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Table;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
+use Espo\Core\AclManager;
 
 /**
- * @implements AccessEntityCREDChecker<\Espo\Entities\Portal>
+ * @implements AccessEntityCREDChecker<Portal>
  */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $defaultAccessChecker;
-
-    private $aclManager;
+    private DefaultAccessChecker $defaultAccessChecker;
+    private AclManager $aclManager;
 
     public function __construct(DefaultAccessChecker $defaultAccessChecker, AclManager $aclManager)
     {

application/Espo/Classes/Acl/ScheduledJob/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,25 +29,22 @@
 
 namespace Espo\Classes\Acl\ScheduledJob;
 
+use Espo\Entities\ScheduledJob;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-};
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
 
 /**
- * @implements AccessEntityCREDChecker<\Espo\Entities\ScheduledJob>
+ * @implements AccessEntityCREDChecker<ScheduledJob>
  */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $defaultAccessChecker;
+    private DefaultAccessChecker $defaultAccessChecker;
 
     public function __construct(DefaultAccessChecker $defaultAccessChecker)
     {

application/Espo/Classes/Acl/Team/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,22 +29,19 @@
 
 namespace Espo\Classes\Acl\Team;
 
+use Espo\Entities\Team;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
+use Espo\Core\Acl\OwnershipOwnChecker;
 
 /**
- * @implements OwnershipOwnChecker<\Espo\Entities\Team>
+ * @implements OwnershipOwnChecker<Team>
  */
 class OwnershipChecker implements OwnershipOwnChecker
 {
     public function checkOwn(User $user, Entity $entity): bool
     {
-        /** @var string[] */
+        /** @var string[] $userTeamIdList */
         $userTeamIdList = $user->getLinkMultipleIdList('teams');
 
         return in_array($entity->getId(), $userTeamIdList);

application/Espo/Classes/Acl/User/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -30,17 +30,13 @@
 namespace Espo\Classes\Acl\User;
 
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\Table,
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDSChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-    AclManager,
-};
+use Espo\Core\Acl\AccessEntityCREDSChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Table;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
+use Espo\Core\AclManager;
 
 /**
  * @implements AccessEntityCREDSChecker<User>
@@ -49,9 +45,8 @@ class AccessChecker implements AccessEntityCREDSChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $defaultAccessChecker;
-
-    private $aclManager;
+    private DefaultAccessChecker $defaultAccessChecker;
+    private AclManager $aclManager;
 
     public function __construct(DefaultAccessChecker $defaultAccessChecker, AclManager $aclManager)
     {

application/Espo/Classes/Acl/User/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -32,15 +32,12 @@ namespace Espo\Classes\Acl\User;
 use Espo\Entities\User;
 use Espo\ORM\Entity;
 use Espo\Core\ORM\Entity as CoreEntity;
-
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-    Acl\OwnershipTeamChecker,
-};
+use Espo\Core\Acl\OwnershipOwnChecker;
+use Espo\Core\Acl\OwnershipTeamChecker;
 
 /**
- * @implements OwnershipOwnChecker<\Espo\Entities\User>
- * @implements OwnershipTeamChecker<\Espo\Entities\User>
+ * @implements OwnershipOwnChecker<User>
+ * @implements OwnershipTeamChecker<User>
  */
 class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
 {

application/Espo/Classes/Acl/Webhook/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -30,25 +30,20 @@
 namespace Espo\Classes\Acl\Webhook;
 
 use Espo\Entities\User;
-
+use Espo\Entities\Webhook;
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\ScopeData,
-    Acl\DefaultAccessChecker,
-    Acl\AccessEntityCREDChecker,
-    Acl\Traits\DefaultAccessCheckerDependency,
-};
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\DefaultAccessChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
 
 /**
- * @implements AccessEntityCREDChecker<\Espo\Entities\Webhook>
+ * @implements AccessEntityCREDChecker<Webhook>
  */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $defaultAccessChecker;
-
     public function __construct(DefaultAccessChecker $defaultAccessChecker)
     {
         $this->defaultAccessChecker = $defaultAccessChecker;

application/Espo/Classes/Acl/Webhook/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/Acl/WorkingTimeRange/AssignmentChecker.php

@@ -0,0 +1,89 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Acl\WorkingTimeRange;
+
+use Espo\Core\Acl\AssignmentChecker as AssignmentCheckerInterface;
+use Espo\Core\Acl\DefaultAssignmentChecker;
+use Espo\Core\AclManager;
+use Espo\Entities\User;
+use Espo\Entities\WorkingTimeRange;
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+
+/**
+ * @implements AssignmentCheckerInterface<WorkingTimeRange>
+ */
+class AssignmentChecker implements AssignmentCheckerInterface
+{
+    private DefaultAssignmentChecker $defaultAssignmentChecker;
+    private AclManager $aclManager;
+    private EntityManager $entityManager;
+
+    public function __construct(
+        DefaultAssignmentChecker $defaultAssignmentChecker,
+        AclManager $aclManager,
+        EntityManager $entityManager
+    ) {
+        $this->defaultAssignmentChecker = $defaultAssignmentChecker;
+        $this->aclManager = $aclManager;
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * @param WorkingTimeRange $entity
+     */
+    public function check(User $user, Entity $entity): bool
+    {
+        $result = $this->defaultAssignmentChecker->check($user, $entity);
+
+        if (!$result) {
+            return false;
+        }
+
+        if (!$entity->isAttributeChanged('usersIds')) {
+            return true;
+        }
+
+        $users = $this->entityManager
+            ->getRDBRepositoryByClass(User::class)
+            ->where(['id' => $entity->getUsers()->getIdList()])
+            ->find();
+
+        foreach ($users as $targetUser) {
+            $accessToUser = $this->aclManager->check($user, $targetUser);
+
+            if (!$accessToUser) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

application/Espo/Classes/AclPortal/Attachment/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,22 +29,17 @@
 
 namespace Espo\Classes\AclPortal\Attachment;
 
-use Espo\Entities\{
-    User,
-    Note,
-    Attachment,
-};
-
+use Espo\Entities\Attachment;
+use Espo\Entities\Note;
+use Espo\Entities\Settings;
+use Espo\Entities\User;
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    ORM\EntityManager,
-    Portal\AclManager,
-    Acl\ScopeData,
-    Acl\AccessEntityCREDChecker,
-    Portal\Acl\DefaultAccessChecker,
-    Portal\Acl\Traits\DefaultAccessCheckerDependency,
-};
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\ORM\EntityManager;
+use Espo\Core\Portal\Acl\DefaultAccessChecker;
+use Espo\Core\Portal\Acl\Traits\DefaultAccessCheckerDependency;
+use Espo\Core\Portal\AclManager;
 
 /**
  * @implements AccessEntityCREDChecker<Attachment>
@@ -53,11 +48,9 @@ class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $defaultAccessChecker;
-
-    private $aclManager;
-
-    private $entityManager;
+    private DefaultAccessChecker $defaultAccessChecker;
+    private AclManager $aclManager;
+    private EntityManager $entityManager;
 
     public function __construct(
         DefaultAccessChecker $defaultAccessChecker,
@@ -73,7 +66,7 @@ class AccessChecker implements AccessEntityCREDChecker
     {
         /** @var Attachment $entity */
 
-        if ($entity->get('parentType') === 'Settings') {
+        if ($entity->get('parentType') === Settings::ENTITY_TYPE) {
             // Allow the logo.
             return true;
         }
@@ -101,7 +94,7 @@ class AccessChecker implements AccessEntityCREDChecker
             return false;
         }
 
-        if ($parent->getEntityType() === 'Note') {
+        if ($parent->getEntityType() === Note::ENTITY_TYPE) {
             /** @var Note $parent */
             $result = $this->checkEntityReadNoteParent($user, $parent);
 
@@ -151,7 +144,7 @@ class AccessChecker implements AccessEntityCREDChecker
 
         if ($note->getTargetType() === Note::TARGET_USERS) {
             $isRelated = $this->entityManager
-                ->getRDBRepository('Note')
+                ->getRDBRepository(Note::ENTITY_TYPE)
                 ->getRelation($note, 'users')
                 ->isRelated($user);
 

application/Espo/Classes/AclPortal/Attachment/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,16 +29,13 @@
 
 namespace Espo\Classes\AclPortal\Attachment;
 
+use Espo\Entities\Attachment;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
+use Espo\Core\Acl\OwnershipOwnChecker;
 
 /**
- * @implements OwnershipOwnChecker<\Espo\Entities\Attachment>
+ * @implements OwnershipOwnChecker<Attachment>
  */
 class OwnershipChecker implements OwnershipOwnChecker
 {

application/Espo/Classes/AclPortal/Email/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,29 +29,23 @@
 
 namespace Espo\Classes\AclPortal\Email;
 
+use Espo\Entities\Email;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
 use Espo\Core\ORM\Entity as CoreEntity;
-
-use Espo\Core\{
-    Acl\Table,
-    Acl\ScopeData,
-    Acl\AccessEntityCREDSChecker,
-    Portal\Acl\DefaultAccessChecker,
-    Portal\Acl\Traits\DefaultAccessCheckerDependency,
-};
+use Espo\Core\Acl\AccessEntityCREDSChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\Acl\Table;
+use Espo\Core\Portal\Acl\DefaultAccessChecker;
+use Espo\Core\Portal\Acl\Traits\DefaultAccessCheckerDependency;
 
 /**
- * @implements AccessEntityCREDSChecker<\Espo\Entities\Email>
+ * @implements AccessEntityCREDSChecker<Email>
  */
 class AccessChecker implements AccessEntityCREDSChecker
 {
     use DefaultAccessCheckerDependency;
 
-    private $defaultAccessChecker;
-
     public function __construct(
         DefaultAccessChecker $defaultAccessChecker
     ) {

application/Espo/Classes/AclPortal/Email/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,16 +29,13 @@
 
 namespace Espo\Classes\AclPortal\Email;
 
+use Espo\Entities\Email;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
+use Espo\Core\Acl\OwnershipOwnChecker;
 
 /**
- * @implements OwnershipOwnChecker<\Espo\Entities\Email>
+ * @implements OwnershipOwnChecker<Email>
  */
 class OwnershipChecker implements OwnershipOwnChecker
 {

application/Espo/Classes/AclPortal/Note/AccessChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,41 +29,34 @@
 
 namespace Espo\Classes\AclPortal\Note;
 
+use Espo\Entities\Note;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Portal\AclManager,
-    Acl\ScopeData,
-    Acl\AccessEntityCREDChecker,
-    Portal\Acl\DefaultAccessChecker,
-    Portal\Acl\Traits\DefaultAccessCheckerDependency,
-    ORM\EntityManager,
-    Utils\Config,
-};
+use Espo\Core\Acl\AccessEntityCREDChecker;
+use Espo\Core\Acl\ScopeData;
+use Espo\Core\ORM\EntityManager;
+use Espo\Core\Portal\Acl\DefaultAccessChecker;
+use Espo\Core\Portal\Acl\Traits\DefaultAccessCheckerDependency;
+use Espo\Core\Portal\AclManager;
+use Espo\Core\Utils\Config;
 
 use DateTime;
 use Exception;
 
 /**
- * @implements AccessEntityCREDChecker<\Espo\Entities\Note>
+ * @implements AccessEntityCREDChecker<Note>
  */
 class AccessChecker implements AccessEntityCREDChecker
 {
     use DefaultAccessCheckerDependency;
 
     private const EDIT_PERIOD = '7 days';
-
     private const DELETE_PERIOD = '1 month';
 
-    private $defaultAccessChecker;
-
-    private $aclManager;
-
-    private $entityManager;
-
-    private $config;
+    private DefaultAccessChecker $defaultAccessChecker;
+    private AclManager $aclManager;
+    private EntityManager $entityManager;
+    private Config $config;
 
     public function __construct(
         DefaultAccessChecker $defaultAccessChecker,
@@ -77,16 +70,19 @@ class AccessChecker implements AccessEntityCREDChecker
         $this->config = $config;
     }
 
+    /**
+     * @param Note $entity
+     */
     public function checkEntityCreate(User $user, Entity $entity, ScopeData $data): bool
     {
-        $parentId = $entity->get('parentId');
-        $parentType = $entity->get('parentType');
+        $parentId = $entity->getParentId();
+        $parentType = $entity->getParentType();
 
         if (!$parentId || !$parentType) {
             return $this->defaultAccessChecker->checkEntityCreate($user, $entity, $data);
         }
 
-        $parent = $this->entityManager->getEntity($parentType, $parentId);
+        $parent = $this->entityManager->getEntityById($parentType, $parentId);
 
         if ($parent && $this->aclManager->checkEntityStream($user, $parent)) {
             return true;
@@ -95,31 +91,42 @@ class AccessChecker implements AccessEntityCREDChecker
         return $this->defaultAccessChecker->checkEntityCreate($user, $entity, $data);
     }
 
+    /**
+     * @param Note $entity
+     */
     public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
     {
-        if ($entity->get('type') !== 'Post') {
-            return false;
-        }
+        $parentId = $entity->getParentId();
+        $parentType = $entity->getParentType();
 
-        if ($entity->get('type') === 'Post' && $entity->get('targetType')) {
-            return false;
-        }
+        if ($parentId && $parentType) {
+            $parent = $this->entityManager->getEntityById($parentType, $parentId);
 
-        if (!$entity->get('parentId') || !$entity->get('parentType')) {
-            return false;
-        }
-
-        $parent = $this->entityManager->getEntity($entity->get('parentType'), $entity->get('parentId'));
-
-        if ($parent) {
-            if ($this->aclManager->checkEntityStream($user, $parent)) {
-                return true;
+            if (!$parent) {
+                return false;
             }
+
+            return $this->aclManager->checkEntityStream($user, $parent);
+        }
+
+        if ($entity->getType() !== Note::TYPE_POST) {
+            return false;
+        }
+
+        if ($entity->getCreatedById() === $user->getId()) {
+            return true;
+        }
+
+        if ($entity->getTargetType() === Note::TARGET_PORTALS) {
+            return in_array($user->getPortalId(), $entity->getLinkMultipleIdList('portals') ?? []);
         }
 
         return false;
     }
 
+    /**
+     * @param Note $entity
+     */
     public function checkEntityEdit(User $user, Entity $entity, ScopeData $data): bool
     {
         if (!$this->defaultAccessChecker->checkEntityEdit($user, $entity, $data)) {
@@ -127,7 +134,7 @@ class AccessChecker implements AccessEntityCREDChecker
         }
 
         if (!$this->aclManager->checkOwnershipOwn($user, $entity)) {
-            return true;
+            return false;
         }
 
         $createdAt = $entity->get('createdAt');
@@ -155,6 +162,9 @@ class AccessChecker implements AccessEntityCREDChecker
         return true;
     }
 
+    /**
+     * @param Note $entity
+     */
     public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
     {
         if (!$this->defaultAccessChecker->checkEntityDelete($user, $entity, $data)) {
@@ -162,7 +172,7 @@ class AccessChecker implements AccessEntityCREDChecker
         }
 
         if (!$this->aclManager->checkOwnershipOwn($user, $entity)) {
-            return true;
+            return false;
         }
 
         $createdAt = $entity->get('createdAt');

application/Espo/Classes/AclPortal/Note/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,22 +29,22 @@
 
 namespace Espo\Classes\AclPortal\Note;
 
+use Espo\Entities\Note;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
+use Espo\Core\Acl\OwnershipOwnChecker;
 
 /**
- * @implements OwnershipOwnChecker<\Espo\Entities\Note>
+ * @implements OwnershipOwnChecker<Note>
  */
 class OwnershipChecker implements OwnershipOwnChecker
 {
+    /**
+     * @param Note $entity
+     */
     public function checkOwn(User $user, Entity $entity): bool
     {
-        if ($entity->get('type') === 'Post' && $user->getId() === $entity->get('createdById')) {
+        if ($entity->getType() === Note::TYPE_POST && $user->getId() === $entity->getCreatedById()) {
             return true;
         }
 

application/Espo/Classes/AclPortal/Notification/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,16 +29,13 @@
 
 namespace Espo\Classes\AclPortal\Notification;
 
+use Espo\Entities\Notification;
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
+use Espo\Core\Acl\OwnershipOwnChecker;
 
 /**
- * @implements OwnershipOwnChecker<\Espo\Entities\Notification>
+ * @implements OwnershipOwnChecker<Notification>
  */
 class OwnershipChecker implements OwnershipOwnChecker
 {

application/Espo/Classes/AclPortal/User/OwnershipChecker.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -30,15 +30,11 @@
 namespace Espo\Classes\AclPortal\User;
 
 use Espo\Entities\User;
-
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    Acl\OwnershipOwnChecker,
-};
+use Espo\Core\Acl\OwnershipOwnChecker;
 
 /**
- * @implements OwnershipOwnChecker<\Espo\Entities\User>
+ * @implements OwnershipOwnChecker<User>
  */
 class OwnershipChecker implements OwnershipOwnChecker
 {

application/Espo/Classes/AddressFormatters/Formatter1.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/AddressFormatters/Formatter2.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/AddressFormatters/Formatter3.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/AddressFormatters/Formatter4.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/AppInfo/Binding.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,16 +29,14 @@
 
 namespace Espo\Classes\AppInfo;
 
-use Espo\Core\{
-    Utils\Module,
-    Binding\EspoBindingLoader,
-    Binding\Binding as BindingItem,
-    Console\Command\Params,
-};
+use Espo\Core\Binding\Binding as BindingItem;
+use Espo\Core\Binding\EspoBindingLoader;
+use Espo\Core\Console\Command\Params;
+use Espo\Core\Utils\Module;
 
 class Binding
 {
-    private $module;
+    private Module $module;
 
     public function __construct(Module $module)
     {

application/Espo/Classes/AppInfo/Container.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -63,7 +63,7 @@ class Container
             'user',
         ];
 
-        /** @var string[] */
+        /** @var string[] $fileList */
         $fileList = scandir('application/Espo/Core/Loaders');
 
         if (file_exists('custom/Espo/Custom/Core/Loaders')) {

application/Espo/Classes/AppInfo/Jobs.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/AppParams/Extensions.php

@@ -0,0 +1,92 @@
+<?php
+/************************************************************************
+* This file is part of EspoCRM.
+*
+* EspoCRM - Open Source CRM application.
+* Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+* Website: https://www.espocrm.com
+*
+* EspoCRM is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* EspoCRM is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+*
+* The interactive user interfaces in modified source and object code versions
+* of this program must display Appropriate Legal Notices, as required under
+* Section 5 of the GNU General Public License version 3.
+*
+* In accordance with Section 7(b) of the GNU General Public License version 3,
+* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+************************************************************************/
+
+namespace Espo\Classes\AppParams;
+
+use Espo\Entities\Extension;
+use Espo\Entities\User;
+use Espo\ORM\EntityManager;
+use Espo\Tools\App\AppParam;
+use stdClass;
+
+class Extensions implements AppParam
+{
+    private User $user;
+    private EntityManager $entityManager;
+
+    public function __construct(
+        User $user,
+        EntityManager $entityManager
+    ) {
+        $this->user = $user;
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * @return stdClass[]
+     */
+    public function get(): array
+    {
+        if (!$this->user->isRegular() && !$this->user->isAdmin()) {
+            return [];
+        }
+
+        $extensionList = $this->entityManager
+            ->getRDBRepositoryByClass(Extension::class)
+            ->where([
+                'licenseStatus' => [
+                    Extension::LICENSE_STATUS_INVALID,
+                    Extension::LICENSE_STATUS_EXPIRED,
+                    Extension::LICENSE_STATUS_SOFT_EXPIRED,
+                ],
+            ])
+            ->find();
+
+        $list = [];
+
+        foreach ($extensionList as $extension) {
+            $list[] = (object) [
+                'name' => $extension->getName(),
+                'version' => $extension->getVersion(),
+                'licenseStatus' => $extension->getLicenseStatus(),
+                'licenseStatusMessage' => $extension->getLicenseStatusMessage(),
+                'isInstalled' => $extension->isInstalled(),
+                'notify' => in_array(
+                    $extension->getLicenseStatus(),
+                    [
+                        Extension::LICENSE_STATUS_INVALID,
+                        Extension::LICENSE_STATUS_EXPIRED,
+                    ]
+                )
+            ];
+        }
+
+        return $list;
+    }
+}

application/Espo/Classes/AppParams/TemplateEntityTypeList.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,25 +29,26 @@
 
 namespace Espo\Classes\AppParams;
 
-use Espo\Core\{
-    Acl,
-    Select\SelectBuilderFactory,
-    ORM\EntityManager,
-};
+use Espo\Core\Acl;
+use Espo\Core\ORM\EntityManager;
+use Espo\Core\Select\SelectBuilderFactory;
+use Espo\Entities\Template;
+use Espo\Tools\App\AppParam;
 
 /**
  * Returns a list of entity types for which a PDF template exists.
  */
-class TemplateEntityTypeList
+class TemplateEntityTypeList implements AppParam
 {
-    private $acl;
+    private Acl $acl;
+    private SelectBuilderFactory $selectBuilderFactory;
+    private EntityManager $entityManager;
 
-    private $selectBuilderFactory;
-
-    private $entityManager;
-
-    public function __construct(Acl $acl, SelectBuilderFactory $selectBuilderFactory, EntityManager $entityManager)
-    {
+    public function __construct(
+        Acl $acl,
+        SelectBuilderFactory $selectBuilderFactory,
+        EntityManager $entityManager
+    ) {
         $this->acl = $acl;
         $this->selectBuilderFactory = $selectBuilderFactory;
         $this->entityManager = $entityManager;
@@ -58,7 +59,7 @@ class TemplateEntityTypeList
      */
     public function get(): array
     {
-        if (!$this->acl->checkScope('Template')) {
+        if (!$this->acl->checkScope(Template::ENTITY_TYPE)) {
             return [];
         }
 
@@ -66,7 +67,7 @@ class TemplateEntityTypeList
 
         $query = $this->selectBuilderFactory
             ->create()
-            ->from('Template')
+            ->from(Template::ENTITY_TYPE)
             ->withAccessControlFilter()
             ->buildQueryBuilder()
             ->select(['entityType'])
@@ -74,12 +75,12 @@ class TemplateEntityTypeList
             ->build();
 
         $templateCollection = $this->entityManager
-            ->getRDBRepository('Template')
+            ->getRDBRepositoryByClass(Template::class)
             ->clone($query)
             ->find();
 
         foreach ($templateCollection as $template) {
-            $list[] = $template->get('entityType');
+            $list[] = $template->getTargetEntityType();
         }
 
         return $list;

application/Espo/Classes/AssignmentNotificators/Email.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,65 +29,61 @@
 
 namespace Espo\Classes\AssignmentNotificators;
 
-use Espo\Services\Email as EmailService;
-use Espo\Services\Stream as StreamService;
-
+use Espo\Core\Field\DateTime;
+use Espo\Entities\EmailAddress;
+use Espo\Entities\EmailFolder;
+use Espo\Modules\Crm\Entities\Account;
+use Espo\Modules\Crm\Entities\Contact;
+use Espo\Modules\Crm\Entities\Lead;
+use Espo\Tools\Stream\Service as StreamService;
 use Espo\Core\Notification\AssignmentNotificator;
 use Espo\Core\Notification\AssignmentNotificator\Params;
 use Espo\Core\Notification\UserEnabledChecker;
-use Espo\Core\InjectableFactory;
 use Espo\Core\AclManager;
-
 use Espo\ORM\EntityManager;
 use Espo\ORM\Entity;
-
 use Espo\Entities\User;
 use Espo\Entities\Notification;
 use Espo\Entities\Email as EmailEntity;
-
 use Espo\Repositories\Email as EmailRepository;
 use Espo\Repositories\EmailAddress as EmailAddressRepository;
+use Espo\Tools\Email\Util;
 
-use DateTime;
-use Exception;
-
+/**
+ * @implements AssignmentNotificator<EmailEntity>
+ */
 class Email implements AssignmentNotificator
 {
     private const DAYS_THRESHOLD = 2;
 
-    private ?StreamService $streamService = null;
-
-    private $user;
-
-    private $entityManager;
-
-    private $injectableFactory;
-
-    private $aclManager;
-
-    private $userChecker;
+    private User $user;
+    private EntityManager $entityManager;
+    private UserEnabledChecker $userChecker;
+    private AclManager $aclManager;
+    private StreamService $streamService;
 
     public function __construct(
         User $user,
         EntityManager $entityManager,
         UserEnabledChecker $userChecker,
-        InjectableFactory $injectableFactory,
-        AclManager $aclManager
+        AclManager $aclManager,
+        StreamService $streamService
     ) {
         $this->user = $user;
         $this->entityManager = $entityManager;
         $this->userChecker = $userChecker;
-        $this->injectableFactory = $injectableFactory;
         $this->aclManager = $aclManager;
+        $this->streamService = $streamService;
     }
 
+    /**
+     * @param EmailEntity $entity
+     */
     public function process(Entity $entity, Params $params): void
     {
-        /** @var EmailEntity $entity */
-
         if (
             !in_array(
-                $entity->get('status'),
+                $entity->getStatus(),
                 [
                     EmailEntity::STATUS_ARCHIVED,
                     EmailEntity::STATUS_SENT,
@@ -109,26 +105,19 @@ class Email implements AssignmentNotificator
             }
         }
 
-        $dateSent = $entity->get('dateSent');
+        $dateSent = $entity->getDateSent();
 
         if (!$dateSent) {
             return;
         }
 
-        try {
-            $dt = new DateTime($dateSent);
-        }
-        catch (Exception $e) {
-            return;
-        }
-
-        if ($dt->diff(new DateTime())->days > self::DAYS_THRESHOLD) {
+        if ($dateSent->diff(DateTime::createNow())->days > self::DAYS_THRESHOLD) {
             return;
         }
 
         $emailUserIdList = $entity->get('usersIds');
 
-        if (is_null($emailUserIdList) || !is_array($emailUserIdList)) {
+        if (!is_array($emailUserIdList)) {
             return;
         }
 
@@ -146,13 +135,13 @@ class Email implements AssignmentNotificator
 
         $data = [
             'emailId' => $entity->getId(),
-            'emailName' => $entity->get('name'),
+            'emailName' => $entity->getSubject(),
         ];
 
         /** @var EmailRepository $emailRepository */
-        $emailRepository = $this->entityManager->getRepository('Email');
+        $emailRepository = $this->entityManager->getRepository(EmailEntity::ENTITY_TYPE);
         /** @var EmailAddressRepository $emailAddressRepository */
-        $emailAddressRepository = $this->entityManager->getRepository('EmailAddress');
+        $emailAddressRepository = $this->entityManager->getRepository(EmailAddress::ENTITY_TYPE);
 
         if (!$entity->has('from')) {
             $emailRepository->loadFromField($entity);
@@ -167,7 +156,11 @@ class Email implements AssignmentNotificator
         $from = $entity->get('from');
 
         if ($from) {
-            $person = $emailAddressRepository->getEntityByAddress($from, null, ['User', 'Contact', 'Lead']);
+            $person = $emailAddressRepository->getEntityByAddress($from, null, [
+                User::ENTITY_TYPE,
+                Contact::ENTITY_TYPE,
+                Lead::ENTITY_TYPE,
+            ]);
 
             if ($person) {
                 $data['personEntityType'] = $person->getEntityType();
@@ -178,12 +171,12 @@ class Email implements AssignmentNotificator
 
         $userIdFrom = null;
 
-        if ($person && $person->getEntityType() === 'User') {
+        if ($person && $person->getEntityType() === User::ENTITY_TYPE) {
             $userIdFrom = $person->getId();
         }
 
         if (empty($data['personEntityId'])) {
-            $data['fromString'] = EmailService::parseFromName($entity->get('fromString'));
+            $data['fromString'] = Util::parseFromName($entity->getFromString());
 
             if (empty($data['fromString']) && $from) {
                 $data['fromString'] = $from;
@@ -192,8 +185,8 @@ class Email implements AssignmentNotificator
 
         $parent = null;
 
-        $parentId = $entity->get('parentId');
-        $parentType = $entity->get('parentType');
+        $parentId = $entity->getParentId();
+        $parentType = $entity->getParentType();
 
         if ($parentType && $parentId) {
             $parent = $this->entityManager->getEntityById($parentType, $parentId);
@@ -201,10 +194,10 @@ class Email implements AssignmentNotificator
 
         $account = null;
 
-        $accountId = $entity->get('accountId');
+        $accountLink = $entity->getAccount();
 
-        if ($accountId) {
-            $account = $this->entityManager->getEntityById('Account', $accountId);
+        if ($accountLink) {
+            $account = $this->entityManager->getEntityById(Account::ENTITY_TYPE, $accountLink->getId());
         }
 
         foreach ($userIdList as $userId) {
@@ -216,11 +209,15 @@ class Email implements AssignmentNotificator
                 continue;
             }
 
-            if ($entity->getLinkMultipleColumn('users', 'inTrash', $userId)) {
+            if ($entity->getLinkMultipleColumn('users', EmailEntity::USERS_COLUMN_IN_TRASH, $userId)) {
                 continue;
             }
 
-            if (!$this->userChecker->checkAssignment('Email', $userId)) {
+            if ($entity->getLinkMultipleColumn('users', EmailEntity::USERS_COLUMN_IS_READ, $userId)) {
+                continue;
+            }
+
+            if (!$this->userChecker->checkAssignment(EmailEntity::ENTITY_TYPE, $userId)) {
                 continue;
             }
 
@@ -228,25 +225,24 @@ class Email implements AssignmentNotificator
                 $params->getOption('isBeingImported') ||
                 $params->getOption('isJustSent')
             ) {
-                $folderId = $entity->getLinkMultipleColumn('users', 'folderId', $userId);
+                $folderId = $entity->getLinkMultipleColumn('users', EmailEntity::USERS_COLUMN_FOLDER_ID, $userId);
 
-                if ($folderId) {
-                    if (
-                        $this->entityManager
-                            ->getRDBRepository('EmailFolder')
-                            ->where([
-                                'id' => $folderId,
-                                'skipNotifications' => true,
-                            ])
-                            ->count()
-                    ) {
-                        continue;
-                    }
+                if (
+                    $folderId &&
+                    $this->entityManager
+                        ->getRDBRepositoryByClass(EmailFolder::class)
+                        ->where([
+                            'id' => $folderId,
+                            'skipNotifications' => true,
+                        ])
+                        ->count()
+                ) {
+                    continue;
                 }
             }
 
-            /** @var User|null $user */
-            $user = $this->entityManager->getEntity('User', $userId);
+            /** @var ?User $user */
+            $user = $this->entityManager->getEntityById(User::ENTITY_TYPE, $userId);
 
             if (!$user) {
                 continue;
@@ -256,18 +252,18 @@ class Email implements AssignmentNotificator
                 continue;
             }
 
-            if (!$this->aclManager->checkScope($user, 'Email')) {
+            if (!$this->aclManager->checkScope($user, EmailEntity::ENTITY_TYPE)) {
                 continue;
             }
 
             $isArchivedOrBeingImported =
-                $entity->get('status') === EmailEntity::STATUS_ARCHIVED ||
+                $entity->getStatus() === EmailEntity::STATUS_ARCHIVED ||
                 $params->getOption('isBeingImported');
 
             if (
                 $isArchivedOrBeingImported &&
                 $parent &&
-                $this->getStreamService()->checkIsFollowed($parent, $userId)
+                $this->streamService->checkIsFollowed($parent, $userId)
             ) {
                 continue;
             }
@@ -275,7 +271,7 @@ class Email implements AssignmentNotificator
             if (
                 $isArchivedOrBeingImported &&
                 $account &&
-                $this->getStreamService()->checkIsFollowed($account, $userId)
+                $this->streamService->checkIsFollowed($account, $userId)
             ) {
                 continue;
             }
@@ -286,7 +282,7 @@ class Email implements AssignmentNotificator
                     'type' => Notification::TYPE_EMAIL_RECEIVED,
                     'userId' => $userId,
                     'relatedId' => $entity->getId(),
-                    'relatedType' => 'Email',
+                    'relatedType' => EmailEntity::ENTITY_TYPE,
                 ])
                 ->select(['id'])
                 ->findOne();
@@ -300,17 +296,8 @@ class Email implements AssignmentNotificator
                 'userId' => $userId,
                 'data' => $data,
                 'relatedId' => $entity->getId(),
-                'relatedType' => 'Email',
+                'relatedType' => EmailEntity::ENTITY_TYPE,
             ]);
         }
     }
-
-    private function getStreamService(): StreamService
-    {
-        if (empty($this->streamService)) {
-            $this->streamService = $this->injectableFactory->create(StreamService::class);
-        }
-
-        return $this->streamService;
-    }
 }

application/Espo/Classes/Cleanup/Exports.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/Cleanup/MassActions.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/Cleanup/PasswordChangeRequests.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -40,7 +40,6 @@ use Espo\Entities\PasswordChangeRequest;
 class PasswordChangeRequests implements Cleanup
 {
     private Config $config;
-
     private EntityManager $entityManager;
 
     private string $cleanupPeriod = '30 days';

application/Espo/Classes/Cleanup/Reminders.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -31,18 +31,19 @@ namespace Espo\Classes\Cleanup;
 
 use Espo\Core\Cleanup\Cleanup;
 use Espo\Core\Utils\Config;
+use Espo\Core\Utils\DateTime as DateTimeUtil;
+use Espo\Modules\Crm\Entities\Reminder;
 use Espo\ORM\EntityManager;
 
 use DateTime;
 
 class Reminders implements Cleanup
 {
-    private $config;
-
-    private $entityManager;
-
     private string $cleanupRemindersPeriod = '15 days';
 
+    private Config $config;
+    private EntityManager $entityManager;
+
     public function __construct(Config $config, EntityManager $entityManager)
     {
         $this->config = $config;
@@ -60,9 +61,9 @@ class Reminders implements Cleanup
         $delete = $this->entityManager
             ->getQueryBuilder()
             ->delete()
-            ->from('Reminder')
+            ->from(Reminder::ENTITY_TYPE)
             ->where([
-                'remindAt<' => $dt->format('Y-m-d'),
+                'remindAt<' => $dt->format(DateTimeUtil::SYSTEM_DATE_TIME_FORMAT),
             ])
             ->build();
 

application/Espo/Classes/Cleanup/Subscribers.php

@@ -0,0 +1,137 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Cleanup;
+
+use Espo\Core\Cleanup\Cleanup;
+use Espo\Core\Field\DateTime;
+use Espo\Core\Utils\Config;
+use Espo\Core\Utils\Metadata;
+use Espo\Entities\Subscription;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Query\Part\Condition as Cond;
+
+class Subscribers implements Cleanup
+{
+    private const PERIOD = '2 months';
+
+    private Metadata $metadata;
+    private EntityManager $entityManager;
+    private Config $config;
+
+    public function __construct(
+        Metadata $metadata,
+        EntityManager $entityManager,
+        Config $config
+    ) {
+        $this->metadata = $metadata;
+        $this->entityManager = $entityManager;
+        $this->config = $config;
+    }
+
+    public function process(): void
+    {
+        if (!$this->config->get('cleanupSubscribers')) {
+            return;
+        }
+
+        /** @var string[] $scopeList */
+        $scopeList = array_keys($this->metadata->get(['scopes']) ?? []);
+
+        /** @var string[] $scopeList */
+        $scopeList = array_values(array_filter(
+            $scopeList,
+            fn ($item) => (bool) $this->metadata->get(['scopes', $item, 'stream'])
+        ));
+
+        foreach ($scopeList as $scope) {
+            $this->processEntityType($scope);
+        }
+    }
+
+    private function processEntityType(string $entityType): void
+    {
+        /** @var ?array<string, mixed> $data */
+        $data = $this->metadata->get(['streamDefs', $entityType, 'subscribersCleanup']);
+
+        if (!($data['enabled'] ?? false)) {
+            return;
+        }
+
+        /** @var string $dateField */
+        $dateField = $data['dateField'] ?? 'createdAt';
+        /** @var ?string[] $statusList */
+        $statusList = $data['statusList'] ?? null;
+        /** @var ?string $statusField */
+        $statusField = $this->metadata->get(['scopes', $entityType, 'statusField']);
+
+        if ($statusList === null || $statusField === null) {
+            return;
+        }
+
+        /** @var string $period */
+        $period = $this->metadata->get(['streamDefs', $entityType, 'subscribersCleanup', 'period']) ??
+            $this->config->get('cleanupSubscribersPeriod') ??
+            self::PERIOD;
+
+        $before = DateTime::createNow()->modify('-' . $period);
+
+        $query = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from(Subscription::ENTITY_TYPE, 'subscription')
+            ->join(
+                $entityType,
+                'entity',
+                Cond::equal(
+                    Cond::column('entity.id'),
+                    Cond::column('entityId')
+                )
+            )
+            ->where(
+                Cond::and(
+                    Cond::equal(
+                        Cond::column('entityType'),
+                        $entityType
+                    ),
+                    Cond::less(
+                        Cond::column('entity.' . $dateField),
+                        $before->getString()
+                    ),
+                    Cond::in(
+                        Cond::column('entity.' . $statusField),
+                        $statusList
+                    )
+                )
+            )
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($query);
+    }
+}

application/Espo/Classes/Cleanup/TwoFactorCodes.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/Cleanup/WebhookQueue.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/ConsoleCommands/Import.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -83,14 +83,21 @@ class Import implements Command
                 $resultId = $result->getId();
                 $countCreated = $result->getCountCreated();
                 $countUpdated = $result->getCountUpdated();
+                $countError = $result->getCountError();
+                $countDuplicate = $result->getCountDuplicate();
             }
             catch (Throwable $e) {
-                $io->writeLine("Error occurred: ". $e->getMessage() . "");
+                $io->writeLine("Error occurred: " . $e->getMessage());
 
                 return;
             }
 
-            $io->writeLine("Finished. Import ID: {$resultId}. Created: {$countCreated}. Updated: {$countUpdated}.");
+            $io->writeLine("Finished.");
+            $io->writeLine("  Import ID: {$resultId}");
+            $io->writeLine("  Created: {$countCreated}");
+            $io->writeLine("  Updated: {$countUpdated}");
+            $io->writeLine("  Duplicates: {$countDuplicate}");
+            $io->writeLine("  Errors: {$countError}");
 
             return;
         }
@@ -102,7 +109,7 @@ class Import implements Command
                 $this->service->revert($id);
             }
             catch (Throwable $e) {
-                $io->writeLine("Error occurred: " . $e->getMessage() . "");
+                $io->writeLine("Error occurred: " . $e->getMessage());
 
                 return;
             }
@@ -119,15 +126,21 @@ class Import implements Command
                 $result = $this->service->importById($id, true, $forceResume);
             }
             catch (Throwable $e) {
-                $io->writeLine("Error occurred: " . $e->getMessage() . "");
+                $io->writeLine("Error occurred: " . $e->getMessage());
 
                 return;
             }
 
             $countCreated = $result->getCountCreated();
             $countUpdated = $result->getCountUpdated();
+            $countError = $result->getCountError();
+            $countDuplicate = $result->getCountDuplicate();
 
-            $io->writeLine("Finished. Created: {$countCreated}. Updated: {$countUpdated}.");
+            $io->writeLine("Finished.");
+            $io->writeLine("  Created: {$countCreated}");
+            $io->writeLine("  Updated: {$countUpdated}");
+            $io->writeLine("  Duplicates: {$countDuplicate}");
+            $io->writeLine("  Errors: {$countError}");
 
             return;
         }

application/Espo/Classes/ConsoleCommands/PopulateArrayValues.php

@@ -0,0 +1,108 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\ConsoleCommands;
+
+use Espo\Core\Console\Command;
+use Espo\Core\Console\Command\Params;
+use Espo\Core\Console\IO;
+use Espo\Core\Exceptions\Error;
+use Espo\Core\ORM\Entity as CoreEntity;
+use Espo\Entities\ArrayValue;
+use Espo\ORM\Entity;
+use Espo\ORM\EntityManager;
+use Espo\Repositories\ArrayValue as ArrayValueRepository;
+
+class PopulateArrayValues implements Command
+{
+    private EntityManager $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * @throws Error
+     */
+    public function run(Params $params, IO $io): void
+    {
+        $entityType = $params->getArgument(0);
+        $field = $params->getArgument(1);
+
+        if (!$entityType || !$field) {
+            throw new Error("Entity type and field should be passed as arguments.");
+        }
+
+        if (!$this->entityManager->hasRepository($entityType)) {
+            throw new Error("Bad entity type.");
+        }
+
+        $defs = $this->entityManager->getDefs()->getEntity($entityType);
+
+        if (!$defs->hasAttribute($field)) {
+            throw new Error("Bad field.");
+        }
+
+        if ($defs->getAttribute($field)->getType() !== Entity::JSON_ARRAY) {
+            throw new Error("Non-array field.");
+        }
+
+        if ($defs->getAttribute($field)->isNotStorable()) {
+            throw new Error("Not-storable field.");
+        }
+
+        if (!$defs->getAttribute($field)->getParam('storeArrayValues')) {
+            throw new Error("Array values disabled for the field..");
+        }
+
+        $collection = $this->entityManager
+            ->getRDBRepository($entityType)
+            ->sth()
+            ->find();
+
+        /** @var ArrayValueRepository $repository */
+        $repository = $this->entityManager->getRepository(ArrayValue::ENTITY_TYPE);
+
+        foreach ($collection as $i => $entity) {
+            if (!$entity instanceof CoreEntity) {
+                throw new Error();
+            }
+
+            $repository->storeEntityAttribute($entity, $field);
+
+            if ($i % 1000 === 0) {
+                $io->write('.');
+            }
+        }
+
+        $io->writeLine('');
+        $io->writeLine('Done.');
+    }
+}

application/Espo/Classes/ConsoleCommands/PopulateNumbers.php

@@ -0,0 +1,111 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\ConsoleCommands;
+
+use Espo\Core\Console\Command;
+use Espo\Core\Console\Command\Params;
+use Espo\Core\Console\Exceptions\ArgumentNotSpecified;
+use Espo\Core\Console\Exceptions\InvalidArgument;
+use Espo\Core\Console\IO;
+use Espo\Core\Exceptions\Error;
+use Espo\Core\FieldProcessing\NextNumber\BeforeSaveProcessor;
+use Espo\Core\ORM\Entity as CoreEntity;
+use Espo\Core\ORM\Repository\Option\SaveOption;
+use Espo\ORM\EntityManager;
+use Espo\ORM\Query\Part\Order;
+
+class PopulateNumbers implements Command
+{
+    private BeforeSaveProcessor $beforeSaveProcessor;
+    private EntityManager $entityManager;
+
+    public function __construct(
+        BeforeSaveProcessor $beforeSaveProcessor,
+        EntityManager $entityManager
+    ) {
+        $this->beforeSaveProcessor = $beforeSaveProcessor;
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * @throws Error
+     */
+    public function run(Params $params, IO $io): void
+    {
+        $entityType = $params->getArgument(0);
+        $field = $params->getArgument(1);
+
+        $orderBy = $params->getOption('orderBy') ?? 'createdAt';
+        $order = $params->getOption('order') ?? Order::ASC;
+
+        if (!$entityType) {
+            throw new ArgumentNotSpecified("No entity type argument.");
+        }
+
+        if (!$field) {
+            throw new ArgumentNotSpecified("No field argument.");
+        }
+
+        $fieldType = $this->entityManager
+            ->getDefs()
+            ->getEntity($entityType)
+            ->getField($field)
+            ->getType();
+
+        if ($fieldType !== 'number') {
+            throw new InvalidArgument("Field `{$field}` is not of `number` type.");
+        }
+
+        $collection = $this->entityManager
+            ->getRDBRepository($entityType)
+            ->where([
+                $field => null,
+            ])
+            ->order($orderBy, $order)
+            ->sth()
+            ->find();
+
+        foreach ($collection as $i => $entity) {
+            if (!$entity instanceof CoreEntity) {
+                throw new Error();
+            }
+
+            $this->beforeSaveProcessor->processPopulate($entity, $field);
+            $this->entityManager->saveEntity($entity, [SaveOption::IMPORT => true]);
+
+            if ($i % 1000 === 0) {
+                $io->write('.');
+            }
+        }
+
+        $io->writeLine('');
+        $io->writeLine('Done.');
+    }
+}

application/Espo/Classes/ConsoleCommands/RebuildCategoryPaths.php

@@ -0,0 +1,70 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\ConsoleCommands;
+
+use Espo\Core\Console\Command;
+use Espo\Core\Console\Command\Params;
+use Espo\Core\Console\IO;
+use Espo\Tools\CategoryTree\RebuildPaths;
+use Exception;
+
+class RebuildCategoryPaths implements Command
+{
+    private RebuildPaths $rebuildPaths;
+
+    public function __construct(RebuildPaths $rebuildPaths)
+    {
+        $this->rebuildPaths = $rebuildPaths;
+    }
+
+    public function run(Params $params, IO $io): void
+    {
+        $entityType = $params->getArgument(0);
+
+        if (!$entityType) {
+            $io->setExitStatus(1);
+            $io->writeLine("Error: No entity type. Should be specified as the first argument.");
+
+            return;
+        }
+
+        try {
+            $this->rebuildPaths->run($entityType);
+        }
+        catch (Exception $e) {
+            $io->setExitStatus(1);
+            $io->writeLine("Error: " . $e->getMessage());
+
+            return;
+        }
+
+        $io->writeLine("Done.");
+    }
+}

application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/DuplicateWhereBuilders/Company.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/DuplicateWhereBuilders/Person.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldDuplicators/AttachmentMultiple.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldDuplicators/File.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldDuplicators/LinkMultiple.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -71,7 +71,7 @@ class LinkMultiple implements FieldDuplicator
             ->getRelation($relationDefs->getForeignRelationName())
             ->getType();
 
-        if ($foreignRelationType !== Entity::HAS_MANY) {
+        if ($foreignRelationType !== Entity::MANY_MANY) {
             $valueMap->{$field . 'Ids'} = [];
             $valueMap->{$field . 'Names'} = (object) [];
             $valueMap->{$field . 'Columns'} = (object) [];

application/Espo/Classes/FieldDuplicators/Wysiwyg.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldProcessing/Email/AddressDataLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,49 +29,39 @@
 
 namespace Espo\Classes\FieldProcessing\Email;
 
+use Espo\Modules\Crm\Entities\Call;
+use Espo\Modules\Crm\Entities\Meeting;
 use Espo\ORM\Entity;
 use Espo\ORM\EntityManager;
 use Espo\Repositories\EmailAddress as EmailAddressRepository;
 use Espo\Entities\EmailAddress;
 use Espo\Entities\Email;
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Core\Mail\Event\Event as EspoEvent;
+use Espo\Core\Mail\Event\EventFactory;
+use Espo\Core\Utils\Log;
 
-use Espo\Core\{
-    FieldProcessing\Loader,
-    FieldProcessing\Loader\Params,
-    Mail\Event\Event as EspoEvent,
-    Mail\Event\EventFactory,
-    Utils\Log,
-};
-
-use ICal\ICal;
 use ICal\Event;
+use ICal\ICal;
 
 use Throwable;
 use stdClass;
 
 /**
- * @implements Loader<\Espo\Entities\Email>
+ * @implements Loader<Email>
  */
 class IcsDataLoader implements Loader
 {
-    private $entityManager;
-
-    private $log;
-
-    /**
-     * @var array<string,string>
-     */
+    /** @var array<string, string> */
     private $entityTypeLinkMap = [
         'User' => 'users',
         'Contact' => 'contacts',
         'Lead' => 'leads',
     ];
 
-    public function __construct(EntityManager $entityManager, Log $log)
-    {
-        $this->entityManager = $entityManager;
-        $this->log = $log;
-    }
+    public function __construct(private EntityManager $entityManager, private Log $log)
+    {}
 
     public function process(Entity $entity, Params $params): void
     {
@@ -85,7 +75,7 @@ class IcsDataLoader implements Loader
 
         $ical->initString($icsContents);
 
-        /* @var $event Event */
+        /* @var ?Event $event */
         $event = $ical->events()[0] ?? null;
 
         if ($event === null) {
@@ -121,11 +111,14 @@ class IcsDataLoader implements Loader
             return;
         }
 
+        if ($this->eventAlreadyExists($espoEvent)) {
+            return;
+        }
+
         /** @var EmailAddressRepository $emailAddressRepository */
         $emailAddressRepository = $this->entityManager->getRepository(EmailAddress::ENTITY_TYPE);
 
         $attendeeEmailAddressList = $espoEvent->getAttendeeEmailAddressList();
-
         $organizerEmailAddress = $espoEvent->getOrganizerEmailAddress();
 
         if ($organizerEmailAddress) {
@@ -167,7 +160,6 @@ class IcsDataLoader implements Loader
         $this->loadCreatedEvent($entity, $espoEvent, $eventData);
 
         $entity->set('icsEventData', $eventData);
-
         $entity->set('icsEventDateStart', $espoEvent->getDateStart());
 
         if ($espoEvent->isAllDay()) {
@@ -209,4 +201,35 @@ class IcsDataLoader implements Loader
             'name' => $createdEvent->get('name'),
         ];
     }
+
+    private function eventAlreadyExists(EspoEvent $espoEvent): bool
+    {
+        $id = $espoEvent->getUid();
+
+        if (!$id) {
+            return false;
+        }
+
+        $found1 = $this->entityManager
+            ->getRDBRepository(Meeting::ENTITY_TYPE)
+            ->select(['id'])
+            ->where(['id' => $id])
+            ->findOne();
+
+        if ($found1) {
+            return true;
+        }
+
+        $found2 = $this->entityManager
+            ->getRDBRepository(Call::ENTITY_TYPE)
+            ->select(['id'])
+            ->where(['id' => $id])
+            ->findOne();
+
+        if ($found2) {
+            return true;
+        }
+
+        return false;
+    }
 }

application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -30,30 +30,22 @@
 namespace Espo\Classes\FieldProcessing\Email;
 
 use Espo\ORM\Entity;
-
 use Espo\Repositories\EmailAddress as EmailAddressRepository;
-
-use Espo\Core\{
-    FieldProcessing\Loader,
-    FieldProcessing\Loader\Params,
-    ORM\EntityManager,
-};
-
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Core\ORM\EntityManager;
 use Espo\Entities\Email;
 use Espo\Entities\User;
 
 /**
- * @implements Loader<\Espo\Entities\Email>
+ * @implements Loader<Email>
  */
 class StringDataLoader implements Loader
 {
-    private $entityManager;
+    private EntityManager $entityManager;
+    private User $user;
 
-    private $user;
-
-    /**
-     * @var array<string,string>
-     */
+    /** @var array<string, string> */
     private $fromEmailAddressNameCache = [];
 
     public function __construct(EntityManager $entityManager, User $user)
@@ -66,21 +58,22 @@ class StringDataLoader implements Loader
     {
         /** @var Email $entity */
 
-        $userEmailAdddressIdList = [];
+        $userEmailAddressIdList = [];
 
         $emailAddressCollection = $this->entityManager
-            ->getRDBRepository('User')
+            ->getRDBRepository(User::ENTITY_TYPE)
             ->getRelation($this->user, 'emailAddresses')
             ->select(['id'])
             ->find();
 
         foreach ($emailAddressCollection as $emailAddress) {
-            $userEmailAdddressIdList[] = $emailAddress->getId();
+            $userEmailAddressIdList[] = $emailAddress->getId();
         }
 
         if (
-            in_array($entity->get('fromEmailAddressId'), $userEmailAdddressIdList) ||
-            $entity->get('createdById') === $this->user->getId() && $entity->get('status') === Email::STATUS_SENT
+            in_array($entity->get('fromEmailAddressId'), $userEmailAddressIdList) ||
+            $entity->get('createdById') === $this->user->getId() &&
+            $entity->getStatus() === Email::STATUS_SENT
         ) {
             $entity->loadLinkMultipleField('toEmailAddresses');
 
@@ -104,7 +97,7 @@ class StringDataLoader implements Loader
             return;
         }
 
-        /**  @var ?string */
+        /**  @var ?string $fromEmailAddressId */
         $fromEmailAddressId = $entity->get('fromEmailAddressId');
 
         if (!$fromEmailAddressId) {
@@ -114,7 +107,7 @@ class StringDataLoader implements Loader
         if (!array_key_exists($fromEmailAddressId, $this->fromEmailAddressNameCache)) {
             $person = $this->getEmailAddressRepository()->getEntityByAddressId($fromEmailAddressId, null, true);
 
-            $fromName = $person ? $person->get('name') : null;
+            $fromName = $person?->get('name');
 
             $this->fromEmailAddressNameCache[$fromEmailAddressId] = $fromName;
         }

application/Espo/Classes/FieldProcessing/Email/UserColumnsLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,24 +29,20 @@
 
 namespace Espo\Classes\FieldProcessing\Email;
 
+use Espo\Entities\Email;
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    FieldProcessing\Loader,
-    FieldProcessing\Loader\Params,
-    ORM\EntityManager,
-};
-
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Core\ORM\EntityManager;
 use Espo\Entities\User;
 
 /**
- * @implements Loader<\Espo\Entities\Email>
+ * @implements Loader<Email>
  */
 class UserColumnsLoader implements Loader
 {
-    private $entityManager;
-
-    private $user;
+    private EntityManager $entityManager;
+    private User $user;
 
     public function __construct(EntityManager $entityManager, User $user)
     {
@@ -57,8 +53,12 @@ class UserColumnsLoader implements Loader
     public function process(Entity $entity, Params $params): void
     {
         $emailUser = $this->entityManager
-            ->getRDBRepository('EmailUser')
-            ->select(['isRead', 'isImportant', 'inTrash'])
+            ->getRDBRepository(Email::RELATIONSHIP_EMAIL_USER)
+            ->select([
+                Email::USERS_COLUMN_IS_READ,
+                Email::USERS_COLUMN_IS_IMPORTANT,
+                Email::USERS_COLUMN_IN_TRASH,
+            ])
             ->where([
                 'deleted' => false,
                 'userId' => $this->user->getId(),
@@ -67,17 +67,17 @@ class UserColumnsLoader implements Loader
             ->findOne();
 
         if (!$emailUser) {
-            $entity->set('isRead', null);
-            $entity->clear('isImportant');
-            $entity->clear('inTrash');
+            $entity->set(Email::USERS_COLUMN_IS_READ, null);
+            $entity->clear(Email::USERS_COLUMN_IS_IMPORTANT);
+            $entity->clear(Email::USERS_COLUMN_IN_TRASH);
 
             return;
         }
 
         $entity->set([
-            'isRead' => $emailUser->get('isRead'),
-            'isImportant' => $emailUser->get('isImportant'),
-            'inTrash' => $emailUser->get('inTrash'),
+            Email::USERS_COLUMN_IS_READ => $emailUser->get(Email::USERS_COLUMN_IS_READ),
+            Email::USERS_COLUMN_IS_IMPORTANT => $emailUser->get(Email::USERS_COLUMN_IS_IMPORTANT),
+            Email::USERS_COLUMN_IN_TRASH => $emailUser->get(Email::USERS_COLUMN_IN_TRASH),
         ]);
     }
 }

application/Espo/Classes/FieldProcessing/Import/CountsLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,27 +29,26 @@
 
 namespace Espo\Classes\FieldProcessing\User;
 
+use Espo\Entities\AuthLogRecord;
+use Espo\Entities\AuthToken;
+use Espo\Entities\User;
 use Espo\ORM\Entity;
-
-use Espo\Core\{
-    FieldProcessing\Loader,
-    FieldProcessing\Loader\Params,
-    ORM\EntityManager,
-    Acl,
-    Acl\Table,
-};
+use Espo\Core\Acl;
+use Espo\Core\Acl\Table;
+use Espo\Core\FieldProcessing\Loader;
+use Espo\Core\FieldProcessing\Loader\Params;
+use Espo\Core\ORM\EntityManager;
 
 use DateTime;
 use Exception;
 
 /**
- * @implements Loader<\Espo\Entities\User>
+ * @implements Loader<User>
  */
 class LastAccessLoader implements Loader
 {
-    private $entityManager;
-
-    private $acl;
+    private EntityManager $entityManager;
+    private Acl $acl;
 
     public function __construct(EntityManager $entityManager, Acl $acl)
     {
@@ -67,7 +66,7 @@ class LastAccessLoader implements Loader
         }
 
         $authToken = $this->entityManager
-            ->getRDBRepository('AuthToken')
+            ->getRDBRepository(AuthToken::ENTITY_TYPE)
             ->select(['id', 'lastAccess'])
             ->where([
                 'userId' => $entity->getId(),
@@ -87,7 +86,7 @@ class LastAccessLoader implements Loader
             try {
                 $dt = new DateTime($lastAccess);
             }
-            catch (Exception $e) {}
+            catch (Exception) {}
         }
 
         $where = [
@@ -100,7 +99,7 @@ class LastAccessLoader implements Loader
         }
 
         $authLogRecord = $this->entityManager
-            ->getRDBRepository('AuthLogRecord')
+            ->getRDBRepository(AuthLogRecord::ENTITY_TYPE)
             ->select(['id', 'createdAt'])
             ->where($where)
             ->order('requestTime', true)

application/Espo/Classes/FieldValidators/ArrayIntType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/ArrayType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,12 +29,27 @@
 
 namespace Espo\Classes\FieldValidators;
 
+use Espo\Core\Utils\Metadata;
+
+use Espo\ORM\Defs;
 use Espo\ORM\Entity;
 
-use StdClass;
+use stdClass;
 
 class ArrayType
 {
+    private Metadata $metadata;
+
+    private Defs $defs;
+
+    private const DEFAULT_MAX_LENGTH = 100;
+
+    public function __construct(Metadata $metadata, Defs $defs)
+    {
+        $this->metadata = $metadata;
+        $this->defs = $defs;
+    }
+
     public function checkRequired(Entity $entity, string $field): bool
     {
         return $this->isNotEmpty($entity, $field);
@@ -55,9 +70,92 @@ class ArrayType
         return true;
     }
 
-    public function rawCheckArray(StdClass $data, string $field): bool
+    public function checkArrayOfString(Entity $entity, string $field): bool
     {
-        if (isset($data->$field) && $data->$field !== null && !is_array($data->$field)) {
+        /** @var ?mixed[] $list */
+        $list = $entity->get($field);
+
+        if ($list === null) {
+            return true;
+        }
+
+        foreach ($list as $item) {
+            if (!is_string($item)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function checkValid(Entity $entity, string $field): bool
+    {
+        if (!$entity->has($field)) {
+            return true;
+        }
+
+        /** @var ?string[] $value */
+        $value = $entity->get($field);
+
+        if ($value === null || $value === []) {
+            return true;
+        }
+
+        $fieldDefs = $this->defs
+            ->getEntity($entity->getEntityType())
+            ->getField($field);
+
+        if ($fieldDefs->getParam('allowCustomOptions')) {
+            return true;
+        }
+
+        $optionList = $this->getOptionList($entity->getEntityType(), $field);
+
+        if ($optionList === null) {
+            return true;
+        }
+
+        foreach ($value as $item) {
+            if (!in_array($item, $optionList)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @return ?string[]
+     */
+    private function getOptionList(string $entityType, string $field): ?array
+    {
+        $fieldDefs = $this->defs
+            ->getEntity($entityType)
+            ->getField($field);
+
+        /** @var ?string $path */
+        $path = $fieldDefs->getParam('optionsPath');
+
+        /** @var string[]|null|false $optionList */
+        $optionList = $path ?
+            $this->metadata->get($path) :
+            $fieldDefs->getParam('options');
+
+        if ($optionList === null) {
+            return null;
+        }
+
+        // For bc.
+        if ($optionList === false) {
+            return null;
+        }
+
+        return $optionList;
+    }
+
+    public function rawCheckArray(stdClass $data, string $field): bool
+    {
+        if (isset($data->$field) && !is_array($data->$field)) {
             return false;
         }
 
@@ -82,4 +180,73 @@ class ArrayType
 
         return false;
     }
+
+    public function checkMaxLength(Entity $entity, string $field, ?int $validationValue): bool
+    {
+        $maxLength = $validationValue ?? self::DEFAULT_MAX_LENGTH;
+
+        /** @var string[] $value */
+        $value = $entity->get($field) ?? [];
+
+        foreach ($value as $item) {
+            if (mb_strlen($item) > $maxLength) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function checkPattern(Entity $entity, string $field, ?string $validationValue): bool
+    {
+        if (!$validationValue) {
+            return true;
+        }
+
+        $pattern = $validationValue;
+
+        if ($validationValue[0] === '$') {
+            $patternName = substr($validationValue, 1);
+
+            $pattern = $this->metadata->get(['app', 'regExpPatterns', $patternName, 'pattern']) ??
+                $pattern;
+        }
+
+        $preparedPattern = '/^' . $pattern . '$/';
+
+        /** @var string[] $value */
+        $value = $entity->get($field) ?? [];
+
+        foreach ($value as $item) {
+            if ($item === '') {
+                continue;
+            }
+
+            if (!preg_match($preparedPattern, $item)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function checkNoEmptyString(Entity $entity, string $field, ?bool $validationValue): bool
+    {
+        if (!$validationValue) {
+            return true;
+        }
+
+        /** @var string[] $value */
+        $value = $entity->get($field) ?? [];
+
+        $optionList = $this->getOptionList($entity->getEntityType(), $field) ?? [];
+
+        foreach ($value as $item) {
+            if ($item === '' && !in_array($item, $optionList)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }

application/Espo/Classes/FieldValidators/Attachment/Related.php

@@ -0,0 +1,47 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\FieldValidators\Attachment;
+
+use Espo\Classes\FieldValidators\LinkParentType;
+use Espo\ORM\Entity;
+
+class Related extends LinkParentType
+{
+    public function checkValid(Entity $entity, string $field): bool
+    {
+        $typeValue = $entity->get($field . 'Type');
+
+        if ($typeValue === 'TemplateManager') {
+            return true;
+        }
+
+        return parent::checkValid($entity, $field);
+    }
+}

application/Espo/Classes/FieldValidators/ChecklistType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,7 +29,4 @@
 
 namespace Espo\Classes\FieldValidators;
 
-class ChecklistType extends ArrayType
-{
-
-}
+class ChecklistType extends ArrayType {}

application/Espo/Classes/FieldValidators/CurrencyType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,10 +29,13 @@
 
 namespace Espo\Classes\FieldValidators;
 
+use Espo\Core\Utils\Config;
 use Espo\ORM\Entity;
 
 class CurrencyType extends FloatType
 {
+    public function __construct(private Config $config) {}
+
     protected function isNotEmpty(Entity $entity, string $field): bool
     {
         return
@@ -40,4 +43,26 @@ class CurrencyType extends FloatType
             $entity->has($field . 'Currency') && $entity->get($field . 'Currency') !== null &&
             $entity->get($field . 'Currency') !== '';
     }
+
+    public function checkValidCurrency(Entity $entity, string $field): bool
+    {
+        $attribute = $field . 'Currency';
+
+        if (!$entity->has($attribute)) {
+            return true;
+        }
+
+        $currency = $entity->get($attribute);
+        $currencyList = $this->config->get('currencyList') ?? [$this->config->get('defaultCurrency')];
+
+        if (
+            $currency === null &&
+            $entity->has($field) &&
+            $entity->get($field) === null
+        ) {
+            return true;
+        }
+
+        return in_array($currency, $currencyList);
+    }
 }

application/Espo/Classes/FieldValidators/DateType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,8 +29,11 @@
 
 namespace Espo\Classes\FieldValidators;
 
+use Espo\Core\Field\Date;
 use Espo\ORM\Entity;
 
+use Exception;
+
 class DateType
 {
     public function checkRequired(Entity $entity, string $field): bool
@@ -42,4 +45,23 @@ class DateType
     {
         return $entity->has($field) && $entity->get($field) !== null;
     }
+
+    public function checkValid(Entity $entity, string $field): bool
+    {
+        /** @var ?string $value */
+        $value = $entity->get($field);
+
+        if ($value === null) {
+            return true;
+        }
+
+        try {
+            Date::fromString($value);
+        }
+        catch (Exception $e) {
+            return false;
+        }
+
+        return true;
+    }
 }

application/Espo/Classes/FieldValidators/DatetimeOptionalType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,7 +29,10 @@
 
 namespace Espo\Classes\FieldValidators;
 
+use Espo\Core\Field\DateTime;
+use Espo\Core\Field\Date;
 use Espo\ORM\Entity;
+use Exception;
 
 class DatetimeOptionalType extends DatetimeType
 {
@@ -50,4 +53,33 @@ class DatetimeOptionalType extends DatetimeType
 
         return false;
     }
+
+    public function checkValid(Entity $entity, string $field): bool
+    {
+        /** @var ?string $dateValue */
+        $dateValue = $entity->get($field  . 'Date');
+
+        if ($dateValue !== null) {
+            try {
+                Date::fromString($dateValue);
+            }
+            catch (Exception $e) {
+                return false;
+            }
+        }
+
+        /** @var ?string $value */
+        $value = $entity->get($field);
+
+        if ($value !== null) {
+            try {
+                DateTime::fromString($value);
+            }
+            catch (Exception $e) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }

application/Espo/Classes/FieldValidators/DatetimeType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,6 +29,29 @@
 
 namespace Espo\Classes\FieldValidators;
 
+use Espo\Core\Field\DateTime;
+use Espo\ORM\Entity;
+
+use Exception;
+
 class DatetimeType extends DateType
 {
+    public function checkValid(Entity $entity, string $field): bool
+    {
+        /** @var ?string $value */
+        $value = $entity->get($field);
+
+        if ($value === null) {
+            return true;
+        }
+
+        try {
+            DateTime::fromString($value);
+        }
+        catch (Exception $e) {
+            return false;
+        }
+
+        return true;
+    }
 }

application/Espo/Classes/FieldValidators/Email/EmailAddresses.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/EmailType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,10 +29,21 @@
 
 namespace Espo\Classes\FieldValidators;
 
+use Espo\Core\Utils\Metadata;
 use Espo\ORM\Entity;
 
+use stdClass;
+
 class EmailType
 {
+    private Metadata $metadata;
+
+    private const DEFAULT_MAX_LENGTH = 255;
+
+    public function __construct(Metadata $metadata)
+    {
+        $this->metadata = $metadata;
+    }
     public function checkRequired(Entity $entity, string $field): bool
     {
         if ($this->isNotEmpty($entity, $field)) {
@@ -71,6 +82,10 @@ class EmailType
         }
 
         foreach ($dataList as $item) {
+            if (!$item instanceof stdClass) {
+                return false;
+            }
+
             if (empty($item->emailAddress)) {
                 continue;
             }
@@ -85,6 +100,36 @@ class EmailType
         return true;
     }
 
+    public function checkMaxLength(Entity $entity, string $field): bool
+    {
+        /** @var ?string $value */
+        $value = $entity->get($field);
+
+        /** @var int $maxLength */
+        $maxLength = $this->metadata->get(['entityDefs', 'EmailAddress', 'fields', 'name', 'maxLength']) ??
+            self::DEFAULT_MAX_LENGTH;
+
+        if ($value && mb_strlen($value) > $maxLength) {
+            return false;
+        }
+
+        $dataList = $entity->get($field . 'Data');
+
+        if (!is_array($dataList)) {
+            return true;
+        }
+
+        foreach ($dataList as $item) {
+            $value = $item->emailAddress;
+
+            if ($value && mb_strlen($value) > $maxLength) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     protected function isNotEmpty(Entity $entity, string $field): bool
     {
         return $entity->has($field) && $entity->get($field) !== '' && $entity->get($field) !== null;

application/Espo/Classes/FieldValidators/EnumType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,15 +29,90 @@
 
 namespace Espo\Classes\FieldValidators;
 
+use Espo\Core\Utils\Metadata;
+
+use Espo\ORM\Defs;
 use Espo\ORM\Entity;
 
 class EnumType
 {
+    private Metadata $metadata;
+
+    private Defs $defs;
+
+    private const DEFAULT_MAX_LENGTH = 255;
+
+    public function __construct(Metadata $metadata, Defs $defs)
+    {
+        $this->metadata = $metadata;
+        $this->defs = $defs;
+    }
+
     public function checkRequired(Entity $entity, string $field): bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
+    public function checkValid(Entity $entity, string $field): bool
+    {
+        if (!$entity->has($field)) {
+            return true;
+        }
+
+        $fieldDefs = $this->defs
+            ->getEntity($entity->getEntityType())
+            ->getField($field);
+
+        /** @var ?string $path */
+        $path = $fieldDefs->getParam('optionsPath');
+
+        /** @var string[]|null|false $optionList */
+        $optionList = $path ?
+            $this->metadata->get($path) :
+            $fieldDefs->getParam('options');
+
+        if ($optionList === null) {
+            return true;
+        }
+
+        // For bc.
+        if ($optionList === false) {
+            return true;
+        }
+
+        $optionList = array_map(
+            fn ($item) => $item === '' ? null : $item,
+            $optionList
+        );
+
+        $value = $entity->get($field);
+
+        // For bc.
+        // @todo Remove in v8.0.
+        if ($value === '') {
+            $value = null;
+        }
+
+        return in_array($value, $optionList);
+    }
+
+    public function checkMaxLength(Entity $entity, string $field, ?int $validationValue): bool
+    {
+        if (!$this->isNotEmpty($entity, $field)) {
+            return true;
+        }
+
+        $value = $entity->get($field);
+
+        $maxLength = $validationValue ?? self::DEFAULT_MAX_LENGTH;
+
+        if (mb_strlen($value) > $maxLength) {
+            return false;
+        }
+
+        return true;
+    }
+
     protected function isNotEmpty(Entity $entity, string $field): bool
     {
         return $entity->has($field) && $entity->get($field) !== null;

application/Espo/Classes/FieldValidators/FileType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/FloatType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/ImageType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/IntType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify

application/Espo/Classes/FieldValidators/JsonArrayType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -31,13 +31,13 @@ namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
-use StdClass;
+use stdClass;
 
 class JsonArrayType
 {
-    public function rawCheckArray(StdClass $data, string $field): bool
+    public function rawCheckArray(stdClass $data, string $field): bool
     {
-        if (isset($data->$field) && $data->$field !== null && !is_array($data->$field)) {
+        if (isset($data->$field) && !is_array($data->$field)) {
             return false;
         }
 

application/Espo/Classes/FieldValidators/LinkMultipleType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,20 +29,240 @@
 
 namespace Espo\Classes\FieldValidators;
 
+use Espo\Core\Utils\Metadata;
+use Espo\ORM\Defs;
 use Espo\ORM\Entity;
 use Espo\Core\ORM\Entity as CoreEntity;
 
+use stdClass;
+
 class LinkMultipleType
 {
+    private Metadata $metadata;
+    private Defs $defs;
+
+    private const COLUMN_TYPE_ENUM = 'enum';
+    private const COLUMN_TYPE_VARCHAR = 'varchar';
+    private const COLUMN_TYPE_BOOL = 'bool';
+
+    public function __construct(Metadata $metadata, Defs $defs)
+    {
+        $this->metadata = $metadata;
+        $this->defs = $defs;
+    }
+
     public function checkRequired(Entity $entity, string $field): bool
     {
         if (!$entity instanceof CoreEntity) {
             return false;
         }
 
-        /** @var string[] */
+        /** @var string[] $idList */
         $idList = $entity->getLinkMultipleIdList($field);
 
         return count($idList) > 0;
     }
+
+    public function checkPattern(Entity $entity, string $field): bool
+    {
+        /** @var ?mixed[] $idList */
+        $idList = $entity->get($field . 'Ids');
+
+        if ($idList === null || $idList === []) {
+            return true;
+        }
+
+        $pattern = $this->metadata->get(['app', 'regExpPatterns', 'id', 'pattern']);
+
+        if (!$pattern) {
+            return true;
+        }
+
+        $preparedPattern = '/^' . $pattern . '$/';
+
+        foreach ($idList as $id) {
+            if (!is_string($id)) {
+                return false;
+            }
+
+            if (!preg_match($preparedPattern, $id)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function checkColumnsValid(Entity $entity, string $field): bool
+    {
+        if (!$entity instanceof CoreEntity) {
+            return true;
+        }
+
+        if (!$entity->has($field . 'Columns')) {
+            return true;
+        }
+
+        /** @var ?stdClass $columnsData */
+        $columnsData = $entity->get($field . 'Columns');
+
+        if ($columnsData === null) {
+            return true;
+        }
+
+        $entityDefs = $this->defs->getEntity($entity->getEntityType());
+        $fieldDefs = $entityDefs->getField($field);
+
+        if ($fieldDefs->isNotStorable()) {
+            return true;
+        }
+
+        /** @var ?array<string,string> $columnsMap */
+        $columnsMap = $fieldDefs->getParam('columns');
+
+        if ($columnsMap === null || $columnsMap === []) {
+            return true;
+        }
+
+        if (!$entityDefs->hasRelation($field)) {
+            return true;
+        }
+
+        $relationDefs = $entityDefs->getRelation($field);
+
+        if (!$relationDefs->hasForeignEntityType()) {
+            return true;
+        }
+
+        $foreignEntityType = $relationDefs->getForeignEntityType();
+
+        foreach (array_keys(get_object_vars($columnsData)) as $id) {
+            $itemData = $columnsData->$id;
+
+            if (!$itemData instanceof stdClass) {
+                return false;
+            }
+
+            foreach ($columnsMap as $column => $foreignField) {
+                if (!property_exists($itemData, $column)) {
+                    continue;
+                }
+
+                $value = $itemData->$column;
+
+                $result = $this->checkColumnValue($foreignEntityType, $foreignField, $value);
+
+                if (!$result) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    private function checkColumnValue(string $entityType, string $field, $value): bool
+    {
+        $fieldDefs = $this->defs
+            ->getEntity($entityType)
+            ->getField($field);
+
+        $type = $fieldDefs->getType();
+
+        if ($type === self::COLUMN_TYPE_VARCHAR) {
+            return $this->checkColumnValueVarchar($fieldDefs, $value);
+        }
+
+        if ($type === self::COLUMN_TYPE_ENUM) {
+            return $this->checkColumnValueEnum($fieldDefs, $value);
+        }
+
+        if ($type === self::COLUMN_TYPE_BOOL) {
+            return is_bool($value);
+        }
+
+        return true;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    private function checkColumnValueVarchar(Defs\FieldDefs $fieldDefs, $value): bool
+    {
+        if ($value === null) {
+            return true;
+        }
+
+        if (!is_string($value)) {
+            return false;
+        }
+
+        $maxLength = $fieldDefs->getParam('maxLength');
+        $pattern = $fieldDefs->getParam('pattern');
+
+        if ($maxLength && mb_strlen($value) > $maxLength) {
+            return false;
+        }
+
+        if ($pattern) {
+            if ($pattern[0] === '$') {
+                $patternName = substr($pattern, 1);
+
+                $pattern = $this->metadata
+                    ->get(['app', 'regExpPatterns', $patternName, 'pattern']) ??
+                    $pattern;
+            }
+
+            $preparedPattern = '/^' . $pattern . '$/';
+
+            if (!preg_match($preparedPattern, $value)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    private function checkColumnValueEnum(Defs\FieldDefs $fieldDefs, $value): bool
+    {
+        if (!is_string($value) && $value !== null) {
+            return false;
+        }
+
+        /** @var ?string $path */
+        $path = $fieldDefs->getParam('optionsPath');
+
+        /** @var string[]|null|false $optionList */
+        $optionList = $path ?
+            $this->metadata->get($path) :
+            $fieldDefs->getParam('options');
+
+        if ($optionList === null) {
+            return true;
+        }
+
+        // For bc.
+        if ($optionList === false) {
+            return true;
+        }
+
+        $optionList = array_map(
+            fn ($item) => $item === '' ? null : $item,
+            $optionList
+        );
+
+        // For bc.
+        // @todo Remove in v8.0.
+        if ($value === '') {
+            $value = null;
+        }
+
+        return in_array($value, $optionList);
+    }
 }

application/Espo/Classes/FieldValidators/LinkParentType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,10 +29,21 @@
 
 namespace Espo\Classes\FieldValidators;
 
+use Espo\Core\Utils\Metadata;
+use Espo\ORM\Defs;
 use Espo\ORM\Entity;
 
 class LinkParentType
 {
+    private Metadata $metadata;
+    private Defs $defs;
+
+    public function __construct(Metadata $metadata, Defs $defs)
+    {
+        $this->metadata = $metadata;
+        $this->defs = $defs;
+    }
+
     public function checkRequired(Entity $entity, string $field): bool
     {
         $idAttribute = $field . 'Id';
@@ -52,4 +63,46 @@ class LinkParentType
 
         return true;
     }
+
+    public function checkPattern(Entity $entity, string $field): bool
+    {
+        /** @var ?string $idValue */
+        $idValue = $entity->get($field . 'Id');
+
+        if ($idValue === null) {
+            return true;
+        }
+
+        $pattern = $this->metadata->get(['app', 'regExpPatterns', 'id', 'pattern']);
+
+        if (!$pattern) {
+            return true;
+        }
+
+        $preparedPattern = '/^' . $pattern . '$/';
+
+        return (bool) preg_match($preparedPattern, $idValue);
+    }
+
+    public function checkValid(Entity $entity, string $field): bool
+    {
+        /** @var ?string $typeValue */
+        $typeValue = $entity->get($field . 'Type');
+
+        if ($typeValue === null) {
+            return true;
+        }
+
+        /** @var ?string[] $entityTypeList */
+        $entityTypeList = $this->defs
+            ->getEntity($entity->getEntityType())
+            ->getField($field)
+            ->getParam('entityList');
+
+        if ($entityTypeList !== null) {
+            return in_array($typeValue, $entityTypeList);
+        }
+
+        return (bool) $this->metadata->get(['entityDefs', $typeValue]);
+    }
 }

application/Espo/Classes/FieldValidators/LinkType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,10 +29,18 @@
 
 namespace Espo\Classes\FieldValidators;
 
+use Espo\Core\Utils\Metadata;
 use Espo\ORM\Entity;
 
 class LinkType
 {
+    private Metadata $metadata;
+
+    public function __construct(Metadata $metadata)
+    {
+        $this->metadata = $metadata;
+    }
+
     public function checkRequired(Entity $entity, string $field): bool
     {
         $idAttribute = $field . 'Id';
@@ -43,4 +51,23 @@ class LinkType
 
         return $entity->get($idAttribute) !== null && $entity->get($idAttribute) !== '';
     }
+
+    public function checkPattern(Entity $entity, string $field): bool
+    {
+        $idValue = $entity->get($field . 'Id');
+
+        if ($idValue === null) {
+            return true;
+        }
+
+        $pattern = $this->metadata->get(['app', 'regExpPatterns', 'id', 'pattern']);
+
+        if (!$pattern) {
+            return true;
+        }
+
+        $preparedPattern = '/^' . $pattern . '$/';
+
+        return (bool) preg_match($preparedPattern, $idValue);
+    }
 }

application/Espo/Classes/FieldValidators/MultiEnumType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2022 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Copyright (C) 2014-2023 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,7 +29,12 @@
 
 namespace Espo\Classes\FieldValidators;
 
+use Espo\ORM\Entity;
+
 class MultiEnumType extends ArrayType
 {
-
+    public function checkNoEmptyString(Entity $entity, string $field, ?bool $validationValue): bool
+    {
+        return parent::checkNoEmptyString($entity, $field, true);
+    }
 }