v

Bumps [tar](https://github.com/npm/node-tar) from 6.1.2 to 6.1.9.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v6.1.2...v6.1.9)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.gitattributes

@@ -0,0 +1,11 @@
+* text=auto
+*.php text eol=crlf
+*.js text eol=crlf
+*.json text eol=crlf
+*.md text eol=crlf
+*.less text eol=crlf
+*.css text eol=crlf
+*.tpl text eol=crlf
+*.html text eol=crlf
+
+*.png binary

.github/CONTRIBUTING.md

@@ -0,0 +1,17 @@
+## Pull Requests
+
+Before we can merge your pull request you need to accept our CLA [here](https://github.com/espocrm/cla). It's very simple to do.
+
+See [Code Style Guidelines](https://github.com/espocrm/espocrm/wiki/Code-Style-Guidelines).
+
+Branches:
+
+* *hotfix/** – upcoming maintenance release; fixes should be pushed to this branch;
+* *master* – develop branch; new features should be pushed to this branch;
+* *stable* – last stable release.
+
+## Issues
+
+When reporting a possible bug please provide detail steps so that we will be able to reproduce the issue. Please try not to use phrases like "very big bug", "huge issue", etc. No need to use exclamation marks as well.
+
+Note that we don't provide developer help or any kind of support on Github. Please use our [forum](https://forum.espocrm.com) for this.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a bug report
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. ...
+2. ...
+3. ...
+...
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**EspoCRM version**
+Specify the EspoCRM version (or versions) on which the bug occurs.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,4 @@
+contact_links:
+  - name: EspoCRM forum
+    url: https://forum.espocrm.com/
+    about: Please use our forum to ask questions not related to product development

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for EspoCRM
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/SECURITY.md

@@ -0,0 +1,9 @@
+# Security Policy
+
+## Reporting a vulnerability
+
+If you believe you have discovered a vulnerability in EspoCRM please contacts us via [this](https://www.espocrm.com/contacts/) or [this](https://www.espocrm.com/support/) forms.
+
+## 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.

.gitignore

@@ -4,16 +4,22 @@
 /data/preferences/*
 /data/.backup/*
 /data/config.php
+/data/config-internal.php
+/data/tmp/*
 /build
 /node_modules
-npm-debug.log
+/npm-debug.log
 /test.php
 /main.html
 
 /tests/unit/testData/cache/*
 !/tests/unit/testData/cache/.data
 /tests/integration/config.php
-composer.phar
-vendor/
+.phpunit.result.cache
+/composer.phar
+/vendor/
 /custom/Espo/Custom/*
-/install/config.php
+/custom/Espo/Modules/*
+!/custom/Espo/Custom/.htaccess
+!/custom/Espo/Modules/.htaccess
+/install/config.php

.htaccess

@@ -1,24 +1,44 @@
 <ifModule mod_headers.c>
-  Header always set Access-Control-Allow-Methods "POST, GET, PUT, PATCH, DELETE"
+    Header always set Access-Control-Allow-Methods "POST, GET, PUT, PATCH, DELETE"
 </ifModule>
 
-DirectoryIndex index.php index.html
+DirectoryIndex index.php
+
+Options -Indexes
 
 <IfModule mod_rewrite.c>
-  RewriteEngine On
+    RewriteEngine On
 
-  # PROTECTED DIRECTORIES
-  RewriteCond %{REQUEST_FILENAME} -d
-  RewriteRule ^/?(api|client)/ - [F]
+    # Forbid access. Not actual as redirect to `public` is applied.
+    # An extra security measure if redirect not fired.
+    RewriteRule ^/?data/ - [F]
+    RewriteRule ^/?application/ - [F]
+    RewriteRule ^/?custom/ - [F]
+    RewriteRule ^/?vendor/ - [F]
+    RewriteRule /?web\.config - [F]
 
-  RewriteRule ^/?data/ - [F]
-  RewriteRule ^/?application/ - [F]
-  RewriteRule ^/?custom/ - [F]
-  RewriteRule ^/?vendor/ - [F]
-  RewriteRule ^/?client/?$ - [F]
-  #END PROTECTED DIRECTORIES
+    # Forbid `public` dir.
+    RewriteCond %{ENV:REDIRECT_STATUS} !=200
+    RewriteRule ^/?public/? - [F,L]
 
-  RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
+    # Skip redirect for `client` dir.
+    RewriteRule ^client/ - [L]
 
-  RewriteRule reset/?$ reset.html [QSA,L]
-</IfModule>
+# {#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]
+
+    # Add trailing slash.
+    RewriteCond %{DOCUMENT_ROOT}/%{ENV:BASE}/public/$1 -d
+    RewriteRule ^(.*?[^/])$ %{REQUEST_URI}/ [L,R=301,NE]
+
+    # Rewrite to `public` dir.
+    RewriteRule ^((?!public/).*)$ %{ENV:BASE}/public/$1 [L,NC]
+
+    RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
+</IfModule>

CONTRIBUTING.md

@@ -1,9 +0,0 @@
-## Pull Requests
-
-Before we can merge your pull request you need to accept our CLA [here](https://github.com/espocrm/cla). It's very simple to do.
-
-[Code Style Guidelines](https://github.com/espocrm/espocrm/wiki/Code-Style-Guidelines).
-
-## Issues
-
-We don't provide developer help or any kind of support on github. Please use our [forum](https://forum.espocrm.com) for this.

Gruntfile.js

@@ -2,7 +2,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -19,111 +19,67 @@
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
  ************************************************************************/
 
- /**
-  * * `grunt` - full build
-  * * `grunt dev` - build only items needed for development
-  * * `grunt offline` - skips *composer install*
-  * * `grant release` - full build plus upgrade packages`
-  * * `grant tests` - build and run tests
-  */
+/**
+* * `grunt` - full build
+* * `grunt dev` - build only items needed for development (takes less time)
+* * `grunt offline` - build but skip *composer install*
+* * `grant release` - full build plus upgrade packages`
+* * `grant test` - build for tests running
+* * `grant run-tests` - build and run unit and integration tests
+*/
 
-module.exports = function (grunt) {
+const fs = require('fs');
+const cp = require('child_process');
+const path = require('path');
 
-    var jsFilesToMinify = [
-        'client/lib/jquery-2.1.4.min.js',
-        'client/lib/underscore-min.js',
-        'client/lib/es6-promise.min.js',
-        'client/lib/backbone-min.js',
-        'client/lib/handlebars.js',
-        'client/lib/base64.js',
-        'client/lib/jquery-ui.min.js',
-        'client/lib/jquery.ui.touch-punch.min.js',
-        'client/lib/moment.min.js',
-        'client/lib/moment-timezone.min.js',
-        'client/lib/moment-timezone-data.js',
-        'client/lib/jquery.timepicker.min.js',
-        'client/lib/jquery.autocomplete.js',
-        'client/lib/bootstrap.min.js',
-        'client/lib/bootstrap-datepicker.js',
-        'client/lib/bull.js',
-        'client/lib/marked.min.js',
-        'client/lib/autobahn.js',
+module.exports = grunt => {
 
-        'client/src/namespace.js',
-        'client/src/exceptions.js',
-        'client/src/loader.js',
-        'client/src/utils.js',
+    const pkg = grunt.file.readJSON('package.json');
+    const bundleConfig = require('./frontend/bundle-config.json');
 
-        'client/src/acl.js',
-        'client/src/model.js',
-        'client/src/model-offline.js',
-        'client/src/ajax.js',
-        'client/src/controller.js',
+    let jsFilesToBundle = getBundleLibList().concat(bundleConfig.jsFiles);
+    let jsFilesToCopy = getCopyLibDataList();
 
-        'client/src/ui.js',
-        'client/src/acl-manager.js',
-        'client/src/cache.js',
-        'client/src/storage.js',
-        'client/src/models/settings.js',
-        'client/src/language.js',
-        'client/src/metadata.js',
-        'client/src/field-manager.js',
-        'client/src/models/user.js',
-        'client/src/models/preferences.js',
-        'client/src/model-factory.js',
-        'client/src/collection-factory.js',
-        'client/src/pre-loader.js',
-        'client/src/controllers/base.js',
-        'client/src/router.js',
-        'client/src/date-time.js',
-        'client/src/layout-manager.js',
-        'client/src/theme-manager.js',
-        'client/src/session-storage.js',
-        'client/src/view-helper.js',
-        'client/src/page-title.js',
+    let libFilesToMinify = jsFilesToCopy
+        .filter(item => item.minify)
+        .reduce((map, item) => (
+            map[item.dest] = item.dest,
+            map
+        ), {});
 
-        'client/src/app.js'
-    ];
+    let currentPath = path.dirname(fs.realpathSync(__filename));
 
-    function camelCaseToHyphen (string){
-        if (string == null) {
-            return string;
-        }
-        return string.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-    }
+    let themeList = [];
 
-    var fs = require('fs');
-    var cp = require('child_process');
-    var path = require('path');
-
-    var currentPath = path.dirname(fs.realpathSync(__filename));
-
-    var themeList = [];
-    fs.readdirSync('application/Espo/Resources/metadata/themes').forEach(function (file) {
+    fs.readdirSync('application/Espo/Resources/metadata/themes').forEach(file => {
         themeList.push(file.substr(0, file.length - 5));
     });
 
-    var cssminFilesData = {};
-    var lessData = {};
-    themeList.forEach(function (theme) {
-        var name = camelCaseToHyphen(theme);
-        var files = {};
+    let cssminFilesData = {};
+
+    let lessData = {};
+
+    themeList.forEach(theme => {
+        let name = camelCaseToHyphen(theme);
+
+        let files = {};
+
         files['client/css/espo/'+name+'.css'] = 'frontend/less/'+name+'/main.less';
         files['client/css/espo/'+name+'-iframe.css'] = 'frontend/less/'+name+'/iframe/main.less';
 
         cssminFilesData['client/css/espo/'+name+'.css'] = 'client/css/espo/'+name+'.css';
         cssminFilesData['client/css/espo/'+name+'-iframe.css'] = 'client/css/espo/'+name+'-iframe.css';
-        var o = {
+
+        let o = {
             options: {
                 yuicompress: true,
             },
-            files: files
+            files: files,
         };
+
         lessData[theme] = o;
     });
 
-    var pkg = grunt.file.readJSON('package.json');
-
     grunt.initConfig({
         pkg: pkg,
 
@@ -133,11 +89,11 @@ module.exports = function (grunt) {
                     mode: 0755,
                     create: [
                         'build/tmp',
-                    ]
-                },
-
+                    ],
+                }
             }
         },
+
         clean: {
             start: ['build/EspoCRM-*'],
             final: ['build/tmp'],
@@ -145,27 +101,48 @@ module.exports = function (grunt) {
             beforeFinal: {
                 src: [
                     'build/tmp/custom/Espo/Custom/*',
+                    'build/tmp/custom/Espo/Modules/*',
                     '!build/tmp/custom/Espo/Custom/.htaccess',
+                    '!build/tmp/custom/Espo/Modules/.htaccess',
                     'build/tmp/install/config.php',
+                    'build/tmp/vendor/*/*/.git',
+                    'build/tmp/custom/Espo/Custom/*',
+                    'build/tmp/client/custom/*',
+                    '!build/tmp/client/custom/modules',
+                    'build/tmp/client/custom/modules/*',
                 ]
             }
         },
+
         less: lessData,
+
         cssmin: {
             themes: {
-                files: cssminFilesData
-            }
+                files: cssminFilesData,
+            },
         },
+
         uglify: {
             options: {
-                mangle: false,
+                mangle: true,
                 sourceMap: true,
-                banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
+                output: {
+                    comments: /^!/,
+                },
+            },
+            bundle: {
+                options: {
+                    banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
+                },
+                files: {
+                    'build/tmp/client/espo.min.js': jsFilesToBundle,
+                },
+            },
+            lib: {
+                files: libFilesToMinify,
             },
-            'build/tmp/client/espo.min.js': jsFilesToMinify.map(function (item) {
-                return '' + item;
-            })
         },
+
         copy: {
             options: {
                 mode: true,
@@ -182,11 +159,14 @@ module.exports = function (grunt) {
                     'img/**',
                     'css/**',
                     'sounds/**',
-                    'custom/**'
+                    'custom/**',
                 ],
                 dest: 'build/tmp/client',
             },
             frontendLib: {
+                files: jsFilesToCopy,
+            },
+            frontendCommitedLib: {
                 expand: true,
                 dot: true,
                 cwd: 'client/lib',
@@ -197,24 +177,24 @@ module.exports = function (grunt) {
                 expand: true,
                 dot: true,
                 src: [
-                    'api/**',
                     'application/**',
                     'custom/**',
                     'data/.data',
-                    'install/**',
-                    'portal/**',
                     'vendor/**',
                     'html/**',
+                    'public/**',
+                    'install/**',
+                    'bin/**',
                     'bootstrap.php',
                     'cron.php',
                     'daemon.php',
                     'rebuild.php',
                     'clear_cache.php',
+                    'preload.php',
                     'upgrade.php',
                     'extension.php',
                     'websocket.php',
                     'command.php',
-                    'oauth-callback.php',
                     'index.php',
                     'LICENSE.txt',
                     '.htaccess',
@@ -230,6 +210,7 @@ module.exports = function (grunt) {
                 dest: 'build/EspoCRM-<%= pkg.version %>/',
             },
         },
+
         chmod: {
             php: {
                 options: {
@@ -245,20 +226,20 @@ module.exports = function (grunt) {
                     'build/EspoCRM-<%= pkg.version %>/client/**/*.tpl',
                     'build/EspoCRM-<%= pkg.version %>/**/*.html',
                     'build/EspoCRM-<%= pkg.version %>/**/*.txt',
-                ]
+                ],
             },
             folders: {
                 options: {
                     mode: '755'
                 },
                 src: [
-                    'build/EspoCRM-<%= pkg.version %>/install',
-                    'build/EspoCRM-<%= pkg.version %>/portal',
-                    'build/EspoCRM-<%= pkg.version %>/api',
-                    'build/EspoCRM-<%= pkg.version %>/api/v1',
-                    'build/EspoCRM-<%= pkg.version %>/api/v1/portal-access',
+                    'build/EspoCRM-<%= pkg.version %>/public/install',
+                    'build/EspoCRM-<%= pkg.version %>/public/portal',
+                    'build/EspoCRM-<%= pkg.version %>/public/api',
+                    'build/EspoCRM-<%= pkg.version %>/public/api/v1',
+                    'build/EspoCRM-<%= pkg.version %>/public/api/v1/portal-access',
                     'build/EspoCRM-<%= pkg.version %>',
-                ]
+                ],
             },
             foldersWritable: {
                 options: {
@@ -274,79 +255,125 @@ module.exports = function (grunt) {
                     'build/EspoCRM-<%= pkg.version %>/application/Espo/Modules',
                 ]
             },
+            executable: {
+                options: {
+                    mode: '754'
+                },
+                src: [
+                    'build/EspoCRM-<%= pkg.version %>/bin/*',
+                ],
+            },
         },
+
         replace: {
             version: {
                 options: {
                     patterns: [
                         {
                             match: 'version',
-                            replacement: '<%= pkg.version %>'
+                            replacement: '<%= pkg.version %>',
                         }
                     ]
                 },
                 files: [
                     {
-                        src: 'build/tmp/application/Espo/Core/defaults/config.php',
-                        dest: 'build/tmp/application/Espo/Core/defaults/config.php'
+                        src: 'build/tmp/application/Espo/Resources/defaults/config.php',
+                        dest: 'build/tmp/application/Espo/Resources/defaults/config.php',
                     }
-                ]
-            }
+                ],
+            },
+            dev: {
+                options: {
+                    patterns: [
+                        {
+                            match: /\# \{\#dev\}(.*)\{\/dev\}/gs,
+                            replacement: '',
+                        }
+                    ]
+                },
+                files: [
+                    {
+                        src: 'build/tmp/.htaccess',
+                        dest: 'build/tmp/.htaccess',
+                    }
+                ],
+            },
         },
+
     });
 
-    grunt.registerTask("chmod-folders", function() {
-        cp.execSync("find . -type d -exec chmod 755 {} + ", {stdio: 'ignore', cwd: 'build/EspoCRM-' + pkg.version});
+    grunt.registerTask('chmod-folders', () => {
+        cp.execSync(
+            "find . -type d -exec chmod 755 {} + ",
+            {
+                stdio: 'ignore',
+                cwd: 'build/EspoCRM-' + pkg.version,
+            }
+        );
     });
 
-    grunt.registerTask("composer", function() {
+    grunt.registerTask('composer-install', () => {
+        cp.execSync("composer install --no-dev", {stdio: 'ignore'});
+    });
+
+    grunt.registerTask('composer-install-dev', () => {
         cp.execSync("composer install", {stdio: 'ignore'});
     });
 
-    grunt.registerTask("upgrade", function() {
+    grunt.registerTask('upgrade', () => {
         cp.execSync("node diff --all --vendor", {stdio: 'inherit'});
     });
 
-    grunt.registerTask("unit-tests", function() {
-        cp.execSync("phpunit --bootstrap=vendor/autoload.php tests/unit", {stdio: 'inherit'});
+    grunt.registerTask('unit-tests-run', () => {
+        cp.execSync("vendor/bin/phpunit ./tests/unit", {stdio: 'inherit'});
     });
 
-    grunt.registerTask("integration-tests", function() {
-        cp.execSync("phpunit --bootstrap=vendor/autoload.php tests/integration", {stdio: 'inherit'});
+    grunt.registerTask('integration-tests-run', () => {
+        cp.execSync("vendor/bin/phpunit ./tests/integration", {stdio: 'inherit'});
     });
 
-    grunt.registerTask("zip", function() {
-        var fs = require('fs');
+    grunt.registerTask('zip', () => {
+        const archiver = require('archiver');
 
-        var resolve = this.async();
+        let resolve = this.async();
 
-        var folder = 'EspoCRM-' + pkg.version;
+        let folder = 'EspoCRM-' + pkg.version;
 
-        var zipPath = 'build/' + folder +'.zip';
-        if (fs.existsSync(zipPath)) fs.unlinkSync(zipPath);
+        let zipPath = 'build/' + folder +'.zip';
 
-        var archiver = require('archiver');
-        var archive = archiver('zip');
+        if (fs.existsSync(zipPath)) {
+            fs.unlinkSync(zipPath);
+        }
 
-        archive.on('error', function (err) {
+        let archive = archiver('zip');
+
+        archive.on('error', err => {
             grunt.fail.warn(err);
         });
-        var zipOutput = fs.createWriteStream(zipPath);
-        zipOutput.on('close', function () {
+
+        let zipOutput = fs.createWriteStream(zipPath);
+
+        zipOutput.on('close', () => {
             console.log("EspoCRM package has been built.");
+
             resolve();
         });
 
-        archive.directory(currentPath + '/build/' + folder, folder).pipe(zipOutput);
+        archive
+            .directory(currentPath + '/build/' + folder, folder)
+            .pipe(zipOutput)
+            .finalize();
+    });
 
-        archive.finalize();
+    grunt.registerTask('npm-install', () => {
+        cp.execSync("npm install", {stdio: 'ignore'});
     });
 
     grunt.loadNpmTasks('grunt-contrib-clean');
     grunt.loadNpmTasks('grunt-mkdir');
     grunt.loadNpmTasks('grunt-contrib-less');
     grunt.loadNpmTasks('grunt-contrib-cssmin');
-    grunt.loadNpmTasks('grunt-contrib-uglify');
+    grunt.loadNpmTasks('grunt-contrib-uglify-es');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-replace');
     grunt.loadNpmTasks('grunt-chmod');
@@ -356,10 +383,12 @@ module.exports = function (grunt) {
         'mkdir:tmp',
         'less',
         'cssmin',
-        'uglify',
+        'uglify:bundle',
         'copy:frontendFolders',
         'copy:frontendLib',
+        'copy:frontendCommitedLib',
         'copy:backend',
+        'uglify:lib',
         'replace',
         'clean:beforeFinal',
         'copy:final',
@@ -367,29 +396,125 @@ module.exports = function (grunt) {
         'chmod:php',
         'chmod:folders',
         'chmod:foldersWritable',
+        'chmod:executable',
         'clean:final',
     ]);
 
-    grunt.registerTask('default', [
-        'composer',
+    grunt.registerTask('build', [
+        'composer-install',
+        'npm-install',
         'offline',
     ]);
 
+    grunt.registerTask('default', [
+        'build',
+    ]);
+
     grunt.registerTask('release', [
-        'default',
+        'build',
         'upgrade',
         'zip',
         'clean:release',
     ]);
 
-    grunt.registerTask('tests', [
-        'default',
-        'unit-tests',
-        'integration-tests',
+    grunt.registerTask('run-tests', [
+        'test',
+        'unit-tests-run',
+        'integration-tests-run',
+    ]);
+
+    grunt.registerTask('run-unit-tests', [
+        'composer-install-dev',
+        'unit-tests-run',
+    ]);
+
+    grunt.registerTask('run-integration-tests', [
+        'test',
+        'integration-tests-run',
     ]);
 
     grunt.registerTask('dev', [
-        'composer',
+        'composer-install-dev',
         'less',
     ]);
+
+    grunt.registerTask('test', [
+        'composer-install-dev',
+        'npm-install',
+        '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: 'build/tmp/' + (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: 'build/tmp/' + (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

@@ -1,21 +1,21 @@
 ## EspoCRM
 
-<a href='https://www.espocrm.com'>EspoCRM is an Open Source CRM</a> (Customer Relationship Management) software that allows you to see, enter and evaluate all your company relationships regardless of the type. People, companies or opportunities - all in an easy and intuitive interface.
+[EspoCRM is an Open Source CRM](https://www.espocrm.com) (Customer Relationship Management) software that allows you to see, enter and evaluate all your company relationships regardless of the type. People, companies or opportunities - all in an easy and intuitive interface.
 
-It's a web application with a frontend designed as a single page application based on backbone.js and a REST API backend written in PHP.
+It's a web application with a frontend designed as a single page application and REST API backend written in PHP.
 
-Download the latest release from our [website](https://www.espocrm.com).
+[Download](https://www.espocrm.com/download/) the latest release from our website.
 
 ### Requirements
 
-* PHP 7.2 and later (with pdo, json, gd, openssl, zip, imap, mbstring, curl extensions);
+* PHP 7.3 and later (with pdo, json, gd, openssl, zip, imap, mbstring, curl extensions);
 * MySQL 5.7 (and later), or MariaDB 10.1 (and later).
 
-For more information about server configuration see [this article](https://www.espocrm.com/documentation/administration/server-configuration/).
+For more information about server configuration see [this article](https://docs.espocrm.com/administration/server-configuration/).
 
 ### Documentation
 
-Documentation for administrators, users and developers is available [here](https://www.espocrm.com/documentation/).
+Documentation for administrators, users and developers is available [here](https://docs.espocrm.com).
 
 ### How to report a bug
 
@@ -23,34 +23,15 @@ Create an issue [here](https://github.com/espocrm/espocrm/issues) or post on our
 
 ### How to install a stable version
 
-[Download](https://www.espocrm.com/download/) the latest version. See the [instructions](https://www.espocrm.com/documentation/administration/installation/) about installation.
+[Download](https://www.espocrm.com/download/) the latest version. See the [instructions](https://docs.espocrm.com/administration/installation/) about installation.
 
-### Getting started (for developers)
+### Development
 
-1. Clone repository to your local computer.
-2. Change to the project's root directory.
-3. Install [composer](https://getcomposer.org/doc/00-intro.md).
-4. Run `composer install` if composer is installed globally or `php composer.phar install` if locally.
+* [Getting started](https://docs.espocrm.com/development/how-to-start)
+* [Running tests](https://docs.espocrm.com/development/tests)
+* [Making translation](https://docs.espocrm.com/development/translation)
 
-Never update composer dependencies if you are going to contribute code back.
-
-Now you can build. Build will create compiled css files.
-
-To compose a proper config.php and populate database you can run install by opening `http(s)://{YOUR_CRM_URL}/install` location in a browser. Then open `data/config.php` file and add `isDeveloperMode => true`.
-
-### How to build (for developers)
-
-You need to have nodejs and Grunt CLI installed.
-
-1. Change to the project's root directory.
-2. Install project dependencies with `npm install`.
-3. Run Grunt with `grunt`.
-
-The build will be created in the `build` directory.
-
-Upgrade packages can be built with `grunt upgrade`.
-
-### How to contribute (for developers)
+### How to contribute
 
 Before we can merge your pull request you need to accept our CLA [here](https://github.com/espocrm/cla). It's very simple to do.
 
@@ -60,37 +41,6 @@ Branches:
 * *master* – develop branch; new features should be pushed to this branch;
 * *stable* – last stable release.
 
-### Running tests (for developers)
-
-You need to have *phpunit* installed.
-
-Unit tests:
-
-```
-phpunit --bootstrap=vendor/autoload.php tests/unit
-```
-
-Integration tests:
-
-```
-phpunit --bootstrap=vendor/autoload.php tests/integration
-```
-
-### How to make a translation
-
-Build po file with command:
-`node po.js en_EN`
-(specify needed language instead of en_EN)
-
-After that translate the generated po file.
-
-Build json files from the translated po file:
-
-1. Put your po file espocrm-en_EN.po into `build` directory
-2. Run `node lang.js en_EN`
-
-Json files will be created in build directory grouped by folders.
-
 ### License
 
 EspoCRM is published under the GNU GPLv3 [license](https://raw.githubusercontent.com/espocrm/espocrm/master/LICENSE.txt).

api/v1/portal-access/index.php

@@ -1,39 +0,0 @@
-<?php
-/************************************************************************
- * This file is part of EspoCRM.
- *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy 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.
- ************************************************************************/
-
-require_once('../../../bootstrap.php');
-
-if (!empty($_GET['portalId'])) {
-    $portalId = $_GET['portalId'];
-} else {
-    $portalId = explode('/', $_SERVER['REQUEST_URI'])[count(explode('/', $_SERVER['SCRIPT_NAME'])) - 1];
-}
-
-$app = new \Espo\Core\Portal\Application($portalId);
-$app->run();

application/Espo/Acl/Attachment.php

@@ -1,93 +0,0 @@
-<?php
-/************************************************************************
- * This file is part of EspoCRM.
- *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy 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\Acl;
-
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
-
-class Attachment extends \Espo\Core\Acl\Base
-{
-    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
-    {
-        if ($user->isAdmin()) {
-            return true;
-        }
-
-        if ($entity->get('parentType') === 'Settings') {
-            return true;
-        }
-
-        $parent = null;
-        $hasParent = false;
-        if ($entity->get('parentId') && $entity->get('parentType')) {
-            $hasParent = true;
-            $parent = $this->getEntityManager()->getEntity($entity->get('parentType'), $entity->get('parentId'));
-        } else if ($entity->get('relatedId') && $entity->get('relatedType')) {
-            $hasParent = true;
-            $parent = $this->getEntityManager()->getEntity($entity->get('relatedType'), $entity->get('relatedId'));
-        }
-
-        if ($hasParent) {
-            if ($parent) {
-                if ($parent->getEntityType() === 'Note') {
-                    if ($parent->get('parentId') && $parent->get('parentType')) {
-                        $parentOfParent = $this->getEntityManager()->getEntity($parent->get('parentType'), $parent->get('parentId'));
-                        if ($parentOfParent && $this->getAclManager()->checkEntity($user, $parentOfParent)) {
-                            return true;
-                        }
-                    } else {
-                        return true;
-                    }
-                } else {
-                    if ($this->getAclManager()->checkEntity($user, $parent)) {
-                        return true;
-                    }
-                }
-            }
-        } else {
-            return true;
-        }
-
-        if ($this->checkEntity($user, $entity, $data, 'read')) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function checkIsOwner(EntityUser $user, Entity $entity)
-    {
-        if ($user->id === $entity->get('createdById')) {
-            return true;
-        }
-        return false;
-    }
-}
-

application/Espo/Acl/EmailAddress.php

@@ -1,65 +0,0 @@
-<?php
-/************************************************************************
- * This file is part of EspoCRM.
- *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy 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\Acl;
-
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
-
-class EmailAddress extends \Espo\Core\Acl\Base
-{
-    public function checkEditInEntity(EntityUser $user, Entity $entity, Entity $excludeEntity)
-    {
-        $id = $entity->id;
-
-        $isFobidden = false;
-
-        $repository = $this->getEntityManager()->getRepository('EmailAddress');
-
-        if (!$user->isAdmin()) {
-            $entityWithSameAddressList = $repository->getEntityListByAddressId($id, $excludeEntity);
-            foreach ($entityWithSameAddressList as $e) {
-                if (!$this->getAclManager()->check($user, $e, 'edit')) {
-                    $isFobidden = true;
-                    if (
-                        $e->getEntityType() === 'User' &&
-                        $e->isPortal() &&
-                        $excludeEntity->getEntityType() === 'Contact' &&
-                        $e->get('contactId') === $excludeEntity->id
-                    ) {
-                        $isFobidden = false;
-                    }
-                    if ($isFobidden) break;
-                }
-            }
-        }
-        return !$isFobidden;
-    }
-}
-

application/Espo/Acl/Note.php

@@ -1,119 +0,0 @@
-<?php
-/************************************************************************
- * This file is part of EspoCRM.
- *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy 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\Acl;
-
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
-
-class Note extends \Espo\Core\Acl\Base
-{
-    protected $deleteThresholdPeriod = '1 month';
-
-    protected $editThresholdPeriod = '7 days';
-
-    public function checkIsOwner(EntityUser $user, Entity $entity)
-    {
-        if ($entity->get('type') === 'Post' && $user->id === $entity->get('createdById')) {
-            return true;
-        }
-        return false;
-    }
-
-    public function checkEntityCreate(EntityUser $user, Entity $entity, $data)
-    {
-        if ($entity->get('parentId') && $entity->get('parentType')) {
-            $parent = $this->getEntityManager()->getEntity($entity->get('parentType'), $entity->get('parentId'));
-            if ($parent) {
-                if ($this->getAclManager()->checkEntity($user, $parent, 'stream')) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        return true;
-    }
-
-    public function checkEntityEdit(EntityUser $user, Entity $entity, $data)
-    {
-        if ($user->isAdmin()) {
-            return true;
-        }
-
-        if ($this->checkEntity($user, $entity, $data, 'edit')) {
-            if ($this->checkIsOwner($user, $entity)) {
-                $createdAt = $entity->get('createdAt');
-                if ($createdAt) {
-                    $noteEditThresholdPeriod = '-' . $this->getConfig()->get('noteEditThresholdPeriod', $this->editThresholdPeriod);
-                    $dt = new \DateTime();
-                    $dt->modify($noteEditThresholdPeriod);
-                    try {
-                        if ($dt->format('U') > (new \DateTime($createdAt))->format('U')) {
-                            return false;
-                        }
-                    } catch (\Exception $e) {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    public function checkEntityDelete(EntityUser $user, Entity $entity, $data)
-    {
-        if ($user->isAdmin()) {
-            return true;
-        }
-
-        if ($this->checkEntity($user, $entity, $data, 'delete')) {
-            if ($this->checkIsOwner($user, $entity)) {
-                $createdAt = $entity->get('createdAt');
-                if ($createdAt) {
-                    $deleteThresholdPeriod = '-' . $this->getConfig()->get('noteDeleteThresholdPeriod', $this->deleteThresholdPeriod);
-                    $dt = new \DateTime();
-                    $dt->modify($deleteThresholdPeriod);
-                    try {
-                        if ($dt->format('U') > (new \DateTime($createdAt))->format('U')) {
-                            return false;
-                        }
-                    } catch (\Exception $e) {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-
-        return false;
-    }
-}

application/Espo/Acl/PhoneNumber.php

@@ -1,65 +0,0 @@
-<?php
-/************************************************************************
- * This file is part of EspoCRM.
- *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy 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\Acl;
-
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
-
-class PhoneNumber extends \Espo\Core\Acl\Base
-{
-    public function checkEditInEntity(EntityUser $user, Entity $entity, Entity $excludeEntity)
-    {
-        $id = $entity->id;
-
-        $isFobidden = false;
-
-        $repository = $this->getEntityManager()->getRepository('PhoneNumber');
-
-        if (!$user->isAdmin()) {
-            $entityWithSameNumberList = $repository->getEntityListByPhoneNumberId($id, $excludeEntity);
-            foreach ($entityWithSameNumberList as $e) {
-                if (!$this->getAclManager()->check($user, $e, 'edit')) {
-                    $isFobidden = true;
-                    if (
-                        $e->getEntityType() === 'User' &&
-                        $e->isPortal() &&
-                        $excludeEntity->getEntityType() === 'Contact' &&
-                        $e->get('contactId') === $excludeEntity->id
-                    ) {
-                        $isFobidden = false;
-                    }
-                    if ($isFobidden) break;
-                }
-            }
-        }
-
-        return !$isFobidden;
-    }
-}

application/Espo/Acl/Webhook.php

@@ -1,73 +0,0 @@
-<?php
-/************************************************************************
- * This file is part of EspoCRM.
- *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy 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\Acl;
-
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
-
-class Webhook extends \Espo\Core\Acl\Base
-{
-    public function checkIsOwner(EntityUser $user, Entity $entity)
-    {
-        return $user->id === $entity->get('userId') && $user->isApi();
-    }
-
-    public function checkEntityCreate(EntityUser $user, Entity $entity, $data)
-    {
-        if ($user->isAdmin()) return true;
-        if (!$data) return false;
-        if ($user->isApi() && $user->id === $entity->get('userId')) return true;
-        return false;
-    }
-
-    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
-    {
-        if ($user->isAdmin()) return true;
-        if (!$data) return false;
-        if ($user->isApi() && $user->id === $entity->get('userId')) return true;
-        return false;
-    }
-
-    public function checkEntityDelete(EntityUser $user, Entity $entity, $data)
-    {
-        if ($user->isAdmin()) return true;
-        if (!$data) return false;
-        if ($user->isApi() && $user->id === $entity->get('userId')) return true;
-        return false;
-    }
-
-    public function checkEntityEdit(EntityUser $user, Entity $entity, $data)
-    {
-        if ($user->isAdmin()) return true;
-        if (!$data) return false;
-        if ($user->isApi() && $user->id === $entity->get('userId')) return true;
-        return false;
-    }
-}

application/Espo/AclPortal/Attachment.php

@@ -1,93 +0,0 @@
-<?php
-/************************************************************************
- * This file is part of EspoCRM.
- *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy 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\AclPortal;
-
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
-
-class Attachment extends \Espo\Core\AclPortal\Base
-{
-    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
-    {
-        if ($user->isAdmin()) {
-            return true;
-        }
-
-        if ($entity->get('parentType') === 'Settings') {
-            return true;
-        }
-
-        $parent = null;
-        $hasParent = false;
-        if ($entity->get('parentId') && $entity->get('parentType')) {
-            $hasParent = true;
-            $parent = $this->getEntityManager()->getEntity($entity->get('parentType'), $entity->get('parentId'));
-        } else if ($entity->get('relatedId') && $entity->get('relatedType')) {
-            $hasParent = true;
-            $parent = $this->getEntityManager()->getEntity($entity->get('relatedType'), $entity->get('relatedId'));
-        }
-
-        if ($hasParent) {
-            if ($parent) {
-                if ($parent->getEntityType() === 'Note') {
-                    if ($parent->get('parentId') && $parent->get('parentType')) {
-                        $parentOfParent = $this->getEntityManager()->getEntity($parent->get('parentType'), $parent->get('parentId'));
-                        if ($parentOfParent && $this->getAclManager()->checkEntity($user, $parentOfParent)) {
-                            return true;
-                        }
-                    } else {
-                        return true;
-                    }
-                } else {
-                    if ($this->getAclManager()->checkEntity($user, $parent)) {
-                        return true;
-                    }
-                }
-            }
-        } else {
-            return true;
-        }
-
-        if ($this->checkEntity($user, $entity, $data, 'read')) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function checkIsOwner(EntityUser $user, Entity $entity)
-    {
-        if ($user->id === $entity->get('createdById')) {
-            return true;
-        }
-        return false;
-    }
-}
-

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

@@ -0,0 +1,46 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\ActionHistoryRecord;
+
+use Espo\Entities\User;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\OwnershipOwnChecker,
+};
+
+class OwnershipChecker implements OwnershipOwnChecker
+{
+    public function checkOwn(User $user, Entity $entity): bool
+    {
+        return $entity->get('userId') === $user->getId();
+    }
+}

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

@@ -0,0 +1,153 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\Attachment;
+
+use Espo\Entities\{
+    User,
+    Note,
+};
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    ORM\EntityManager,
+    AclManager,
+    Acl\ScopeData,
+    Acl\DefaultAccessChecker,
+    Acl\AccessEntityCREDChecker,
+    Acl\Traits\DefaultAccessCheckerDependency,
+};
+
+class AccessChecker implements AccessEntityCREDChecker
+{
+    use DefaultAccessCheckerDependency;
+
+    private $aclManager;
+
+    private $entityManager;
+
+    public function __construct(
+        DefaultAccessChecker $defaultAccessChecker,
+        AclManager $aclManager,
+        EntityManager $entityManager
+    ) {
+        $this->defaultAccessChecker = $defaultAccessChecker;
+        $this->aclManager = $aclManager;
+        $this->entityManager = $entityManager;
+    }
+
+    public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($entity->get('parentType') === 'Settings') {
+            return true;
+        }
+
+        $parent = null;
+
+        $hasParent = false;
+
+        if ($entity->get('parentId') && $entity->get('parentType')) {
+            $hasParent = true;
+
+            $parent = $this->entityManager->getEntity($entity->get('parentType'), $entity->get('parentId'));
+        }
+        else if ($entity->get('relatedId') && $entity->get('relatedType')) {
+            $hasParent = true;
+
+            $parent = $this->entityManager->getEntity($entity->get('relatedType'), $entity->get('relatedId'));
+        }
+
+        if (!$parent || !$hasParent) {
+            if ($this->defaultAccessChecker->checkEntityRead($user, $entity, $data)) {
+                return true;
+            }
+
+            return false;
+        }
+
+        if ($parent->getEntityType() === 'Note') {
+            $result = $this->checkEntityReadNoteParent($user, $parent);
+
+            if ($result !== null) {
+                return $result;
+            }
+        }
+        else if ($this->aclManager->checkEntity($user, $parent)) {
+            return true;
+        }
+
+        if ($this->defaultAccessChecker->checkEntityRead($user, $entity, $data)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private function checkEntityReadNoteParent(User $user, Note $note): ?bool
+    {
+        if ($note->getTargetType() === Note::TARGET_TEAMS) {
+            $intersect = array_intersect(
+                $note->getLinkMultipleIdList('teams'),
+                $user->getLinkMultipleIdList('teams')
+            );
+
+            if (count($intersect)) {
+                return true;
+            }
+
+            return null;
+        }
+
+        if ($note->getTargetType() === Note::TARGET_USERS) {
+            $isRelated = $this->entityManager
+                ->getRDBRepository('Note')
+                ->getRelation($note, 'users')
+                ->isRelated($user);
+
+            if ($isRelated) {
+                return true;
+            }
+
+            return null;
+        }
+
+        if (!$note->getParentId() || !$note->getParentType()) {
+            return null;
+        }
+
+        $parent = $this->entityManager->getEntity($note->getParentType(), $note->getParentId());
+
+        if ($parent && $this->aclManager->checkEntity($user, $parent)) {
+            return true;
+        }
+
+        return null;
+    }
+}

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-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,22 +27,26 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Modules\Crm\AclPortal;
+namespace Espo\Classes\Acl\Attachment;
 
-use \Espo\Entities\User;
-use \Espo\ORM\Entity;
+use Espo\Entities\User;
 
-class Account extends \Espo\Core\AclPortal\Base
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\OwnershipOwnChecker,
+};
+
+class OwnershipChecker implements OwnershipOwnChecker
 {
-    public function checkInAccount(User $user, Entity $entity)
+    private const ATTR_CREATED_BY_ID = 'createdById';
+
+    public function checkOwn(User $user, Entity $entity): bool
     {
-        $accountIdList = $user->getLinkMultipleIdList('accounts');
-        if (count($accountIdList)) {
-            if (in_array($entity->id, $accountIdList)) {
-                return true;
-            }
+        if ($user->getId() === $entity->get(self::ATTR_CREATED_BY_ID)) {
+            return true;
         }
+
         return false;
     }
 }
-

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-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,27 +27,30 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Acl;
+namespace Espo\Classes\Acl\AuthToken;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User;
 
-class Import extends \Espo\Core\Acl\Base
+use Espo\Core\{
+    Acl\ScopeData,
+    Acl\DefaultAccessChecker,
+    Acl\AccessEntityCREDChecker,
+    Acl\Traits\DefaultAccessCheckerDependency,
+};
+
+class AccessChecker implements AccessEntityCREDChecker
 {
+    use DefaultAccessCheckerDependency;
 
-    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
+    private $defaultAccessChecker;
+
+    public function __construct(DefaultAccessChecker $defaultAccessChecker)
     {
-        if ($user->isAdmin()) return true;
-        if ($user->id === $entity->get('createdById')) return true;
-
-        return false;
+        $this->defaultAccessChecker = $defaultAccessChecker;
     }
 
-    public function checkEntityDelete(EntityUser $user, Entity $entity, $data)
+    public function checkCreate(User $user, ScopeData $data): bool
     {
-        if ($user->isAdmin()) return true;
-        if ($user->id === $entity->get('createdById')) return true;
-
         return false;
     }
 }

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-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,93 +27,101 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Acl;
+namespace Espo\Classes\Acl\Email;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User;
 
-class Email extends \Espo\Core\Acl\Base
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\Table,
+    Acl\ScopeData,
+    Acl\DefaultAccessChecker,
+    Acl\AccessEntityCREDSChecker,
+    Acl\Traits\DefaultAccessCheckerDependency,
+};
+
+class AccessChecker implements AccessEntityCREDSChecker
 {
-    protected $ownerUserIdAttribute = 'usersIds';
+    use DefaultAccessCheckerDependency;
 
-    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
+    public function __construct(DefaultAccessChecker $defaultAccessChecker)
     {
-        if ($this->checkEntity($user, $entity, $data, 'read')) {
+        $this->defaultAccessChecker = $defaultAccessChecker;
+    }
+
+    public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($this->defaultAccessChecker->checkEntityRead($user, $entity, $data)) {
             return true;
         }
 
-        if ($data === false) {
+        if ($data->isFalse()) {
             return false;
         }
-        if (is_object($data)) {
-            if ($data->read === false || $data->read === 'no') {
-                return false;
-            }
+
+        if ($data->getRead() === Table::LEVEL_NO) {
+            return false;
         }
 
         if (!$entity->has('usersIds')) {
             $entity->loadLinkMultipleField('users');
         }
+
         $userIdList = $entity->get('usersIds');
-        if (is_array($userIdList) && in_array($user->id, $userIdList)) {
-            return true;
-        }
-        return false;
-    }
 
-    public function checkIsOwner(EntityUser $user, Entity $entity)
-    {
-        if ($user->id === $entity->get('assignedUserId')) {
-            return true;
-        }
-
-        if ($user->id === $entity->get('createdById')) {
-            return true;
-        }
-
-        if ($entity->hasLinkMultipleId('assignedUsers', $user->id)) {
+        if (is_array($userIdList) && in_array($user->getId(), $userIdList)) {
             return true;
         }
 
         return false;
     }
 
-    public function checkEntityDelete(EntityUser $user, Entity $entity, $data)
+    public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
     {
         if ($user->isAdmin()) {
             return true;
         }
 
-        if ($data === false) {
+        if ($data->isFalse()) {
             return false;
         }
 
-        if ($data->delete === 'own') {
-            if ($user->id === $entity->get('assignedUserId')) {
+        if ($data->getDelete() === Table::LEVEL_OWN) {
+            if ($user->getId() === $entity->get('assignedUserId')) {
                 return true;
             }
 
-            if ($user->id === $entity->get('createdById')) {
+            if ($user->getId() === $entity->get('createdById')) {
                 return true;
             }
 
             $assignedUserIdList = $entity->getLinkMultipleIdList('assignedUsers');
-            if (count($assignedUserIdList) === 1 && $entity->hasLinkMultipleId('assignedUsers', $user->id)) {
+
+            if (
+                count($assignedUserIdList) === 1 &&
+                $entity->hasLinkMultipleId('assignedUsers', $user->getId())
+            ) {
                 return true;
             }
+
             return false;
         }
 
-        if ($this->checkEntity($user, $entity, $data, 'delete')) {
+        if ($this->defaultAccessChecker->checkEntityDelete($user, $entity, $data)) {
             return true;
         }
 
-        if ($data->edit !== 'no' || $data->create !== 'no') {
-            if ($entity->get('createdById') === $user->id) {
-                if ($entity->get('status') !== 'Sent' && $entity->get('status') !== 'Archived') {
-                    return true;
-                }
-            }
+        if ($data->getEdit() === Table::LEVEL_NO && $data->getCreate() === Table::LEVEL_NO) {
+            return false;
+        }
+
+        if ($entity->get('createdById') !== $user->getId()) {
+            return false;
+        }
+
+        if ($entity->get('status') !== 'Sent' && $entity->get('status') !== 'Archived') {
+            return true;
         }
 
         return false;

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

@@ -0,0 +1,51 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\Email;
+
+use Espo\Entities\User;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\DefaultAssignmentChecker,
+};
+
+class AssignmentChecker extends DefaultAssignmentChecker
+{
+    protected function isPermittedAssignedUser(User $user, Entity $entity): bool
+    {
+        return true;
+    }
+
+    protected function isPermittedAssignedUsers(User $user, Entity $entity): bool
+    {
+        return true;
+    }
+}

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-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,46 +27,46 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\AclPortal;
+namespace Espo\Classes\Acl\Email;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User;
 
-class Email extends \Espo\Core\AclPortal\Base
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\DefaultOwnershipChecker,
+    Acl\OwnershipOwnChecker,
+    Acl\OwnershipTeamChecker,
+};
+
+class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
 {
-    protected $ownerUserIdAttribute = 'usersIds';
+    private $defaultOwnershipChecker;
 
-    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
+    public function __construct(DefaultOwnershipChecker $defaultOwnershipChecker)
     {
-        if ($this->checkEntity($user, $entity, $data, 'read')) {
+        $this->defaultOwnershipChecker = $defaultOwnershipChecker;
+    }
+
+    public function checkOwn(User $user, Entity $entity): bool
+    {
+        if ($user->getId() === $entity->get('assignedUserId')) {
             return true;
         }
 
-        if ($data === false) {
-            return false;
-        }
-        if (is_object($data)) {
-            if ($data->read === false || $data->read === 'no') {
-                return false;
-            }
-        }
-
-        if (!$entity->has('usersIds')) {
-            $entity->loadLinkMultipleField('users');
-        }
-        $userIdList = $entity->get('usersIds');
-        if (is_array($userIdList) && in_array($user->id, $userIdList)) {
+        if ($user->getId() === $entity->get('createdById')) {
             return true;
         }
+
+        if ($entity->hasLinkMultipleId('assignedUsers', $user->getId())) {
+            return true;
+        }
+
         return false;
     }
 
-    public function checkIsOwner(EntityUser $user, Entity $entity)
+    public function checkTeam(User $user, Entity $entity): bool
     {
-        if ($user->id === $entity->get('createdById')) {
-            return true;
-        }
-        return false;
+        return $this->defaultOwnershipChecker->checkTeam($user, $entity);
     }
 }
-

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

@@ -0,0 +1,79 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\EmailFilter;
+
+use Espo\Entities\User;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\OwnershipOwnChecker,
+    ORM\EntityManager,
+};
+
+class OwnershipChecker implements OwnershipOwnChecker
+{
+    private $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    public function checkOwn(User $user, Entity $entity): bool
+    {
+        if (!$entity->has('parentId') || !$entity->has('parentType')) {
+            return false;
+        }
+
+        $parentType = $entity->get('parentType');
+        $parentId = $entity->get('parentId');
+
+        if (!$parentType || !$parentId) {
+            return false;
+        }
+
+        $parent = $this->entityManager->getEntity($parentType, $parentId);
+
+        if (!$parent) {
+            return false;
+        }
+
+        if ($parent->getEntityType() === 'User') {
+            return $parent->getId() === $user->getId();
+        }
+
+        if ($parent->has('assignedUserId') && $parent->get('assignedUserId') === $user->getId()) {
+            return true;
+        }
+
+        return false;
+    }
+}

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

@@ -0,0 +1,84 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\Import;
+
+use Espo\Entities\User;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\ScopeData,
+    Acl\AccessEntityReadChecker,
+    Acl\AccessEntityDeleteChecker,
+};
+
+class AccessChecker implements AccessEntityReadChecker, AccessEntityDeleteChecker
+{
+    public function check(User $user, ScopeData $data): bool
+    {
+        return $data->isTrue();
+    }
+
+    public function checkRead(User $user, ScopeData $data): bool
+    {
+        return $data->isTrue();
+    }
+
+    public function checkDelete(User $user, ScopeData $data): bool
+    {
+        return $data->isTrue();
+    }
+
+    public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if ($user->getId() === $entity->get('createdById')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if ($user->getId() === $entity->get('createdById')) {
+            return true;
+        }
+
+        return false;
+    }
+}

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

@@ -0,0 +1,172 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\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 DateTime;
+use Exception;
+
+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;
+
+    public function __construct(
+        DefaultAccessChecker $defaultAccessChecker,
+        AclManager $aclManager,
+        EntityManager $entityManager,
+        Config $config
+    ) {
+        $this->defaultAccessChecker = $defaultAccessChecker;
+        $this->aclManager = $aclManager;
+        $this->entityManager = $entityManager;
+        $this->config = $config;
+    }
+
+    public function checkEntityCreate(User $user, Entity $entity, ScopeData $data): bool
+    {
+        $parentId = $entity->get('parentId');
+        $parentType = $entity->get('parentType');
+
+        if (!$parentId || !$parentType) {
+            return true;
+        }
+
+        $parent = $this->entityManager->getEntity($parentType, $parentId);
+
+        if ($parent && $this->aclManager->checkEntityStream($user, $parent)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function checkEntityEdit(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if (!$this->defaultAccessChecker->checkEntityEdit($user, $entity, $data)) {
+            return false;
+        }
+
+        if (!$this->aclManager->checkOwnershipOwn($user, $entity)) {
+            return true;
+        }
+
+        $createdAt = $entity->get('createdAt');
+
+        if (!$createdAt) {
+            return true;
+        }
+
+        $noteEditThresholdPeriod =
+            '-' .  $this->config->get('noteEditThresholdPeriod', self::EDIT_PERIOD);
+
+        $dt = new DateTime();
+
+        $dt->modify($noteEditThresholdPeriod);
+
+        try {
+            if ($dt->format('U') > (new DateTime($createdAt))->format('U')) {
+                return false;
+            }
+        }
+        catch (Exception $e) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if (!$this->defaultAccessChecker->checkEntityDelete($user, $entity, $data)) {
+            return false;
+        }
+
+        if (!$this->aclManager->checkOwnershipOwn($user, $entity)) {
+            return true;
+        }
+
+        $createdAt = $entity->get('createdAt');
+
+        if (!$createdAt) {
+            return true;
+        }
+
+        $deleteThresholdPeriod =
+            '-' . $this->config->get('noteDeleteThresholdPeriod', self::DELETE_PERIOD);
+
+        $dt = new DateTime();
+
+        $dt->modify($deleteThresholdPeriod);
+
+        try {
+            if ($dt->format('U') > (new DateTime($createdAt))->format('U')) {
+                return false;
+            }
+        }
+        catch (Exception $e) {
+            return false;
+        }
+
+        return true;
+    }
+}

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-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,22 +27,25 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\DB\Query;
+namespace Espo\Classes\Acl\Note;
+
+use Espo\Entities\User;
 
 use Espo\ORM\Entity;
-use Espo\ORM\IEntity;
-use Espo\ORM\EntityFactory;
-use PDO;
 
-class Mysql extends Base
+use Espo\Core\{
+    Acl\OwnershipOwnChecker,
+};
+
+class OwnershipChecker implements OwnershipOwnChecker
 {
-    public function limit($sql, $offset, $limit)
+    public function checkOwn(User $user, Entity $entity): bool
     {
-        if (!is_null($offset) && !is_null($limit)) {
-            $offset = intval($offset);
-            $limit = intval($limit);
-            $sql .= " LIMIT {$offset}, {$limit}";
+
+        if ($entity->get('type') === 'Post' && $user->getId() === $entity->get('createdById')) {
+            return true;
         }
-        return $sql;
+
+        return false;
     }
 }

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-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,19 +27,24 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\AclPortal;
+namespace Espo\Classes\Acl\Notification;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User;
 
-class Notification extends \Espo\Core\AclPortal\Base
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\OwnershipOwnChecker,
+};
+
+class OwnershipChecker implements OwnershipOwnChecker
 {
-    public function checkIsOwner(EntityUser $user, Entity $entity)
+    public function checkOwn(User $user, Entity $entity): bool
     {
-        if ($user->id === $entity->get('userId')) {
+        if ($user->getId() === $entity->get('userId')) {
             return true;
         }
+
         return false;
     }
 }
-

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

@@ -0,0 +1,63 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\Portal;
+
+use Espo\Entities\User;
+
+use Espo\Core\{
+    Acl\ScopeData,
+    Acl\DefaultAccessChecker,
+    Acl\AccessEntityCREDChecker,
+    Acl\Traits\DefaultAccessCheckerDependency,
+    Acl\Table,
+    AclManager,
+};
+
+class AccessChecker implements AccessEntityCREDChecker
+{
+    use DefaultAccessCheckerDependency;
+
+    private $defaultAccessChecker;
+
+    private $aclManager;
+
+    public function __construct(DefaultAccessChecker $defaultAccessChecker, AclManager $aclManager)
+    {
+        $this->defaultAccessChecker = $defaultAccessChecker;
+        $this->aclManager = $aclManager;
+    }
+
+    public function check(User $user, ScopeData $data): bool
+    {
+        $level = $this->aclManager->getPermissionLevel($user, 'portal');
+
+        return $level === Table::LEVEL_YES;
+    }
+}

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

@@ -0,0 +1,89 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\ScheduledJob;
+
+use Espo\Entities\User;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\ScopeData,
+    Acl\DefaultAccessChecker,
+    Acl\AccessEntityCREDChecker,
+    Acl\Traits\DefaultAccessCheckerDependency,
+};
+
+class AccessChecker implements AccessEntityCREDChecker
+{
+    use DefaultAccessCheckerDependency;
+
+    private $defaultAccessChecker;
+
+    public function __construct(DefaultAccessChecker $defaultAccessChecker)
+    {
+        $this->defaultAccessChecker = $defaultAccessChecker;
+    }
+
+    public function checkEntityCreate(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($entity->get('isInternal')) {
+            return false;
+        }
+
+        return $this->defaultAccessChecker->checkEntityCreate($user, $entity, $data);
+    }
+
+    public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($entity->get('isInternal')) {
+            return false;
+        }
+
+        return $this->defaultAccessChecker->checkEntityRead($user, $entity, $data);
+    }
+
+    public function checkEntityEdit(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($entity->get('isInternal')) {
+            return false;
+        }
+
+        return $this->defaultAccessChecker->checkEntityEdit($user, $entity, $data);
+    }
+
+    public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($entity->get('isInternal')) {
+            return false;
+        }
+
+        return $this->defaultAccessChecker->checkEntityDelete($user, $entity, $data);
+    }
+}

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-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,15 +27,22 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Acl;
+namespace Espo\Classes\Acl\Team;
 
-use \Espo\ORM\Entity;
+use Espo\Entities\User;
 
-class Team extends \Espo\Core\Acl\Base
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\OwnershipOwnChecker,
+};
+
+class OwnershipChecker implements OwnershipOwnChecker
 {
-    public function checkInTeam(\Espo\Entities\User $user, Entity $entity)
+    public function checkOwn(User $user, Entity $entity): bool
     {
         $userTeamIdList = $user->getLinkMultipleIdList('teams');
-        return in_array($entity->id, $userTeamIdList);
+
+        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-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,72 +27,103 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Acl;
+namespace Espo\Classes\Acl\User;
 
-use \Espo\ORM\Entity;
-use \Espo\Entities\User as EntityUser;
+use Espo\Entities\User;
 
-class User extends \Espo\Core\Acl\Base
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\Table,
+    Acl\ScopeData,
+    Acl\DefaultAccessChecker,
+    Acl\AccessEntityCREDSChecker,
+    Acl\Traits\DefaultAccessCheckerDependency,
+    AclManager,
+};
+
+class AccessChecker implements AccessEntityCREDSChecker
 {
-    public function checkIsOwner(\Espo\Entities\User $user, Entity $entity)
+    use DefaultAccessCheckerDependency;
+
+    private $defaultAccessChecker;
+
+    private $aclManager;
+
+    public function __construct(DefaultAccessChecker $defaultAccessChecker, AclManager $aclManager)
     {
-        return $user->id === $entity->id;
+        $this->defaultAccessChecker = $defaultAccessChecker;
+        $this->aclManager = $aclManager;
     }
 
-    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
+    public function checkEntityCreate(User $user, Entity $entity, ScopeData $data): bool
     {
-        if (!$user->isAdmin() && $entity->isPortal()) {
-            if ($this->getAclManager()->get($user, 'portalPermission') === 'yes') {
+        if (!$user->isAdmin()) {
+            return false;
+        }
+
+        if ($entity->isSuperAdmin() && !$user->isSuperAdmin()) {
+            return false;
+        }
+
+        return $this->defaultAccessChecker->checkEntityCreate($user, $entity, $data);
+    }
+
+    public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($entity->isPortal()) {
+            if ($this->aclManager->getPermissionLevel($user, 'portal') === Table::LEVEL_YES) {
                 return true;
             }
-        }
-        return $this->checkEntity($user, $entity, $data, 'read');
-    }
 
-    public function checkEntityCreate(EntityUser $user, Entity $entity, $data)
-    {
-        if (!$user->isAdmin()) {
             return false;
         }
+
         if ($entity->isSuperAdmin() && !$user->isSuperAdmin()) {
             return false;
         }
-        return $this->checkEntity($user, $entity, $data, 'create');
+
+        return $this->defaultAccessChecker->checkEntityRead($user, $entity, $data);
     }
 
-    public function checkEntityDelete(EntityUser $user, Entity $entity, $data)
+    public function checkEntityEdit(User $user, Entity $entity, ScopeData $data): bool
     {
-        if ($entity->id === 'system') {
-            return false;
-        }
-        if (!$user->isAdmin()) {
-            return false;
-        }
         if ($entity->isSystem()) {
             return false;
         }
-        if ($entity->isSuperAdmin() && !$user->isSuperAdmin()) {
-            return false;
-        }
-        return parent::checkEntityDelete($user, $entity, $data);
-    }
 
-    public function checkEntityEdit(EntityUser $user, Entity $entity, $data)
-    {
-        if ($entity->id === 'system') {
-            return false;
-        }
-        if ($entity->isSystem()) {
-            return false;
-        }
         if (!$user->isAdmin()) {
-            if ($user->id !== $entity->id) {
+            if ($user->getId() !== $entity->getId()) {
                 return false;
             }
         }
+
         if ($entity->isSuperAdmin() && !$user->isSuperAdmin()) {
             return false;
         }
-        return $this->checkEntity($user, $entity, $data, 'edit');
+
+        return $this->defaultAccessChecker->checkEntityEdit($user, $entity, $data);
+    }
+
+    public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if (!$user->isAdmin()) {
+            return false;
+        }
+
+        if ($entity->isSystem()) {
+            return false;
+        }
+
+        if ($entity->isSuperAdmin() && !$user->isSuperAdmin()) {
+            return false;
+        }
+
+        return $this->defaultAccessChecker->checkEntityDelete($user, $entity, $data);
+    }
+
+    public function checkEntityStream(User $user, Entity $entity, ScopeData $data): bool
+    {
+        return $this->aclManager->checkUserPermission($user, $entity, 'user');
     }
 }

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

@@ -0,0 +1,61 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\User;
+
+use Espo\Entities\User;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\OwnershipOwnChecker,
+    Acl\OwnershipTeamChecker,
+};
+
+class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
+{
+    public function checkOwn(User $user, Entity $entity): bool
+    {
+        return $user->getId() === $entity->getId();
+    }
+
+    public function checkTeam(User $user, Entity $entity): bool
+    {
+        $intersect = array_intersect(
+            $user->getLinkMultipleIdList('teams'),
+            $entity->getLinkMultipleIdList('teams')
+        );
+
+        if (count($intersect)) {
+            return true;
+        }
+
+        return false;
+    }
+}

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

@@ -0,0 +1,107 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\Webhook;
+
+use Espo\Entities\User;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\ScopeData,
+    Acl\DefaultAccessChecker,
+    Acl\AccessEntityCREDChecker,
+    Acl\Traits\DefaultAccessCheckerDependency,
+};
+
+class AccessChecker implements AccessEntityCREDChecker
+{
+    use DefaultAccessCheckerDependency;
+
+    private $defaultAccessChecker;
+
+    public function __construct(DefaultAccessChecker $defaultAccessChecker)
+    {
+        $this->defaultAccessChecker = $defaultAccessChecker;
+    }
+
+    public function check(User $user, ScopeData $data): bool
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if (!$user->isApi()) {
+            return false;
+        }
+
+        if ($data->isFalse()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function checkEntityCreate(User $user, Entity $entity, ScopeData $data): bool
+    {
+        return $this->checkEntityInternal($user, $entity, $data);
+    }
+
+    public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
+    {
+        return $this->checkEntityInternal($user, $entity, $data);
+    }
+
+    public function checkEntityEdit(User $user, Entity $entity, ScopeData $data): bool
+    {
+        return $this->checkEntityInternal($user, $entity, $data);
+    }
+
+    public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
+    {
+        return $this->checkEntityInternal($user, $entity, $data);
+    }
+
+    private function checkEntityInternal(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if ($data->isFalse()) {
+            return false;
+        }
+
+        if ($user->isApi() && $user->getId() === $entity->get('userId')) {
+            return true;
+        }
+
+        return false;
+    }
+}

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

@@ -0,0 +1,46 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\Webhook;
+
+use Espo\Entities\User;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\OwnershipOwnChecker,
+};
+
+class OwnershipChecker implements OwnershipOwnChecker
+{
+    public function checkOwn(User $user, Entity $entity): bool
+    {
+        return $user->getId() === $entity->get('userId') && $user->isApi();
+    }
+}

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

@@ -0,0 +1,158 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\AclPortal\Attachment;
+
+use Espo\Entities\{
+    User,
+    Note,
+};
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    ORM\EntityManager,
+    Portal\AclManager,
+    Acl\ScopeData,
+    Acl\AccessEntityCREDChecker,
+    Portal\Acl\DefaultAccessChecker,
+    Portal\Acl\Traits\DefaultAccessCheckerDependency,
+};
+
+class AccessChecker implements AccessEntityCREDChecker
+{
+    use DefaultAccessCheckerDependency;
+
+    private $defaultAccessChecker;
+
+    private $aclManager;
+
+    private $entityManager;
+
+    public function __construct(
+        DefaultAccessChecker $defaultAccessChecker,
+        AclManager $aclManager,
+        EntityManager $entityManager
+    ) {
+        $this->defaultAccessChecker = $defaultAccessChecker;
+        $this->aclManager = $aclManager;
+        $this->entityManager = $entityManager;
+    }
+
+    public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($entity->get('parentType') === 'Settings') {
+            return true;
+        }
+
+        $parent = null;
+        $hasParent = false;
+
+        if ($entity->get('parentId') && $entity->get('parentType')) {
+            $hasParent = true;
+
+            $parent = $this->entityManager->getEntity($entity->get('parentType'), $entity->get('parentId'));
+        }
+        else if ($entity->get('relatedId') && $entity->get('relatedType')) {
+            $hasParent = true;
+
+            $parent = $this->entityManager->getEntity($entity->get('relatedType'), $entity->get('relatedId'));
+        }
+
+        if (!$hasParent) {
+            if ($entity->get('createdById') === $user->getId()) {
+                return true;
+            }
+
+            return false;
+        }
+
+        if ($parent->getEntityType() === 'Note') {
+            $result = $this->checkEntityReadNoteParent($user, $parent);
+
+            if ($result !== null) {
+                return $result;
+            }
+        }
+        else if ($this->aclManager->checkEntity($user, $parent)) {
+            return true;
+        }
+
+        if ($this->defaultAccessChecker->checkEntityRead($user, $entity, $data)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private function checkEntityReadNoteParent(User $user, Note $note): ?bool
+    {
+        if ($note->isInternal()) {
+            return false;
+        }
+
+        if ($note->getTargetType() === Note::TARGET_PORTALS) {
+            $intersect = array_intersect(
+                $note->getLinkMultipleIdList('portals'),
+                $user->getLinkMultipleIdList('portals')
+            );
+
+            if (count($intersect)) {
+                return true;
+            }
+
+            return false;
+        }
+
+        if ($note->getTargetType() === Note::TARGET_USERS) {
+            $isRelated = $this->entityManager
+                ->getRDBRepository('Note')
+                ->getRelation($note, 'users')
+                ->isRelated($user);
+
+            if ($isRelated) {
+                return true;
+            }
+
+            return false;
+        }
+
+        if (!$note->getParentId() || !$note->getParentType()) {
+            return null;
+        }
+
+        $parent = $this->entityManager->getEntity($note->getParentType(), $note->getParentId());
+
+        if ($parent && $this->aclManager->checkEntity($user, $parent)) {
+            return true;
+        }
+
+        return null;
+    }
+}

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

@@ -0,0 +1,52 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\AclPortal\Attachment;
+
+use Espo\Entities\User;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\OwnershipOwnChecker,
+};
+
+class OwnershipChecker implements OwnershipOwnChecker
+{
+    private const ATTR_CREATED_BY_ID = 'createdById';
+
+    public function checkOwn(User $user, Entity $entity): bool
+    {
+        if ($user->getId() === $entity->get(self::ATTR_CREATED_BY_ID)) {
+            return true;
+        }
+
+        return false;
+    }
+}

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

@@ -0,0 +1,83 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\AclPortal\Email;
+
+use Espo\Entities\User;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Portal\AclManager,
+    Acl\Table,
+    Acl\ScopeData,
+    Acl\AccessEntityCREDSChecker,
+    Portal\Acl\DefaultAccessChecker,
+    Portal\Acl\Traits\DefaultAccessCheckerDependency,
+};
+
+class AccessChecker implements AccessEntityCREDSChecker
+{
+    use DefaultAccessCheckerDependency;
+
+    private $defaultAccessChecker;
+
+    private $aclManager;
+
+    public function __construct(
+        DefaultAccessChecker $defaultAccessChecker,
+        AclManager $aclManager
+    ) {
+        $this->defaultAccessChecker = $defaultAccessChecker;
+        $this->aclManager = $aclManager;
+    }
+
+    public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($this->defaultAccessChecker->checkEntityRead($user, $entity, $data)) {
+            return true;
+        }
+
+        if ($data->isFalse()) {
+            return false;
+        }
+
+        if ($data->getRead() === Table::LEVEL_NO) {
+            return false;
+        }
+
+        $userIdList = $entity->getLinkMultipleIdLIst('users');
+
+        if (is_array($userIdList) && in_array($user->getId(), $userIdList)) {
+            return true;
+        }
+
+        return false;
+    }
+}

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-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,19 +27,24 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Acl;
+namespace Espo\Classes\AclPortal\Email;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\Entities\User;
 
-class Notification extends \Espo\Core\Acl\Base
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\OwnershipOwnChecker,
+};
+
+class OwnershipChecker implements OwnershipOwnChecker
 {
-    public function checkIsOwner(EntityUser $user, Entity $entity)
+    public function checkOwn(User $user, Entity $entity): bool
     {
-        if ($user->id === $entity->get('userId')) {
+        if ($user->getId() === $entity->get('createdById')) {
             return true;
         }
+
         return false;
     }
 }
-

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

@@ -0,0 +1,189 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\AclPortal\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 DateTime;
+use Exception;
+
+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;
+
+    public function __construct(
+        DefaultAccessChecker $defaultAccessChecker,
+        AclManager $aclManager,
+        EntityManager $entityManager,
+        Config $config
+    ) {
+        $this->defaultAccessChecker = $defaultAccessChecker;
+        $this->aclManager = $aclManager;
+        $this->entityManager = $entityManager;
+        $this->config = $config;
+    }
+
+    public function checkEntityCreate(User $user, Entity $entity, ScopeData $data): bool
+    {
+        $parentId = $entity->get('parentId');
+        $parentType = $entity->get('parentType');
+
+        if (!$parentId || !$parentType) {
+            return $this->defaultAccessChecker->checkEntityCreate($user, $entity, $data);
+        }
+
+        $parent = $this->entityManager->getEntity($parentType, $parentId);
+
+        if ($parent && $this->aclManager->checkEntityStream($user, $parent)) {
+            return true;
+        }
+
+        return $this->defaultAccessChecker->checkEntityCreate($user, $entity, $data);
+    }
+
+    public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if ($entity->get('type') !== 'Post') {
+            return false;
+        }
+
+        if ($entity->get('type') === 'Post' && $entity->get('targetType')) {
+            return false;
+        }
+
+        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;
+            }
+        }
+
+        return false;
+    }
+
+    public function checkEntityEdit(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if (!$this->defaultAccessChecker->checkEntityEdit($user, $entity, $data)) {
+            return false;
+        }
+
+        if (!$this->aclManager->checkOwnershipOwn($user, $entity)) {
+            return true;
+        }
+
+        $createdAt = $entity->get('createdAt');
+
+        if (!$createdAt) {
+            return true;
+        }
+
+        $noteEditThresholdPeriod =
+            '-' .  $this->config->get('noteEditThresholdPeriod', self::EDIT_PERIOD);
+
+        $dt = new DateTime();
+
+        $dt->modify($noteEditThresholdPeriod);
+
+        try {
+            if ($dt->format('U') > (new DateTime($createdAt))->format('U')) {
+                return false;
+            }
+        }
+        catch (Exception $e) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
+    {
+        if (!$this->defaultAccessChecker->checkEntityDelete($user, $entity, $data)) {
+            return false;
+        }
+
+        if (!$this->aclManager->checkOwnershipOwn($user, $entity)) {
+            return true;
+        }
+
+        $createdAt = $entity->get('createdAt');
+
+        if (!$createdAt) {
+            return true;
+        }
+
+        $deleteThresholdPeriod =
+            '-' . $this->config->get('noteDeleteThresholdPeriod', self::DELETE_PERIOD);
+
+        $dt = new DateTime();
+
+        $dt->modify($deleteThresholdPeriod);
+
+        try {
+            if ($dt->format('U') > (new DateTime($createdAt))->format('U')) {
+                return false;
+            }
+        }
+        catch (Exception $e) {
+            return false;
+        }
+
+        return true;
+    }
+}

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

@@ -0,0 +1,50 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\AclPortal\Note;
+
+use Espo\Entities\User;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\OwnershipOwnChecker,
+};
+
+class OwnershipChecker implements OwnershipOwnChecker
+{
+    public function checkOwn(User $user, Entity $entity): bool
+    {
+        if ($entity->get('type') === 'Post' && $user->getId() === $entity->get('createdById')) {
+            return true;
+        }
+
+        return false;
+    }
+}

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-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,22 +27,24 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Modules\Crm\AclPortal;
+namespace Espo\Classes\AclPortal\Notification;
 
-use \Espo\Entities\User;
-use \Espo\ORM\Entity;
+use Espo\Entities\User;
 
-class Contact extends \Espo\Core\AclPortal\Base
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\OwnershipOwnChecker,
+};
+
+class OwnershipChecker implements OwnershipOwnChecker
 {
-    public function checkIsOwnContact(User $user, Entity $entity)
+    public function checkOwn(User $user, Entity $entity): bool
     {
-        $contactId = $user->get('contactId');
-        if ($contactId) {
-            if ($entity->id === $contactId) {
-                return true;
-            }
+        if ($user->getId() === $entity->get('userId')) {
+            return true;
         }
+
         return false;
     }
 }
-

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

@@ -0,0 +1,46 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\AclPortal\User;
+
+use Espo\Entities\User;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Acl\OwnershipOwnChecker,
+};
+
+class OwnershipChecker implements OwnershipOwnChecker
+{
+    public function checkOwn(User $user, Entity $entity): bool
+    {
+        return $user->getId() === $entity->getId();
+    }
+}

application/Espo/Classes/AddressFormatters/Formatter1.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,41 +27,63 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\EntryPoints;
+namespace Espo\Classes\AddressFormatters;
 
-use \Espo\Core\Exceptions\NotFound;
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\{
+    Field\Address,
+    Field\Address\AddressFormatter,
+};
 
-class Portal extends \Espo\Core\EntryPoints\Base
+class Formatter1 implements AddressFormatter
 {
-    public static $authRequired = false;
-
-    public function run($data = array())
+    public function format(Address $address): string
     {
-        if (!empty($_GET['id'])) {
-            $id = $_GET['id'];
-        } else if (!empty($data['id'])) {
-            $id = $data['id'];
-        } else {
-            $url = $_SERVER['REQUEST_URI'];
-            $id = explode('/', $url)[count(explode('/', $_SERVER['SCRIPT_NAME'])) - 1];
+        $result = '';
 
-            if (!isset($id)) {
-                $url = $_SERVER['REDIRECT_URL'];
-                $id = explode('/', $url)[count(explode('/', $_SERVER['SCRIPT_NAME'])) - 1];
+        $street = $address->getStreet();
+        $city = $address->getCity();
+        $country = $address->getCountry();
+        $state = $address->getState();
+        $postalCode = $address->getPostalCode();
+
+        if ($street) {
+            $result .= $street;
+        }
+
+        if ($city || $state || $postalCode) {
+            if ($result) {
+                $result .= "\n";
             }
 
-            if (!$id) {
-                $id = $this->getConfig()->get('defaultPortalId');
+            if ($city) {
+                $result .= $city;
             }
-            if (!$id) {
-                throw new NotFound();
+
+            if ($state && $city) {
+                $result .= ', ';
+            }
+
+            if ($state) {
+                $result .= $state;
+            }
+
+            if ($postalCode && ($state || $city)) {
+                $result .= ' ';
+            }
+
+            if ($postalCode) {
+                $result .= $postalCode;
             }
         }
 
-        $application = new \Espo\Core\Portal\Application($id);
-        $application->setBasePath($this->getContainer()->get('clientManager')->getBasePath());
-        $application->runClient();
+        if ($country) {
+            if ($result) {
+                $result .= "\n";
+            }
+
+            $result .= $country;
+        }
+
+        return $result;
     }
 }

application/Espo/Classes/AddressFormatters/Formatter2.php

@@ -0,0 +1,91 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\AddressFormatters;
+
+use Espo\Core\{
+    Field\Address,
+    Field\Address\AddressFormatter,
+};
+
+class Formatter2 implements AddressFormatter
+{
+    public function format(Address $address): string
+    {
+        $result = '';
+
+        $street = $address->getStreet();
+        $city = $address->getCity();
+        $country = $address->getCountry();
+        $state = $address->getState();
+        $postalCode = $address->getPostalCode();
+
+        if ($street) {
+            $result .= $street;
+        }
+
+        if ($city || $postalCode) {
+            if ($result) {
+                $result .= "\n";
+            }
+
+            if ($postalCode) {
+                $result .= $postalCode;
+            }
+
+            if ($postalCode && $city) {
+                $result .= ' ';
+            }
+
+            if ($city) {
+                $result .= $city;
+            }
+        }
+
+        if ($state || $country) {
+            if ($result) {
+                $result .= "\n";
+            }
+
+            if ($state) {
+                $result .= $state;
+            }
+
+            if ($state && $country) {
+                $result .= ' ';
+            }
+
+            if ($country) {
+                $result .= $country;
+            }
+        }
+
+        return $result;
+    }
+}

application/Espo/Classes/AddressFormatters/Formatter3.php

@@ -0,0 +1,89 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\AddressFormatters;
+
+use Espo\Core\{
+    Field\Address,
+    Field\Address\AddressFormatter,
+};
+
+class Formatter3 implements AddressFormatter
+{
+    public function format(Address $address): string
+    {
+        $result = '';
+
+        $street = $address->getStreet();
+        $city = $address->getCity();
+        $country = $address->getCountry();
+        $state = $address->getState();
+        $postalCode = $address->getPostalCode();
+
+        if ($country) {
+            $result .= $country;
+        }
+
+        if ($city || $state || $postalCode) {
+            if ($result) {
+                $result .= "\n";
+            }
+
+            if ($state) {
+                $result .= $state;
+            }
+
+            if ($state && $postalCode) {
+                $result .= ' ';
+            }
+
+            if ($postalCode) {
+                $result .= $postalCode;
+            }
+
+            if ($city && ($state || $postalCode)) {
+                $result .= ' ';
+            }
+
+            if ($city) {
+                $result .= $city;
+            }
+        }
+
+        if ($street) {
+            if ($result) {
+                $result .= "\n";
+            }
+
+            $result .= $street;
+        }
+
+        return $result;
+    }
+}

application/Espo/Classes/AddressFormatters/Formatter4.php

@@ -0,0 +1,89 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\AddressFormatters;
+
+use Espo\Core\{
+    Field\Address,
+    Field\Address\AddressFormatter,
+};
+
+class Formatter4 implements AddressFormatter
+{
+    public function format(Address $address): string
+    {
+        $result = '';
+
+        $street = $address->getStreet();
+        $city = $address->getCity();
+        $country = $address->getCountry();
+        $state = $address->getState();
+        $postalCode = $address->getPostalCode();
+
+        if ($street) {
+            $result .= $street;
+        }
+
+        if ($city) {
+            if ($result) {
+                $result .= "\n";
+            }
+
+            $result .= $city;
+        }
+
+        if ($country || $state || $postalCode) {
+            if ($result) {
+                $result .= "\n";
+            }
+
+            if ($country) {
+                $result .= $country;
+            }
+
+            if ($state && $country) {
+                $result .= ' - ';
+            }
+
+            if ($state) {
+                $result .= $state;
+            }
+
+            if ($postalCode && ($state || $country)) {
+                $result .= ' ';
+            }
+
+            if ($postalCode) {
+                $result .= $postalCode;
+            }
+        }
+
+        return $result;
+    }
+}

application/Espo/Classes/AppInfo/Binding.php

@@ -0,0 +1,120 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\AppInfo;
+
+use Espo\Core\{
+    Utils\Module,
+    Binding\EspoBindingLoader,
+    Binding\Binding as BindingItem,
+    Console\Command\Params,
+};
+
+class Binding
+{
+    private $module;
+
+    public function __construct(Module $module)
+    {
+        $this->module = $module;
+    }
+
+    public function process(Params $params): string
+    {
+        $result = '';
+
+        $bindingLoader = new EspoBindingLoader($this->module);
+
+        $data = $bindingLoader->load();
+
+        $keyList = $data->getGlobalKeyList();
+
+        $result .= "Global:\n\n";
+
+        foreach ($keyList as $key) {
+            $result .= $this->printItem($key, $data->getGlobal($key));
+        }
+
+        $contextList = $data->getContextList();
+
+        foreach ($contextList as $context) {
+            $result .= "Context: {$context}\n\n";
+
+            $keyList = $data->getContextKeyList($context);
+
+            foreach ($keyList as $key) {
+                $result .= $this->printItem($key, $data->getContext($context, $key), true);
+            }
+        }
+
+        return $result;
+    }
+
+    private function printItem(string $key, BindingItem $binding): string
+    {
+        $result = '';
+
+        $tab = '  ';
+
+        $result .= $tab . "Key:   {$key}\n";
+
+        $type = $binding->getType();
+        $value = $binding->getValue();
+
+        $typeString = [
+            BindingItem::IMPLEMENTATION_CLASS_NAME => 'Implementation',
+            BindingItem::CONTAINER_SERVICE => 'Service',
+            BindingItem::VALUE => 'Value',
+            BindingItem::CALLBACK => 'Callback',
+            BindingItem::FACTORY_CLASS_NAME => 'Factory',
+        ][$type];
+
+        $result .= $tab . "Type:  {$typeString}\n";
+
+        if ($type == BindingItem::IMPLEMENTATION_CLASS_NAME || $type == BindingItem::CONTAINER_SERVICE) {
+            $result .= $tab . "Value: {$value}\n";
+        }
+
+        if ($type == BindingItem::VALUE) {
+            if (is_string($value) || is_int($value) || is_float($value)) {
+                $result .= $tab . "Value: {$value}\n";
+            }
+
+            if (is_bool($value)) {
+                $valueString = $value ? 'true' : 'false';
+
+                $result .= $tab . "Value: {$valueString}\n";
+            }
+        }
+
+        $result .= "\n";
+
+        return $result;
+    }
+}

application/Espo/Classes/AppInfo/Container.php

@@ -0,0 +1,109 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\AppInfo;
+
+use Espo\Core\{
+    Container as ContainerService,
+    Utils\Metadata,
+    Console\Command\Params,
+};
+
+class Container
+{
+    private $container;
+
+    private $metadata;
+
+    public function __construct(ContainerService $container, Metadata $metadata)
+    {
+        $this->container = $container;
+        $this->metadata = $metadata;
+    }
+
+    public function process(Params $params): string
+    {
+        $nameOnly = $params->hasFlag('nameOnly');
+
+        $result = '';
+
+        $serviceList = [
+            'injectableFactory',
+            'config',
+            'log',
+            'fileManager',
+            'dataManager',
+            'metadata',
+            'user',
+        ];
+
+        $fileList = scandir('application/Espo/Core/Loaders');
+
+        if (file_exists('custom/Espo/Custom/Core/Loaders')) {
+            $fileList = array_merge($fileList, scandir('custom/Espo/Custom/Core/Loaders'));
+        }
+
+        foreach ($fileList as $file) {
+            if (substr($file, -4) === '.php') {
+                $name = lcfirst(substr($file, 0, -4));
+
+                if (!in_array($name, $serviceList) && $this->container->has($name)) {
+                    $serviceList[] = $name;
+                }
+            }
+        }
+
+        foreach ($this->metadata->get(['app', 'containerServices']) ?? [] as $name => $data) {
+            if (!in_array($name, $serviceList)) {
+                $serviceList[] = $name;
+            }
+        }
+
+        sort($serviceList);
+
+        if ($nameOnly) {
+            foreach ($serviceList as $name) {
+                $result .= $name . "\n";
+            }
+
+            return $result;
+        }
+
+        foreach ($serviceList as $name) {
+            $result .= $name . "\n";
+
+            $obj = $this->container->get($name);
+            $result .= get_class($obj) . "\n";
+
+            $result .= "\n";
+        }
+
+        return $result;
+    }
+}

application/Espo/Classes/AppInfo/Jobs.php

@@ -0,0 +1,68 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\AppInfo;
+
+use Espo\Core\Console\Command\Params;
+use Espo\Core\Utils\ClassFinder;
+use Espo\Core\Job\MetadataProvider;
+
+class Jobs
+{
+    private $classFinder;
+
+    private $metadataProvider;
+
+    public function __construct(ClassFinder $classFinder, MetadataProvider $metadataProvider)
+    {
+        $this->classFinder = $classFinder;
+        $this->metadataProvider = $metadataProvider;
+    }
+
+    public function process(Params $params): string
+    {
+        $result = "Available jobs:\n\n";
+
+        $list = array_map(
+            function ($item) {
+                return ' ' . $item;
+            },
+            array_unique(
+                array_merge(
+                    array_keys($this->classFinder->getMap('Jobs')),
+                    $this->metadataProvider->getScheduledJobNameList()
+                )
+            )
+        );
+
+        asort($list);
+
+        return $result . implode("\n", $list) . "\n";
+    }
+}

application/Espo/Classes/AppParams/TemplateEntityTypeList.php

@@ -0,0 +1,82 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\Core\{
+    Acl,
+    Select\SelectBuilderFactory,
+    ORM\EntityManager,
+};
+
+/**
+ * Returns a list of entity types for which a PDF template exists.
+ */
+class TemplateEntityTypeList
+{
+    protected $acl;
+    protected $selectBuilderFactory;
+    protected $entityManager;
+
+    public function __construct(Acl $acl, SelectBuilderFactory $selectBuilderFactory, EntityManager $entityManager)
+    {
+        $this->acl = $acl;
+        $this->selectBuilderFactory = $selectBuilderFactory;
+        $this->entityManager = $entityManager;
+    }
+
+    public function get() : array
+    {
+        if (!$this->acl->checkScope('Template')) {
+            return [];
+        }
+
+        $list = [];
+
+        $query = $this->selectBuilderFactory
+            ->create()
+            ->from('Template')
+            ->withAccessControlFilter()
+            ->buildQueryBuilder()
+            ->select(['entityType'])
+            ->group(['entityType'])
+            ->build();
+
+        $templateCollection = $this->entityManager
+            ->getRepository('Template')
+            ->clone($query)
+            ->find();
+
+        foreach ($templateCollection as $template) {
+            $list[] = $template->get('entityType');
+        }
+
+        return $list;
+    }
+}

application/Espo/Classes/AssignmentNotificators/Email.php

@@ -0,0 +1,296 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\AssignmentNotificators;
+
+use Espo\Services\Email as EmailService;
+use Espo\Services\Stream as StreamService;
+
+use Espo\Core\Notification\AssignmentNotificator;
+use Espo\Core\Notification\AssignmentNotificator\Params;
+use Espo\Core\Notification\UserEnabledChecker;
+use Espo\Core\ServiceFactory;
+use Espo\Core\AclManager;
+
+use Espo\ORM\EntityManager;
+use Espo\ORM\Entity;
+
+use Espo\Entities\User;
+use Espo\Entities\Notification;
+
+use DateTime;
+use Exception;
+
+class Email implements AssignmentNotificator
+{
+    private const DAYS_THRESHOLD = 2;
+
+    private $streamService = null;
+
+    private $user;
+
+    private $entityManager;
+
+    private $serviceFactory;
+
+    private $aclManager;
+
+    private $userChecker;
+
+    public function __construct(
+        User $user,
+        EntityManager $entityManager,
+        UserEnabledChecker $userChecker,
+        ServiceFactory $serviceFactory,
+        AclManager $aclManager
+    ) {
+        $this->user = $user;
+        $this->entityManager = $entityManager;
+        $this->userChecker = $userChecker;
+        $this->serviceFactory = $serviceFactory;
+        $this->aclManager = $aclManager;
+    }
+
+    public function process(Entity $entity, Params $params): void
+    {
+        if (!in_array($entity->get('status'), ['Archived', 'Sent', 'Being Imported'])) {
+            return;
+        }
+
+        if ($params->getOption('isJustSent')) {
+            $previousUserIdList = [];
+        }
+        else {
+            $previousUserIdList = $entity->getFetched('usersIds');
+
+            if (!is_array($previousUserIdList)) {
+                $previousUserIdList = [];
+            }
+        }
+
+        $dateSent = $entity->get('dateSent');
+
+        if (!$dateSent) {
+            return;
+        }
+
+        try {
+            $dt = new DateTime($dateSent);
+        }
+        catch (Exception $e) {
+            return;
+        }
+
+        if (!$dt) {
+            return;
+        }
+
+        if ($dt->diff(new DateTime())->days > self::DAYS_THRESHOLD) {
+            return;
+        }
+
+        $emailUserIdList = $entity->get('usersIds');
+
+        if (is_null($emailUserIdList) || !is_array($emailUserIdList)) {
+            return;
+        }
+
+        $userIdList = [];
+
+        foreach ($emailUserIdList as $userId) {
+            if (
+                !in_array($userId, $userIdList) &&
+                !in_array($userId, $previousUserIdList) &&
+                $userId !== $this->user->getId()
+            ) {
+                $userIdList[] = $userId;
+            }
+        }
+
+        $data = [
+            'emailId' => $entity->getId(),
+            'emailName' => $entity->get('name'),
+        ];
+
+        if (!$entity->has('from')) {
+            $this->entityManager->getRepository('Email')->loadFromField($entity);
+        }
+
+        if (!$entity->has('to')) {
+            $this->entityManager->getRepository('Email')->loadToField($entity);
+        }
+
+        $person = null;
+
+        $from = $entity->get('from');
+
+        if ($from) {
+            $person = $this->entityManager
+                ->getRepository('EmailAddress')
+                ->getEntityByAddress($from, null, ['User', 'Contact', 'Lead']);
+
+            if ($person) {
+                $data['personEntityType'] = $person->getEntityType();
+                $data['personEntityName'] = $person->get('name');
+                $data['personEntityId'] = $person->getId();
+            }
+        }
+
+        $userIdFrom = null;
+
+        if ($person && $person->getEntityType() === 'User') {
+            $userIdFrom = $person->id;
+        }
+
+        if (empty($data['personEntityId'])) {
+            $data['fromString'] = EmailService::parseFromName($entity->get('fromString'));
+
+            if (empty($data['fromString']) && $from) {
+                $data['fromString'] = $from;
+            }
+        }
+
+        $parent = null;
+
+        if ($entity->get('parentId') && $entity->get('parentType')) {
+            $parent = $this->entityManager->getEntity($entity->get('parentType'), $entity->get('parentId'));
+        }
+
+        $account = null;
+
+        if ($entity->get('accountId')) {
+            $account = $this->entityManager->getEntity('Account', $entity->get('accountId'));
+        }
+
+        foreach ($userIdList as $userId) {
+            if (!$userId) {
+                continue;
+            }
+
+            if ($userIdFrom === $userId) {
+                continue;
+            }
+
+            if ($entity->getLinkMultipleColumn('users', 'inTrash', $userId)) {
+                continue;
+            }
+
+            if (!$this->userChecker->checkAssignment('Email', $userId)) {
+                continue;
+            }
+
+            if (
+                $params->getOption('isBeingImported') ||
+                $params->getOption('isJustSent')
+            ) {
+                $folderId = $entity->getLinkMultipleColumn('users', 'folderId', $userId);
+
+                if ($folderId) {
+                    if (
+                        $this->entityManager
+                            ->getRepository('EmailFolder')
+                            ->where([
+                                'id' => $folderId,
+                                'skipNotifications' => true,
+                            ])
+                            ->count()
+                    ) {
+                        continue;
+                    }
+                }
+            }
+
+            $user = $this->entityManager->getEntity('User', $userId);
+
+            if (!$user) {
+                continue;
+            }
+
+            if ($user->isPortal()) {
+                continue;
+            }
+
+            if (!$this->aclManager->checkScope($user, 'Email')) {
+                continue;
+            }
+
+            $isArchivedOrBeingImported =
+                $entity->get('status') === 'Archived' ||
+                $params->getOption('isBeingImported');
+
+            if (
+                $isArchivedOrBeingImported &&
+                $parent &&
+                $this->getStreamService()->checkIsFollowed($parent, $userId)
+            ) {
+                continue;
+            }
+
+            if (
+                $isArchivedOrBeingImported &&
+                $account &&
+                $this->getStreamService()->checkIsFollowed($account, $userId)
+            ) {
+                continue;
+            }
+
+            $existing = $this->entityManager
+                ->getRepository(Notification::ENTITY_TYPE)
+                ->where([
+                    'type' => Notification::TYPE_EMAIL_RECEIVED,
+                    'userId' => $userId,
+                    'relatedId' => $entity->getId(),
+                    'relatedType' => 'Email',
+                ])
+                ->select(['id'])
+                ->findOne();
+
+            if ($existing) {
+                continue;
+            }
+
+            $this->entityManager->createEntity(Notification::ENTITY_TYPE, [
+                'type' => Notification::TYPE_EMAIL_RECEIVED,
+                'userId' => $userId,
+                'data' => $data,
+                'relatedId' => $entity->getId(),
+                'relatedType' => 'Email',
+            ]);
+        }
+    }
+
+    private function getStreamService(): StreamService
+    {
+        if (empty($this->streamService)) {
+            $this->streamService = $this->serviceFactory->create('Stream');
+        }
+
+        return $this->streamService;
+    }
+}

application/Espo/Classes/Cleanup/Reminders.php

@@ -0,0 +1,71 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\Utils\Config;
+use Espo\ORM\EntityManager;
+
+use DateTime;
+
+class Reminders implements Cleanup
+{
+    private $config;
+
+    private $entityManager;
+
+    private $cleanupRemindersPeriod = '15 days';
+
+    public function __construct(Config $config, EntityManager $entityManager)
+    {
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+    }
+
+    public function process(): void
+    {
+        $period = '-' . $this->config->get('cleanupRemindersPeriod', $this->cleanupRemindersPeriod);
+
+        $dt = new DateTime();
+
+        $dt->modify($period);
+
+        $delete = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from('Reminder')
+            ->where([
+                'remindAt<' => $dt->format('Y-m-d'),
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
+    }
+}

application/Espo/Classes/Cleanup/TwoFactorCodes.php

@@ -0,0 +1,77 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\Utils\Config;
+use Espo\Core\Utils\DateTime as DateTimeUtil;
+
+use Espo\ORM\EntityManager;
+
+use Espo\Entities\TwoFactorCode;
+
+use DateTime;
+
+class TwoFactorCodes implements Cleanup
+{
+    private const PERIOD = '5 days';
+
+    private $config;
+
+    private $entityManager;
+
+    public function __construct(Config $config, EntityManager $entityManager)
+    {
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+    }
+
+    public function process(): void
+    {
+        $period = '-' . $this->config->get('cleanupTwoFactorCodesPeriod', self::PERIOD);
+
+        $from = (new DateTime())
+            ->modify($period)
+            ->format(DateTimeUtil::SYSTEM_DATE_TIME_FORMAT);
+
+        $query = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from(TwoFactorCode::ENTITY_TYPE)
+            ->where([
+                'createdAt<' => $from,
+            ])
+            ->build();
+
+        $this->entityManager
+            ->getQueryExecutor()
+            ->execute($query);
+    }
+}

application/Espo/Classes/Cleanup/WebhookQueue.php

@@ -0,0 +1,91 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\Utils\Config;
+use Espo\ORM\EntityManager;
+
+use DateTime;
+
+class WebhookQueue implements Cleanup
+{
+    private $cleanupWebhookQueuePeriod = '10 days';
+
+    private $config;
+
+    private $entityManager;
+
+    public function __construct(Config $config, EntityManager $entityManager)
+    {
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+    }
+
+    public function process(): void
+    {
+        $period = '-' . $this->config->get('cleanupWebhookQueuePeriod', $this->cleanupWebhookQueuePeriod);
+
+        $datetime = new DateTime();
+
+        $datetime->modify($period);
+        $from = $datetime->format('Y-m-d H:i:s');
+
+        $query1 = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from('WebhookQueueItem')
+            ->where([
+                'DATE:(createdAt)<' => $from,
+                'OR' => [
+                    'status!=' => 'Pending',
+                    'deleted' => true,
+                ],
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($query1);
+
+        $query2 = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from('WebhookEventQueueItem')
+            ->where([
+                'DATE:(createdAt)<' => $from,
+                'OR' => [
+                    'isProcessed' => true,
+                    'deleted' => true,
+                ],
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($query2);
+    }
+}

application/Espo/Classes/ConsoleCommands/Import.php

@@ -0,0 +1,132 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\Tools\Import\Service;
+
+use Espo\Core\{
+    Console\Command,
+    Console\Command\Params,
+    Console\IO,
+};
+
+use Throwable;
+
+class Import implements Command
+{
+    private $service;
+
+    public function __construct(Service $service)
+    {
+        $this->service = $service;
+    }
+
+    public function run(Params $params, IO $io) : void
+    {
+        $id = $params->getOption('id');
+        $filePath = $params->getOption('file');
+        $paramsId = $params->getOption('paramsId');
+
+        $forceResume = $params->hasFlag('resume');
+        $revert = $params->hasFlag('revert');
+
+        if (!$id && $filePath) {
+            if (!$paramsId) {
+                $io->writeLine("You need to specify --params-id option.");
+
+                return;
+            }
+
+            if (!file_exists($filePath)) {
+                $io->writeLine("File not found.");
+
+                return;
+            }
+
+            $contents = file_get_contents($filePath);
+
+            try {
+                $result = $this->service->importContentsWithParamsId($contents, $paramsId);
+
+                $resultId = $result->getId();
+                $countCreated = $result->getCountCreated();
+                $countUpdated = $result->getCountUpdated();
+            }
+            catch (Throwable $e) {
+                $io->writeLine("Error occurred: ". $e->getMessage() . "");
+
+                return;
+            }
+
+            $io->writeLine("Finished. Import ID: {$resultId}. Created: {$countCreated}. Updated: {$countUpdated}.");
+
+            return;
+        }
+
+        if ($id && $revert) {
+            $io->writeLine("Reverting import...");
+
+            try {
+                $this->service->revert($id);
+            }
+            catch (Throwable $e) {
+                $io->writeLine("Error occurred: " . $e->getMessage() . "");
+
+                return;
+            }
+
+            $io->writeLine("Finished.");
+
+            return;
+        }
+
+        if ($id) {
+            $io->writeLine("Running import, this may take a while...");
+
+            try {
+                $result = $this->service->importById($id, true, $forceResume);
+            }
+            catch (Throwable $e) {
+                $io->writeLine("Error occurred: " . $e->getMessage() . "");
+
+                return;
+            }
+
+            $countCreated = $result->getCountCreated();
+            $countUpdated = $result->getCountUpdated();
+
+            $io->writeLine("Finished. Created: {$countCreated}. Updated: {$countUpdated}.");
+
+            return;
+        }
+
+        $io->writeLine("Not enough params passed.");
+    }
+}

application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,18 +27,20 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Utils\Layout\Defaults;
+namespace Espo\Classes\DefaultLayouts;
+
+use Espo\Core\Utils\Metadata;
 
 class DefaultSidePanelType
 {
     protected $metadata;
 
-    public function __construct(\Espo\Core\Utils\Metadata $metadata)
+    public function __construct(Metadata $metadata)
     {
         $this->metadata = $metadata;
     }
 
-    public function get(string $scope) : array
+    public function get(string $scope): array
     {
         $list = [];
 

application/Espo/Classes/DuplicateWhereBuilders/Company.php

@@ -0,0 +1,104 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\DuplicateWhereBuilders;
+
+use Espo\Core\Duplicate\WhereBuilder;
+
+use Espo\ORM\{
+    Query\Part\Condition as Cond,
+    Query\Part\WhereItem,
+    Query\Part\Where\OrGroup,
+    Entity,
+};
+
+class Company implements WhereBuilder
+{
+    public function build(Entity $entity): ?WhereItem
+    {
+        $orBuilder = OrGroup::createBuilder();
+
+        $toCheck = false;
+
+        if ($entity->get('name')) {
+            $orBuilder->add(
+                Cond::equal(
+                    Cond::column('name'),
+                    $entity->get('name')
+                ),
+            );
+
+            $toCheck = true;
+        }
+
+        if (
+            ($entity->get('emailAddress') || $entity->get('emailAddressData')) &&
+            (
+                $entity->isNew() ||
+                $entity->isAttributeChanged('emailAddress') ||
+                $entity->isAttributeChanged('emailAddressData')
+            )
+        ) {
+            foreach ($this->getEmailAddressList($entity) as $emailAddress) {
+                $orBuilder->add(
+                    Cond::equal(
+                        Cond::column('emailAddress'),
+                        $emailAddress
+                    )
+                );
+
+                $toCheck = true;
+            }
+        }
+
+        if (!$toCheck) {
+            return null;
+        }
+
+        return $orBuilder->build();
+    }
+
+    private function getEmailAddressList(Entity $entity): array
+    {
+        if ($entity->get('emailAddressData')) {
+            /* @var $eaGroup EmailAddressGroup */
+            $eaGroup = $entity->getValueObject('emailAddress');
+
+            return $eaGroup->getAddressList();
+        }
+
+        if ($entity->get('emailAddress')) {
+            return [
+                $entity->get('emailAddress')
+            ];
+        }
+
+        return [];
+    }
+}

application/Espo/Classes/DuplicateWhereBuilders/Person.php

@@ -0,0 +1,113 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\DuplicateWhereBuilders;
+
+use Espo\Core\{
+    Duplicate\WhereBuilder,
+    Field\EmailAddressGroup,
+};
+
+use Espo\ORM\{
+    Query\Part\Condition as Cond,
+    Query\Part\WhereItem,
+    Query\Part\Where\OrGroup,
+    Entity,
+};
+
+class Person implements WhereBuilder
+{
+    public function build(Entity $entity): ?WhereItem
+    {
+        $orBuilder = OrGroup::createBuilder();
+
+        $toCheck = false;
+
+        if ($entity->get('firstName') || $entity->get('lastName')) {
+            $orBuilder->add(
+                Cond::and(
+                    Cond::equal(
+                        Cond::column('firstName'),
+                        $entity->get('firstName')
+                    ),
+                    Cond::equal(
+                        Cond::column('lastName'),
+                        $entity->get('lastName')
+                    )
+                )
+            );
+
+            $toCheck = true;
+        }
+
+        if (
+            ($entity->get('emailAddress') || $entity->get('emailAddressData')) &&
+            (
+                $entity->isNew() ||
+                $entity->isAttributeChanged('emailAddress') ||
+                $entity->isAttributeChanged('emailAddressData')
+            )
+        ) {
+            foreach ($this->getEmailAddressList($entity) as $emailAddress) {
+                $orBuilder->add(
+                    Cond::equal(
+                        Cond::column('emailAddress'),
+                        $emailAddress
+                    )
+                );
+
+                $toCheck = true;
+            }
+        }
+
+        if (!$toCheck) {
+            return null;
+        }
+
+        return $orBuilder->build();
+    }
+
+    private function getEmailAddressList(Entity $entity): array
+    {
+        if ($entity->get('emailAddressData')) {
+            /* @var $eaGroup EmailAddressGroup */
+            $eaGroup = $entity->getValueObject('emailAddress');
+
+            return $eaGroup->getAddressList();
+        }
+
+        if ($entity->get('emailAddress')) {
+            return [
+                $entity->get('emailAddress')
+            ];
+        }
+
+        return [];
+    }
+}

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

@@ -0,0 +1,63 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\FieldProcessing\Email;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    FieldProcessing\Loader,
+    FieldProcessing\Loader\Params,
+    ORM\EntityManager,
+};
+
+use Espo\Repositories\Email as EmailRepository;
+
+class AddressDataLoader implements Loader
+{
+    private $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    public function process(Entity $entity, Params $params): void
+    {
+        /* @var $repository EmailRepository */
+        $repository = $this->entityManager->getRepository('Email');
+
+        $repository->loadFromField($entity);
+        $repository->loadToField($entity);
+        $repository->loadCcField($entity);
+        $repository->loadBccField($entity);
+        $repository->loadReplyToField($entity);
+        $repository->loadNameHash($entity);
+    }
+}

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

@@ -0,0 +1,205 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\FieldProcessing\Email;
+
+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,
+    FieldProcessing\Loader\Params,
+    Mail\Event\Event as EspoEvent,
+    Mail\Event\EventFactory,
+    Utils\Log,
+};
+
+use ICal\ICal;
+use ICal\Event;
+
+use Throwable;
+
+class IcsDataLoader implements Loader
+{
+    private $entityManager;
+
+    private $log;
+
+    private $entityTypeLinkMap = [
+        'User' => 'users',
+        'Contact' => 'contacts',
+        'Lead' => 'leads',
+    ];
+
+    public function __construct(EntityManager $entityManager, Log $log)
+    {
+        $this->entityManager = $entityManager;
+        $this->log = $log;
+    }
+
+    public function process(Entity $entity, Params $params): void
+    {
+        $icsContents = $entity->get('icsContents');
+
+        if ($icsContents === null) {
+            return;
+        }
+
+        $ical = new ICal();
+
+        $ical->initString($icsContents);
+
+        /* @var $event Event */
+        $event = $ical->events()[0] ?? null;
+
+        if ($event === null) {
+            return;
+        }
+
+        if ($event->status === 'CANCELLED') {
+            return;
+        }
+
+        $espoEvent = EventFactory::createFromU01jmg3Ical($ical);
+
+        $valueMap = (object) [
+            'sourceEmailId' => $entity->getId(),
+        ];
+
+        try {
+            $valueMap->name = $espoEvent->getName();
+            $valueMap->description = $espoEvent->getDescription();
+            $valueMap->dateStart = $espoEvent->getDateStart();
+            $valueMap->dateEnd = $espoEvent->getDateEnd();
+            $valueMap->location = $espoEvent->getLocation();
+            $valueMap->isAllDay = $espoEvent->isAllDay();
+
+            if ($espoEvent->isAllDay()) {
+                $valueMap->dateStartDate = $espoEvent->getDateStart();
+                $valueMap->dateEndDate = $espoEvent->getDateEnd();
+            }
+        }
+        catch (Throwable $e) {
+            $this->log->warning("Error while converting ICS event '" . $entity->getId() . "': " . $e->getMessage());
+
+            return;
+        }
+
+        /* @var $emailAddressRepository EmailAddressRepository */
+        $emailAddressRepository = $this->entityManager->getRepository(EmailAddress::ENTITY_TYPE);
+
+        $attendeeEmailAddressList = $espoEvent->getAttendeeEmailAddressList();
+
+        $organizerEmailAddress = $espoEvent->getOrganizerEmailAddress();
+
+        if ($organizerEmailAddress) {
+            $attendeeEmailAddressList[] = $organizerEmailAddress;
+        }
+
+        foreach ($attendeeEmailAddressList as $address) {
+            $personEntity = $emailAddressRepository->getEntityByAddress($address);
+
+            if (!$personEntity) {
+                continue;
+            }
+
+            $link = $this->entityTypeLinkMap[$personEntity->getEntityType()] ?? null;
+
+            if (!$link) {
+                continue;
+            }
+
+            $idsAttribute = $link . 'Ids';
+            $namesAttribute = $link . 'Names';
+
+            $idList = $valueMap->$idsAttribute ?? [];
+            $nameMap = $valueMap->$namesAttribute ?? (object) [];
+
+            $idList[] = $personEntity->getId();
+            $nameMap->{$personEntity->getId()} = $personEntity->get('name');
+
+            $valueMap->$idsAttribute = $idList;
+            $valueMap->$namesAttribute = $nameMap;
+        }
+
+        $eventData = (object) [
+            'valueMap' => $valueMap,
+            'uid' => $espoEvent->getUid(),
+            'createdEvent' => null,
+        ];
+
+        $this->loadCreatedEvent($entity, $espoEvent, $eventData);
+
+        $entity->set('icsEventData', $eventData);
+
+        $entity->set('icsEventDateStart', $espoEvent->getDateStart());
+
+        if ($espoEvent->isAllDay()) {
+            $entity->set('icsEventDateStartDate', $espoEvent->getDateStart());
+        }
+    }
+
+    private function loadCreatedEvent(Entity $entity, EspoEvent $espoEvent, object $eventData): void
+    {
+        $emailSameEvent = $this->entityManager
+            ->getRDBRepository(Email::ENTITY_TYPE)
+            ->where([
+                'icsEventUid' => $espoEvent->getUid(),
+                'id!=' => $entity->getId()
+            ])
+            ->findOne();
+
+        if (!$emailSameEvent) {
+            return;
+        }
+
+        if (
+            !$emailSameEvent->get('createdEventId') ||
+            !$emailSameEvent->get('createdEventType')
+        ) {
+            return;
+        }
+
+        $createdEvent = $this->entityManager
+            ->getEntity($emailSameEvent->get('createdEventType'), $emailSameEvent->get('createdEventId'));
+
+        if (!$createdEvent) {
+            return;
+        }
+
+        $eventData->createdEvent = (object) [
+            'id' => $createdEvent->getId(),
+            'entityType' => $emailSameEvent->getEntityType(),
+            'name' => $createdEvent->get('name'),
+        ];
+    }
+}

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

@@ -0,0 +1,122 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\FieldProcessing\Email;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    FieldProcessing\Loader,
+    FieldProcessing\Loader\Params,
+    ORM\EntityManager,
+};
+
+use Espo\Entities\Email;
+use Espo\Entities\User;
+
+class StringDataLoader implements Loader
+{
+    private $entityManager;
+
+    private $user;
+
+    private $fromEmailAddressNameCache = [];
+
+    public function __construct(EntityManager $entityManager, User $user)
+    {
+        $this->entityManager = $entityManager;
+        $this->user = $user;
+    }
+
+    public function process(Entity $entity, Params $params): void
+    {
+        $userEmailAdddressIdList = [];
+
+        $emailAddressCollection = $this->entityManager
+            ->getRDBRepository('User')
+            ->getRelation($this->user, 'emailAddresses')
+            ->select(['id'])
+            ->find();
+
+        foreach ($emailAddressCollection as $emailAddress) {
+            $userEmailAdddressIdList[] = $emailAddress->getId();
+        }
+
+        if (
+            in_array($entity->get('fromEmailAddressId'), $userEmailAdddressIdList) ||
+            $entity->get('createdById') === $this->user->getId() && $entity->get('status') === Email::STATUS_SENT
+        ) {
+            $entity->loadLinkMultipleField('toEmailAddresses');
+
+            $idList = $entity->get('toEmailAddressesIds');
+            $names = $entity->get('toEmailAddressesNames');
+
+            if (empty($idList)) {
+                return;
+            }
+
+            $list = [];
+
+            foreach ($idList as $emailAddressId) {
+                $person = $this->entityManager
+                    ->getRepository('EmailAddress')
+                    ->getEntityByAddressId($emailAddressId, null, true);
+
+                $list[] = $person ? $person->get('name') : $names->$emailAddressId;
+            }
+
+            $entity->set('personStringData', 'To: ' . implode(', ', $list));
+
+            return;
+        }
+
+        $fromEmailAddressId = $entity->get('fromEmailAddressId');
+
+        if (!$fromEmailAddressId) {
+            return;
+        }
+
+        if (!array_key_exists($fromEmailAddressId, $this->fromEmailAddressNameCache)) {
+            $person = $this->entityManager
+                ->getRepository('EmailAddress')
+                ->getEntityByAddressId($fromEmailAddressId, null, true);
+
+            $fromName = $person ? $person->get('name') : null;
+
+            $this->fromEmailAddressNameCache[$fromEmailAddressId] = $fromName;
+        }
+
+        $fromName =
+            $this->fromEmailAddressNameCache[$fromEmailAddressId] ??
+            $entity->get('fromName') ??
+            $entity->get('fromEmailAddressName');
+
+        $entity->set('personStringData', $fromName);
+    }
+}

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

@@ -0,0 +1,80 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\FieldProcessing\Email;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    FieldProcessing\Loader,
+    FieldProcessing\Loader\Params,
+    ORM\EntityManager,
+};
+
+use Espo\Entities\User;
+
+class UserColumnsLoader implements Loader
+{
+    private $entityManager;
+
+    private $user;
+
+    public function __construct(EntityManager $entityManager, User $user)
+    {
+        $this->entityManager = $entityManager;
+        $this->user = $user;
+    }
+
+    public function process(Entity $entity, Params $params): void
+    {
+        $emailUser = $this->entityManager
+            ->getRepository('EmailUser')
+            ->select(['isRead', 'isImportant', 'inTrash'])
+            ->where([
+                'deleted' => false,
+                'userId' => $this->user->getId(),
+                'emailId' => $entity->getId(),
+            ])
+            ->findOne();
+
+        if (!$emailUser) {
+            $entity->set('isRead', null);
+            $entity->clear('isImportant');
+            $entity->clear('inTrash');
+
+            return;
+        }
+
+        $entity->set([
+            'isRead' => $emailUser->get('isRead'),
+            'isImportant' => $emailUser->get('isImportant'),
+            'inTrash' => $emailUser->get('inTrash'),
+        ]);
+    }
+}

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

@@ -0,0 +1,66 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\FieldProcessing\Import;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    FieldProcessing\Loader,
+    FieldProcessing\Loader\Params,
+    ORM\EntityManager,
+};
+
+use Espo\Repositories\Import as ImportRepository;
+
+class CountsLoader implements Loader
+{
+    private $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    public function process(Entity $entity, Params $params): void
+    {
+        /* @var $repository ImportRepository */
+        $repository = $this->entityManager->getRepository('Import');
+
+        $importedCount = $repository->countResultRecords($entity, 'imported');
+        $duplicateCount = $repository->countResultRecords($entity, 'duplicates');
+        $updatedCount = $repository->countResultRecords($entity, 'updated');
+
+        $entity->set([
+            'importedCount' => $importedCount,
+            'duplicateCount' => $duplicateCount,
+            'updatedCount' => $updatedCount,
+        ]);
+    }
+}

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

@@ -0,0 +1,48 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\FieldProcessing\Note;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    FieldProcessing\Loader,
+    FieldProcessing\Loader\Params,
+};
+
+use Espo\Entities\Note;
+
+class AttachmentsLoader implements Loader
+{
+    public function process(Entity $entity, Params $params): void
+    {
+        /* @var $entity Note */
+        $entity->loadAttachments();
+    }
+}

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

@@ -0,0 +1,55 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\FieldProcessing\Portal;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    FieldProcessing\Loader,
+    FieldProcessing\Loader\Params,
+    ORM\EntityManager,
+};
+
+class UrlLoader implements Loader
+{
+    private $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    public function process(Entity $entity, Params $params): void
+    {
+        $this->entityManager
+            ->getRepository('Portal')
+            ->loadUrlField($entity);
+    }
+}

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

@@ -0,0 +1,112 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\FieldProcessing\User;
+
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    FieldProcessing\Loader,
+    FieldProcessing\Loader\Params,
+    ORM\EntityManager,
+    Acl,
+    Acl\Table,
+};
+
+use DateTime;
+use Exception;
+
+class LastAccessLoader implements Loader
+{
+    private $entityManager;
+
+    private $acl;
+
+    public function __construct(EntityManager $entityManager, Acl $acl)
+    {
+        $this->entityManager = $entityManager;
+        $this->acl = $acl;
+    }
+
+    public function process(Entity $entity, Params $params): void
+    {
+        $forbiddenFieldList = $this->acl
+            ->getScopeForbiddenFieldList($entity->getEntityType(), Table::ACTION_READ);
+
+        if (in_array('lastAccess', $forbiddenFieldList)) {
+            return;
+        }
+
+        $authToken = $this->entityManager
+            ->getRDBRepository('AuthToken')
+            ->select(['id', 'lastAccess'])
+            ->where([
+                'userId' => $entity->getId(),
+            ])
+            ->order('lastAccess', 'DESC')
+            ->findOne();
+
+        $lastAccess = null;
+
+        if ($authToken) {
+            $lastAccess = $authToken->get('lastAccess');
+        }
+
+        $dt = null;
+
+        if ($lastAccess) {
+            try {
+                $dt = new DateTime($lastAccess);
+            }
+            catch (Exception $e) {}
+        }
+
+        $where = [
+            'userId' => $entity->getId(),
+            'isDenied' => false,
+        ];
+
+        if ($dt) {
+            $where['requestTime>'] = $dt->format('U');
+        }
+
+        $authLogRecord = $this->entityManager
+            ->getRDBRepository('AuthLogRecord')
+            ->select(['id', 'createdAt'])
+            ->where($where)
+            ->order('requestTime', true)
+            ->findOne();
+
+        if ($authLogRecord) {
+            $lastAccess = $authLogRecord->get('createdAt');
+        }
+
+        $entity->set('lastAccess', $lastAccess);
+    }
+}

application/Espo/Classes/FieldValidators/ArrayIntType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class ArrayIntType extends ArrayType
 {

application/Espo/Classes/FieldValidators/ArrayType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,36 +27,59 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
-class ArrayType extends BaseType
+use Espo\ORM\Entity;
+
+use StdClass;
+
+class ArrayType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field): bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    public function checkMaxCount(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMaxCount(Entity $entity, string $field, int $validationValue): bool
     {
-        if (!$this->isNotEmpty($entity, $field)) return true;
+        if (!$this->isNotEmpty($entity, $field)) {
+            return true;
+        }
+
         $list = $entity->get($field);
-        if (count($list) > $validationValue) return false;
+
+        if (count($list) > $validationValue) {
+            return false;
+        }
+
         return true;
     }
 
-    public function checkArray(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function rawCheckArray(StdClass $data, string $field): bool
     {
-        if (!$entity->has($field) || $entity->get($field) === null) return true;
+        if (isset($data->$field) && $data->$field !== null && !is_array($data->$field)) {
+            return false;
+        }
 
-        return is_array($entity->get($field));
+        return true;
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, string $field): bool
     {
-        if (!$entity->has($field) || $entity->get($field) === null) return false;
+        if (!$entity->has($field) || $entity->get($field) === null) {
+            return false;
+        }
+
         $list = $entity->get($field);
-        if (!is_array($list)) return false;
-        if (count($list)) return true;
+
+        if (!is_array($list)) {
+            return false;
+        }
+
+        if (count($list)) {
+            return true;
+        }
+
         return false;
     }
 }

application/Espo/Classes/FieldValidators/ChecklistType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 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-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,11 +27,13 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class CurrencyType extends FloatType
 {
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, string $field): bool
     {
         return
             $entity->has($field) && $entity->get($field) !== null &&

application/Espo/Classes/FieldValidators/DateType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,16 +27,18 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
-class DateType extends BaseType
+use Espo\ORM\Entity;
+
+class DateType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field): bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, string $field): bool
     {
         return $entity->has($field) && $entity->get($field) !== null;
     }

application/Espo/Classes/FieldValidators/DatetimeOptionalType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,19 +27,27 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;
 
 class DatetimeOptionalType extends DatetimeType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field): bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, string $field): bool
     {
-        if ($entity->has($field) && $entity->get($field) !== null) return true;
-        if ($entity->has($field . 'Date') && $entity->get($field . 'Date') !== null) return true;
+        if ($entity->has($field) && $entity->get($field) !== null) {
+            return true;
+        }
+
+        if ($entity->has($field . 'Date') && $entity->get($field . 'Date') !== null) {
+            return true;
+        }
+
         return false;
     }
 }

application/Espo/Classes/FieldValidators/DatetimeType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class DatetimeType extends DateType
 {

application/Espo/Classes/FieldValidators/EmailType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,48 +27,65 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
-class EmailType extends BaseType
+use Espo\ORM\Entity;
+
+class EmailType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field): bool
     {
-        if ($this->isNotEmpty($entity, $field)) return true;
+        if ($this->isNotEmpty($entity, $field)) {
+            return true;
+        }
 
         $dataList = $entity->get($field . 'Data');
-        if (!is_array($dataList)) return false;
+
+        if (!is_array($dataList)) {
+            return false;
+        }
 
         foreach ($dataList as $item) {
-            if (!empty($item->emailAddress)) return true;
+            if (!empty($item->emailAddress)) {
+                return true;
+            }
         }
 
         return false;
     }
 
-    public function checkEmailAddress(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkEmailAddress(Entity $entity, string $field): bool
     {
         if ($this->isNotEmpty($entity, $field)) {
             $address = $entity->get($field);
+
             if (!filter_var($address, FILTER_VALIDATE_EMAIL)) {
                 return false;
             }
         }
 
         $dataList = $entity->get($field . 'Data');
-        if (is_array($dataList)) {
-            foreach ($dataList as $item) {
-                if (empty($item->emailAddress)) continue;
-                $address = $item->emailAddress;
-                if (!filter_var($address, FILTER_VALIDATE_EMAIL)) {
-                    return false;
-                }
+
+        if (!is_array($dataList)) {
+            return true;
+        }
+
+        foreach ($dataList as $item) {
+            if (empty($item->emailAddress)) {
+                continue;
+            }
+
+            $address = $item->emailAddress;
+
+            if (!filter_var($address, FILTER_VALIDATE_EMAIL)) {
+                return false;
             }
         }
 
         return true;
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    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-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,16 +27,18 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
-class EnumType extends BaseType
+use Espo\ORM\Entity;
+
+class EnumType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field): bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    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-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class FileType extends LinkType
 {

application/Espo/Classes/FieldValidators/FloatType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class FloatType extends IntType
 {

application/Espo/Classes/FieldValidators/ImageType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class ImageType extends FileType
 {

application/Espo/Classes/FieldValidators/IntType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,30 +27,44 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
-class IntType extends BaseType
+use Espo\ORM\Entity;
+
+class IntType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field): bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    public function checkMax(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMax(Entity $entity, string $field, $validationValue): bool
     {
-        if (!$this->isNotEmpty($entity, $field)) return true;
-        if ($entity->get($field) > $validationValue) return false;
+        if (!$this->isNotEmpty($entity, $field)) {
+            return true;
+        }
+
+        if ($entity->get($field) > $validationValue) {
+            return false;
+        }
+
         return true;
     }
 
-    public function checkMin(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMin(Entity $entity, string $field, $validationValue): bool
     {
-        if (!$this->isNotEmpty($entity, $field)) return true;
-        if ($entity->get($field) < $validationValue) return false;
+        if (!$this->isNotEmpty($entity, $field)) {
+            return true;
+        }
+
+        if ($entity->get($field) < $validationValue) {
+            return false;
+        }
+
         return true;
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, string $field): bool
     {
         return $entity->has($field) && $entity->get($field) !== null;
     }

application/Espo/Classes/FieldValidators/JsonArrayType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,29 +27,39 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Modules\Crm\AclPortal;
+namespace Espo\Classes\FieldValidators;
 
-use \Espo\Entities\User as EntityUser;
-use \Espo\ORM\Entity;
+use Espo\ORM\Entity;
 
-class KnowledgeBaseArticle extends \Espo\Core\AclPortal\Base
+use StdClass;
+
+class JsonArrayType
 {
-
-    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
+    public function rawCheckArray(StdClass $data, string $field): bool
     {
-        if (!$this->checkEntity($user, $entity, $data, 'read')) {
-            return false;
-        }
-
-        if ($entity->get('status') !== 'Published') return false;
-
-        $portalIdList = $entity->getLinkMultipleIdList('portals');
-
-        if ($user->get('portalId') && !in_array($user->get('portalId'), $portalIdList)) {
+        if (isset($data->$field) && $data->$field !== null && !is_array($data->$field)) {
             return false;
         }
 
         return true;
     }
-}
 
+    protected function isNotEmpty(Entity $entity, string $field): bool
+    {
+        if (!$entity->has($field) || $entity->get($field) === null) {
+            return false;
+        }
+
+        $list = $entity->get($field);
+
+        if (!is_array($list)) {
+            return false;
+        }
+
+        if (count($list)) {
+            return true;
+        }
+
+        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-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,11 +27,13 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
-class LinkMultipleType extends BaseType
+use Espo\ORM\Entity;
+
+class LinkMultipleType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field): bool
     {
         return count($entity->getLinkMultipleIdList($field)) > 0;
     }

application/Espo/Classes/FieldValidators/LinkParentType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,16 +27,22 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
-class LinkParentType extends BaseType
+use Espo\ORM\Entity;
+
+class LinkParentType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field): bool
     {
         $idAttribute = $field . 'Id';
         $typeAttribute = $field . 'Type';
 
-        if (!$entity->has($idAttribute) || $entity->get($idAttribute) === '' || $entity->get($idAttribute) === null) {
+        if (
+            !$entity->has($idAttribute) ||
+            $entity->get($idAttribute) === '' ||
+            $entity->get($idAttribute) === null
+        ) {
             return false;
         }
 

application/Espo/Classes/FieldValidators/LinkType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,11 +27,13 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
-class LinkType extends BaseType
+use Espo\ORM\Entity;
+
+class LinkType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field): bool
     {
         $idAttribute = $field . 'Id';
 

application/Espo/Classes/FieldValidators/MultiEnumType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class MultiEnumType extends ArrayType
 {

application/Espo/Classes/FieldValidators/PersonNameType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,23 +27,45 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
-class PersonNameType extends BaseType
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Utils\FieldUtil,
+};
+
+class PersonNameType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    private $fieldUtil;
+
+    public function __construct(FieldUtil $fieldUtil)
+    {
+        $this->fieldUtil = $fieldUtil;
+    }
+
+    public function checkRequired(Entity $entity, string $field): bool
     {
         $isEmpty = true;
-        foreach ($this->getActualAttributeList($entity, $field) as $attribute) {
+
+        $attributeList = $this->fieldUtil->getActualAttributeList($entity->getEntityType(), $field);
+
+        foreach ($attributeList as $attribute) {
             if ($attribute === 'salutation' . ucfirst($field)) {
                 continue;
             }
+
             if ($entity->has($attribute) && $entity->get($attribute) !== '') {
                 $isEmpty = false;
+
                 break;
             }
         }
-        if ($isEmpty) return false;
+
+        if ($isEmpty) {
+            return false;
+        }
+
         return true;
     }
 }

application/Espo/Classes/FieldValidators/PhoneType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,25 +27,34 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
-class PhoneType extends BaseType
+use Espo\ORM\Entity;
+
+class PhoneType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field): bool
     {
-        if ($this->isNotEmpty($entity, $field)) return true;
+        if ($this->isNotEmpty($entity, $field)) {
+            return true;
+        }
 
         $dataList = $entity->get($field . 'Data');
-        if (!is_array($dataList)) return false;
+
+        if (!is_array($dataList)) {
+            return false;
+        }
 
         foreach ($dataList as $item) {
-            if (!empty($item->phoneNumber)) return true;
+            if (!empty($item->phoneNumber)) {
+                return true;
+            }
         }
 
         return false;
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, string $field): bool
     {
         return $entity->has($field) && $entity->get($field) !== '' && $entity->get($field) !== null;
     }

application/Espo/Classes/FieldValidators/VarcharType.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,27 +27,31 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
-class VarcharType extends BaseType
+use Espo\ORM\Entity;
+
+class VarcharType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field): bool
     {
         return $this->isNotEmpty($entity, $field);
     }
 
-    public function checkMaxLength(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMaxLength(Entity $entity, string $field, int $validationValue): bool
     {
         if ($this->isNotEmpty($entity, $field)) {
             $value = $entity->get($field);
+
             if (mb_strlen($value) > $validationValue) {
                 return false;
             }
         }
+
         return true;
     }
 
-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, string $field): bool
     {
         return $entity->has($field) && $entity->get($field) !== '' && $entity->get($field) !== null;
     }

application/Espo/Classes/JobPreparators/CheckEmailAccounts.php

@@ -0,0 +1,109 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\JobPreparators;
+
+use Espo\Core\Utils\DateTime;
+use Espo\Core\Job\Job\Status;
+use Espo\Core\Job\Preparator;
+use Espo\Core\Job\Preparator\Data;
+
+use Espo\ORM\EntityManager;
+
+use Espo\Entities\Job as JobEntity;
+
+use DateTimeImmutable;
+
+class CheckEmailAccounts implements Preparator
+{
+    private $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    public function prepare(Data $data, DateTimeImmutable $executeTime): void
+    {
+        $collection = $this->entityManager
+            ->getRDBRepository('EmailAccount')
+            ->join('assignedUser', 'assignedUserAdditional')
+            ->where([
+                'status' => 'Active',
+                'useImap' => true,
+                'assignedUserAdditional.isActive' => true,
+            ])
+            ->find();
+
+        foreach ($collection as $entity) {
+            $running = $this->entityManager
+                ->getRDBRepository(JobEntity::ENTITY_TYPE)
+                ->where([
+                    'scheduledJobId' => $data->getId(),
+                    'status' => [
+                        Status::RUNNING,
+                        Status::READY,
+                    ],
+                    'targetType' => 'EmailAccount',
+                    'targetId' => $entity->getId(),
+                ])
+                ->findOne();
+
+            if ($running) {
+                continue;
+            }
+
+            $countPending = $this->entityManager
+                ->getRDBRepository(JobEntity::ENTITY_TYPE)
+                ->where([
+                    'scheduledJobId' => $data->getId(),
+                    'status' => Status::PENDING,
+                    'targetType' => 'EmailAccount',
+                    'targetId' => $entity->getId(),
+                ])
+                ->count();
+
+            if ($countPending > 1) {
+                continue;
+            }
+
+            $jobEntity = $this->entityManager->getEntity(JobEntity::ENTITY_TYPE);
+
+            $jobEntity->set([
+                'name' => $data->getName(),
+                'scheduledJobId' => $data->getId(),
+                'executeTime' => $executeTime->format(DateTime::SYSTEM_DATE_TIME_FORMAT),
+                'targetType' => 'EmailAccount',
+                'targetId' => $entity->getId(),
+            ]);
+
+            $this->entityManager->saveEntity($jobEntity);
+        }
+    }
+}

application/Espo/Classes/JobPreparators/CheckInboundEmails.php

@@ -0,0 +1,107 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\JobPreparators;
+
+use Espo\Core\Utils\DateTime;
+use Espo\Core\Job\Job\Status;
+use Espo\Core\Job\Preparator;
+use Espo\Core\Job\Preparator\Data;
+
+use Espo\ORM\EntityManager;
+
+use Espo\Entities\Job as JobEntity;
+
+use DateTimeImmutable;
+
+class CheckInboundEmails implements Preparator
+{
+    private $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    public function prepare(Data $data, DateTimeImmutable $executeTime): void
+    {
+        $collection = $this->entityManager
+            ->getRDBRepository('InboundEmail')
+            ->where([
+                'status' => 'Active',
+                'useImap' => true,
+            ])
+            ->find();
+
+        foreach ($collection as $entity) {
+            $running = $this->entityManager
+                ->getRDBRepository(JobEntity::ENTITY_TYPE)
+                ->where([
+                    'scheduledJobId' => $data->getId(),
+                    'status' => [
+                        Status::RUNNING,
+                        Status::READY,
+                    ],
+                    'targetType' => 'InboundEmail',
+                    'targetId' => $entity->getId(),
+                ])
+                ->findOne();
+
+            if ($running) {
+                continue;
+            }
+
+            $countPending = $this->entityManager
+                ->getRDBRepository(JobEntity::ENTITY_TYPE)
+                ->where([
+                    'scheduledJobId' => $data->getId(),
+                    'status' => Status::PENDING,
+                    'targetType' => 'InboundEmail',
+                    'targetId' => $entity->getId(),
+                ])
+                ->count();
+
+            if ($countPending > 1) {
+                continue;
+            }
+
+            $jobEntity = $this->entityManager->getEntity(JobEntity::ENTITY_TYPE);
+
+            $jobEntity->set([
+                'name' => $data->getName(),
+                'scheduledJobId' => $data->getId(),
+                'executeTime' => $executeTime->format(DateTime::SYSTEM_DATE_TIME_FORMAT),
+                'targetType' => 'InboundEmail',
+                'targetId' => $entity->getId(),
+            ]);
+
+            $this->entityManager->saveEntity($jobEntity);
+        }
+    }
+}

application/Espo/Classes/Jobs/AuthTokenControl.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,47 +27,71 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Jobs;
+namespace Espo\Classes\Jobs;
 
-use \Espo\Core\Exceptions;
+use Espo\Core\{
+    Utils\Config,
+    ORM\EntityManager,
+    Job\JobDataLess,
+};
 
-class AuthTokenControl extends \Espo\Core\Jobs\Base
+use DateTime;
+
+class AuthTokenControl implements JobDataLess
 {
-    public function run()
+    private $config;
+
+    private $entityManager;
+
+    public function __construct(Config $config, EntityManager $entityManager)
     {
-        $authTokenLifetime = $this->getConfig()->get('authTokenLifetime');
-        $authTokenMaxIdleTime = $this->getConfig()->get('authTokenMaxIdleTime');
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+    }
+
+    public function run(): void
+    {
+        $authTokenLifetime = $this->config->get('authTokenLifetime');
+        $authTokenMaxIdleTime = $this->config->get('authTokenMaxIdleTime');
 
         if (!$authTokenLifetime && !$authTokenMaxIdleTime) {
             return;
         }
 
-        $whereClause = array(
-            'isActive' => true
-        );
+        $whereClause = [
+            'isActive' => true,
+        ];
 
         if ($authTokenLifetime) {
-            $dt = new \DateTime();
+            $dt = new DateTime();
+
             $dt->modify('-' . $authTokenLifetime . ' hours');
+
             $authTokenLifetimeThreshold = $dt->format('Y-m-d H:i:s');
 
             $whereClause['createdAt<'] = $authTokenLifetimeThreshold;
         }
 
         if ($authTokenMaxIdleTime) {
-            $dt = new \DateTime();
+            $dt = new DateTime();
+
             $dt->modify('-' . $authTokenMaxIdleTime . ' hours');
+
             $authTokenMaxIdleTimeThreshold = $dt->format('Y-m-d H:i:s');
 
             $whereClause['lastAccess<'] = $authTokenMaxIdleTimeThreshold;
         }
 
-        $tokenList = $this->getEntityManager()->getRepository('AuthToken')->where($whereClause)->limit(0, 500)->find();
+        $tokenList = $this->entityManager
+            ->getRepository('AuthToken')
+            ->where($whereClause)
+            ->limit(0, 500)
+            ->find();
 
         foreach ($tokenList as $token) {
             $token->set('isActive', false);
-            $this->getEntityManager()->saveEntity($token);
+
+            $this->entityManager->saveEntity($token);
         }
     }
 }
-

application/Espo/Classes/Jobs/CheckEmailAccounts.php

@@ -0,0 +1,83 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\Jobs;
+
+use Espo\Core\Exceptions\Error;
+
+use Espo\Services\EmailAccount as Service;
+
+use Espo\Core\{
+    Job\Job,
+    Job\Job\Data,
+    ORM\EntityManager,
+};
+
+use Throwable;
+
+class CheckEmailAccounts implements Job
+{
+    private $service;
+
+    private $entityManager;
+
+    public function __construct(Service $service, EntityManager $entityManager)
+    {
+        $this->service = $service;
+        $this->entityManager = $entityManager;
+    }
+
+    public function run(Data $data): void
+    {
+        $targetId = $data->getTargetId();
+
+        if (!$targetId) {
+            throw new Error("No target.");
+        }
+
+        $entity = $this->entityManager->getEntity('EmailAccount', $targetId);
+
+        if (!$entity) {
+            throw new Error("Job CheckEmailAccounts '{$targetId}': EmailAccount does not exist.", -1);
+        }
+
+        if ($entity->get('status') !== 'Active') {
+            throw new Error("Job CheckEmailAccounts '{$targetId}': EmailAccount is not active.", -1);
+        }
+
+        try {
+            $this->service->fetchFromMailServer($entity);
+        }
+        catch (Throwable $e) {
+            throw new Error(
+                'Job CheckEmailAccounts ' . $entity->getId() . ': [' . $e->getCode() . '] ' .$e->getMessage()
+            );
+        }
+    }
+}

application/Espo/Classes/Jobs/CheckInboundEmails.php

@@ -0,0 +1,83 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\Jobs;
+
+use Espo\Core\Exceptions\Error;
+
+use Espo\Services\InboundEmail as Service;
+
+use Espo\Core\{
+    Job\Job,
+    Job\Job\Data,
+    ORM\EntityManager,
+};
+
+use Throwable;
+
+class CheckInboundEmails implements Job
+{
+    private $service;
+
+    private $entityManager;
+
+    public function __construct(Service $service, EntityManager $entityManager)
+    {
+        $this->service = $service;
+        $this->entityManager = $entityManager;
+    }
+
+    public function run(Data $data): void
+    {
+        $targetId = $data->getTargetId();
+
+        if (!$targetId) {
+            throw new Error("No target.");
+        }
+
+        $entity = $this->entityManager->getEntity('InboundEmail', $targetId);
+
+        if (!$entity) {
+            throw new Error("Job CheckInboundEmails '{$targetId}': InboundEmail does not exist.", -1);
+        }
+
+        if ($entity->get('status') !== 'Active') {
+            throw new Error("Job CheckInboundEmails '{$targetId}': InboundEmail is not active.", -1);
+        }
+
+        try {
+            $this->service->fetchFromMailServer($entity);
+        }
+        catch (Throwable $e) {
+            throw new Error(
+                'Job CheckInboundEmails ' . $entity->getId() . ': [' . $e->getCode() . '] ' .$e->getMessage()
+            );
+        }
+    }
+}

application/Espo/Classes/Jobs/CheckNewExtensionVersion.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,28 +27,27 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Jobs;
-
-use Espo\Core\Exceptions;
+namespace Espo\Classes\Jobs;
 
 class CheckNewExtensionVersion extends CheckNewVersion
 {
-    public function run()
+    public function run(): void
     {
-        if (!$this->getConfig()->get('adminNotifications') || !$this->getConfig()->get('adminNotificationsNewExtensionVersion')) {
-            return true;
+        if (
+            !$this->config->get('adminNotifications') ||
+            !$this->config->get('adminNotificationsNewExtensionVersion')
+        ) {
+            return;
         }
 
-        $job = $this->getEntityManager()->getEntity('Job');
-        $job->set(array(
+        $job = $this->entityManager->getEntity('Job');
+        $job->set([
             'name' => 'Check for new versions of installed extensions (job)',
             'serviceName' => 'AdminNotifications',
             'methodName' => 'jobCheckNewExtensionVersion',
-            'executeTime' => $this->getRunTime()
-        ));
+            'executeTime' => $this->getRunTime(),
+        ]);
 
-        $this->getEntityManager()->saveEntity($job);
-
-        return true;
+        $this->entityManager->saveEntity($job);
     }
-}
+}

application/Espo/Classes/Jobs/CheckNewVersion.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,29 +27,47 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Jobs;
+namespace Espo\Classes\Jobs;
 
-use Espo\Core\Exceptions;
+use Espo\Core\{
+    Utils\Config,
+    ORM\EntityManager,
+    Job\JobDataLess,
+};
 
-class CheckNewVersion extends \Espo\Core\Jobs\Base
+use DateTime;
+use DateTimeZone;
+
+class CheckNewVersion implements JobDataLess
 {
-    public function run()
+    protected $config;
+
+    protected $entityManager;
+
+    public function __construct(Config $config, EntityManager $entityManager)
     {
-        if (!$this->getConfig()->get('adminNotifications') || !$this->getConfig()->get('adminNotificationsNewVersion')) {
-            return true;
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+    }
+
+    public function run(): void
+    {
+        if (!$this->config->get('adminNotifications') || !$this->config->get('adminNotificationsNewVersion')) {
+            return;
         }
 
-        $job = $this->getEntityManager()->getEntity('Job');
-        $job->set(array(
+        $job = $this->entityManager->getEntity('Job');
+
+        $job->set([
             'name' => 'Check for New Version (job)',
             'serviceName' => 'AdminNotifications',
             'methodName' => 'jobCheckNewVersion',
-            'executeTime' => $this->getRunTime()
-        ));
+            'executeTime' => $this->getRunTime(),
+        ]);
 
-        $this->getEntityManager()->saveEntity($job);
+        $this->entityManager->saveEntity($job);
 
-        return true;
+        return;
     }
 
     protected function getRunTime()
@@ -57,16 +75,26 @@ class CheckNewVersion extends \Espo\Core\Jobs\Base
         $hour = rand(0, 4);
         $minute = rand(0, 59);
 
-        $nextDay = new \DateTime('+ 1 day');
+        $nextDay = new DateTime('+ 1 day');
         $time = $nextDay->format('Y-m-d') . ' ' . $hour . ':' . $minute . ':00';
 
-        $timeZone = $this->getConfig()->get('timeZone');
+        $timeZone = $this->config->get('timeZone');
+
         if (empty($timeZone)) {
             $timeZone = 'UTC';
         }
 
-        $datetime = new \DateTime($time, new \DateTimeZone($timeZone));
+        $datetime = new DateTime($time, new DateTimeZone($timeZone));
 
-        return $datetime->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d H:i:s');
+        return $datetime->setTimezone(new DateTimeZone('UTC'))->format('Y-m-d H:i:s');
     }
-}
+
+    /**
+     * For backward compatibility.
+     * @deprecated
+     */
+    protected function getEntityManager()
+    {
+        return $this->entityManager;
+    }
+}

application/Espo/Classes/Jobs/Cleanup.php

@@ -0,0 +1,751 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\Jobs;
+
+use Espo\Core\Record\ServiceContainer;
+
+use Espo\Core\{
+    Utils\Config,
+    ORM\EntityManager,
+    Job\JobDataLess,
+    Utils\Metadata,
+    Utils\File\Manager as FileManager,
+    InjectableFactory,
+    Select\SelectBuilderFactory,
+    Utils\Log,
+};
+
+use Espo\ORM\Entity;
+
+use DateTime;
+use SplFileInfo;
+use Exception;
+use Throwable;
+
+class Cleanup implements JobDataLess
+{
+    private $cleanupJobPeriod = '10 days';
+
+    private $cleanupActionHistoryPeriod = '15 days';
+
+    private $cleanupAuthTokenPeriod = '1 month';
+
+    private $cleanupAuthLogPeriod = '2 months';
+
+    private $cleanupNotificationsPeriod = '2 months';
+
+    private $cleanupAttachmentsPeriod = '15 days';
+
+    private $cleanupAttachmentsFromPeriod = '3 months';
+
+    private $cleanupBackupPeriod = '2 month';
+
+    private $cleanupDeletedRecordsPeriod = '3 months';
+
+    private $config;
+
+    private $entityManager;
+
+    private $metadata;
+
+    private $fileManager;
+
+    private $injectableFactory;
+
+    private $selectBuilderFactory;
+
+    private $recordServiceContainer;
+
+    private $log;
+
+    public function __construct(
+        Config $config,
+        EntityManager $entityManager,
+        Metadata $metadata,
+        FileManager $fileManager,
+        InjectableFactory $injectableFactory,
+        SelectBuilderFactory $selectBuilderFactory,
+        ServiceContainer $recordServiceContainer,
+        Log $log
+    ) {
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+        $this->metadata = $metadata;
+        $this->fileManager = $fileManager;
+        $this->injectableFactory = $injectableFactory;
+        $this->selectBuilderFactory = $selectBuilderFactory;
+        $this->recordServiceContainer = $recordServiceContainer;
+        $this->log = $log;
+    }
+
+    public function run(): void
+    {
+        $this->cleanupJobs();
+        $this->cleanupScheduledJobLog();
+        $this->cleanupAttachments();
+        $this->cleanupEmails();
+        $this->cleanupNotifications();
+        $this->cleanupActionHistory();
+        $this->cleanupAuthToken();
+        $this->cleanupAuthLog();
+        $this->cleanupUpgradeBackups();
+        $this->cleanupUniqueIds();
+        $this->cleanupDeletedRecords();
+
+        $items = $this->metadata->get(['app', 'cleanup']) ?? [];
+
+        usort($items, function ($a, $b) {
+            $o1 = $a['order'] ?? 0;
+            $o2 = $b['order'] ?? 0;
+
+            return $o1 <=> $o2;
+        });
+
+        $injectableFactory = $this->injectableFactory;
+
+        foreach ($items as $name => $item) {
+            try {
+                $className = $item['className'];
+
+                $injectableFactory->create($className)->process();
+            }
+            catch (Throwable $e) {
+                $this->log->error("Cleanup: {$name}: " . $e->getMessage());
+            }
+        }
+    }
+
+    private function cleanupJobs(): void
+    {
+        $delete = $this->entityManager->getQueryBuilder()->delete()
+            ->from('Job')
+            ->where([
+                'DATE:modifiedAt<' => $this->getCleanupJobFromDate(),
+                'status!=' => 'Pending',
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
+
+        $delete = $this->entityManager->getQueryBuilder()->delete()
+            ->from('Job')
+            ->where([
+                'DATE:modifiedAt<' => $this->getCleanupJobFromDate(),
+                'status=' => 'Pending',
+                'deleted' => true,
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
+    }
+
+    private function cleanupUniqueIds(): void
+    {
+        $delete = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from('UniqueId')
+            ->where([
+                'terminateAt!=' => null,
+                'terminateAt<' => date('Y-m-d H:i:s')
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
+    }
+
+    private function cleanupScheduledJobLog(): void
+    {
+        $scheduledJobList = $this->entityManager->getRepository('ScheduledJob')
+            ->select(['id'])
+            ->find();
+
+        foreach ($scheduledJobList as $scheduledJob) {
+            $scheduledJobId = $scheduledJob->get('id');
+
+            $ignoreLogRecordList = $this->entityManager->getRepository('ScheduledJobLogRecord')
+                ->select(['id'])
+                ->where([
+                    'scheduledJobId' => $scheduledJobId,
+                ])
+                ->order('createdAt', 'DESC')
+                ->limit(0, 10)
+                ->find();
+
+            if (!count($ignoreLogRecordList)) {
+                continue;
+            }
+
+            $ignoreIdList = [];
+            foreach ($ignoreLogRecordList as $logRecord) {
+                $ignoreIdList[] = $logRecord->get('id');
+            }
+
+            $delete = $this->entityManager
+                ->getQueryBuilder()
+                ->delete()
+                ->from('ScheduledJobLogRecord')
+                ->where([
+                    'scheduledJobId' => $scheduledJobId,
+                    'DATE:createdAt<' => $this->getCleanupJobFromDate(),
+                    'id!=' => $ignoreIdList,
+                ])
+                ->build();
+
+            $this->entityManager->getQueryExecutor()->execute($delete);
+        }
+    }
+
+    private function cleanupActionHistory(): void
+    {
+        $period = '-' . $this->config->get('cleanupActionHistoryPeriod', $this->cleanupActionHistoryPeriod);
+
+        $datetime = new DateTime();
+
+        $datetime->modify($period);
+
+        $delete = $this->entityManager->getQueryBuilder()->delete()
+            ->from('ActionHistoryRecord')
+            ->where([
+                'DATE:createdAt<' => $datetime->format('Y-m-d'),
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
+    }
+
+    private function cleanupAuthToken(): void
+    {
+        $period = '-' . $this->config->get('cleanupAuthTokenPeriod', $this->cleanupAuthTokenPeriod);
+
+        $datetime = new DateTime();
+        $datetime->modify($period);
+
+        $delete = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from('AuthToken')
+            ->where([
+                'DATE:modifiedAt<' => $datetime->format('Y-m-d'),
+                'isActive' => false,
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
+    }
+
+    private function cleanupAuthLog(): void
+    {
+        $period = '-' . $this->config->get('cleanupAuthLogPeriod', $this->cleanupAuthLogPeriod);
+
+        $datetime = new DateTime();
+
+        $datetime->modify($period);
+
+        $delete = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from('AuthLogRecord')
+            ->where([
+                'DATE:createdAt<' => $datetime->format('Y-m-d'),
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
+    }
+
+    private function getCleanupJobFromDate(): string
+    {
+        $period = '-' . $this->config->get('cleanupJobPeriod', $this->cleanupJobPeriod);
+
+        $datetime = new DateTime();
+        $datetime->modify($period);
+
+        return $datetime->format('Y-m-d');
+    }
+
+    private function cleanupAttachments(): void
+    {
+        $period = '-' . $this->config->get('cleanupAttachmentsPeriod', $this->cleanupAttachmentsPeriod);
+
+        $datetime = new DateTime();
+
+        $datetime->modify($period);
+
+        $collection = $this->entityManager
+            ->getRepository('Attachment')
+            ->where([
+                'OR' => [
+                    [
+                        'role' => ['Export File', 'Mail Merge', 'Mass Pdf']
+                    ]
+                ],
+                'createdAt<' => $datetime->format('Y-m-d H:i:s'),
+            ])
+            ->limit(0, 5000)
+            ->find();
+
+        foreach ($collection as $entity) {
+            $this->entityManager->removeEntity($entity);
+        }
+
+        if ($this->config->get('cleanupOrphanAttachments')) {
+            $orphanQueryBuilder = $this->selectBuilderFactory
+                ->create()
+                ->from('Attachment')
+                ->withPrimaryFilter('orphan')
+                ->buildQueryBuilder();
+
+            $orphanQueryBuilder->where([
+                'createdAt<' => $datetime->format('Y-m-d H:i:s'),
+                'createdAt>' => '2018-01-01 00:00:00',
+            ]);
+
+            $collection = $this->entityManager
+                ->getRepository('Attachment')
+                ->clone($orphanQueryBuilder->build())
+                ->limit(0, 5000)
+                ->find();
+
+            foreach ($collection as $entity) {
+                $this->entityManager->removeEntity($entity);
+            }
+        }
+
+        $fromPeriod = '-' . $this->config->get('cleanupAttachmentsFromPeriod', $this->cleanupAttachmentsFromPeriod);
+
+        $datetimeFrom = new DateTime();
+
+        $datetimeFrom->modify($fromPeriod);
+
+        $scopeList = array_keys($this->metadata->get(['scopes']));
+
+        foreach ($scopeList as $scope) {
+            if (!$this->metadata->get(['scopes', $scope, 'entity'])) {
+                continue;
+            }
+
+            if (!$this->metadata->get(['scopes', $scope, 'object']) && $scope !== 'Note') {
+                continue;
+            }
+
+            if (!$this->metadata->get(['entityDefs', $scope, 'fields', 'modifiedAt'])) {
+                continue;
+            }
+
+            $hasAttachmentField = false;
+
+            if ($scope === 'Note') {
+                $hasAttachmentField = true;
+            }
+
+            if (!$hasAttachmentField) {
+                foreach ($this->metadata->get(['entityDefs', $scope, 'fields']) as $field => $defs) {
+                    if (empty($defs['type'])) {
+                        continue;
+                    }
+
+                    if (in_array($defs['type'], ['file', 'image', 'attachmentMultiple'])) {
+                        $hasAttachmentField = true;
+
+                        break;
+                    }
+                }
+            }
+
+            if (!$hasAttachmentField) {
+                continue;
+            }
+
+            if (!$this->entityManager->hasRepository($scope)) {
+                continue;
+            }
+
+            $repository = $this->entityManager->getRepository($scope);
+
+            if (!method_exists($repository, 'find')) {
+                continue;
+            }
+
+            if (!method_exists($repository, 'clone')) {
+                continue;
+            }
+
+            $query = $this->entityManager->getQueryBuilder()
+                ->select()
+                ->from($scope)
+                ->withDeleted()
+                ->where([
+                    'deleted' => 1,
+                    'modifiedAt<' => $datetime->format('Y-m-d H:i:s'),
+                    'modifiedAt>' => $datetimeFrom->format('Y-m-d H:i:s'),
+                ])
+                ->build();
+
+            $deletedEntityList = $repository
+                ->clone($query)
+                ->find();
+
+            foreach ($deletedEntityList as $deletedEntity) {
+                $attachmentToRemoveList = $this->entityManager
+                    ->getRepository('Attachment')
+                    ->where([
+                        'OR' => [
+                            [
+                                'relatedType' => $scope,
+                                'relatedId' => $deletedEntity->id,
+                            ],
+                            [
+                                'parentType' => $scope,
+                                'parentId' => $deletedEntity->id,
+                            ]
+                        ]
+                    ])
+                    ->find();
+
+                foreach ($attachmentToRemoveList as $attachmentToRemove) {
+                    $this->entityManager->removeEntity($attachmentToRemove);
+                }
+            }
+        }
+
+        $delete = $this->entityManager->getQueryBuilder()->delete()
+            ->from('Attachment')
+            ->where([
+                'deleted' => true,
+                'createdAt<' => $datetime->format('Y-m-d H:i:s'),
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
+    }
+
+    private function cleanupEmails(): void
+    {
+        $dateBefore = date('Y-m-d H:i:s', time() - 3600 * 24 * 20);
+
+        $query = $this->entityManager->getQueryBuilder()
+            ->select()
+            ->from('Email')
+            ->withDeleted()
+            ->build();
+
+        $emailList = $this->entityManager
+            ->getRepository('Email')
+            ->clone($query)
+            ->select(['id'])
+            ->where([
+                'createdAt<' => $dateBefore,
+                'deleted' => true,
+            ])
+            ->find();
+
+        foreach ($emailList as $email) {
+            $id = $email->get('id');
+
+            $attachments = $this->entityManager
+                ->getRepository('Attachment')
+                ->where([
+                    'parentId' => $id,
+                    'parentType' => 'Email'
+                ])
+                ->find();
+
+            foreach ($attachments as $attachment) {
+                $this->entityManager->removeEntity($attachment);
+            }
+
+            $delete = $this->entityManager->getQueryBuilder()->delete()
+                ->from('Email')
+                ->where([
+                    'deleted' => true,
+                    'id' => $id,
+                ])
+                ->build();
+
+            $this->entityManager->getQueryExecutor()->execute($delete);
+
+            $delete = $this->entityManager->getQueryBuilder()->delete()
+                ->from('EmailUser')
+                ->where([
+                    'emailId' => $id,
+                ])
+                ->build();
+
+            $this->entityManager->getQueryExecutor()->execute($delete);
+        }
+    }
+
+    private function cleanupNotifications(): void
+    {
+        $period = '-' . $this->config->get('cleanupNotificationsPeriod', $this->cleanupNotificationsPeriod);
+
+        $datetime = new DateTime();
+        $datetime->modify($period);
+
+        $notificationList = $this->entityManager->getRepository('Notification')
+            ->where([
+                'DATE:createdAt<' => $datetime->format('Y-m-d'),
+            ])
+            ->find();
+
+        foreach ($notificationList as $notification) {
+            $this->entityManager->getRepository('Notification')->deleteFromDb($notification->get('id'));
+        }
+    }
+
+    private function cleanupUpgradeBackups(): void
+    {
+        $path = 'data/.backup/upgrades';
+
+        $datetime = new DateTime('-' . $this->cleanupBackupPeriod);
+
+        if (file_exists($path)) {
+            $fileManager = $this->fileManager;
+            $fileList = $fileManager->getFileList($path, false, '', false);
+
+            foreach ($fileList as $dirName) {
+                $dirPath = $path .  '/' . $dirName;
+
+                $info = new SplFileInfo($dirPath);
+
+                if ($datetime->getTimestamp() > $info->getMTime()) {
+                    $fileManager->removeInDir($dirPath, true);
+                }
+            }
+        }
+    }
+
+    private function cleanupDeletedEntity(Entity $entity): void
+    {
+        $scope = $entity->getEntityType();
+
+        if (!$entity->get('deleted')) {
+            return;
+        }
+
+        $repository = $this->entityManager->getRepository($scope);
+
+        $repository->deleteFromDb($entity->id);
+
+        $query = $this->entityManager->getQueryComposer();
+
+        foreach ($entity->getRelationList() as $relation) {
+            if ($entity->getRelationType($relation) !== Entity::MANY_MANY) {
+                continue;
+            }
+
+            try {
+                $relationName = $entity->getRelationParam($relation, 'relationName');
+
+                if (!$relationName) {
+                    continue;
+                }
+
+                $midKey = $entity->getRelationParam($relation, 'midKeys')[0];
+
+                if (!$midKey) {
+                    continue;
+                }
+
+                $where = [
+                    $midKey => $entity->id,
+                ];
+
+                $conditions = $entity->getRelationParam($relation, 'conditions') ?? [];
+
+                foreach ($conditions as $key => $value) {
+                    $where[$key] = $value;
+                }
+
+                if (empty($where)) {
+                    continue;
+                }
+
+                $relationEntityType = ucfirst($relationName);
+
+                if (!$this->entityManager->hasRepository($relationEntityType)) {
+                    continue;
+                }
+
+                $delete = $this->entityManager->getQueryBuilder()->delete()
+                    ->from($relationEntityType)
+                    ->where($where)
+                    ->build();
+
+                $this->entityManager->getQueryExecutor()->execute($delete);
+            }
+            catch (Exception $e) {
+                $this->log->error("Cleanup: " . $e->getMessage());
+            }
+        }
+
+        $query = $this->entityManager->getQueryBuilder()
+            ->select()
+            ->from('Note')
+            ->withDeleted()
+            ->build();
+
+        $noteList = $this->entityManager
+            ->getRepository('Note')
+            ->clone($query)
+            ->where([
+                'OR' => [
+                    [
+                        'relatedType' => $scope,
+                        'relatedId' => $entity->id,
+                    ],
+                    [
+                        'parentType' => $scope,
+                        'parentId' => $entity->id,
+                    ]
+                ]
+            ])
+            ->find();
+
+        foreach ($noteList as $note) {
+            $this->entityManager->removeEntity($note);
+
+            $note->set('deleted', true);
+
+            $this->cleanupDeletedEntity($note);
+        }
+
+        if ($scope === 'Note') {
+            $attachmentList = $this->entityManager
+                ->getRepository('Attachment')
+                ->where([
+                    'parentId' => $entity->id,
+                    'parentType' => 'Note',
+                ])
+                ->find();
+
+            foreach ($attachmentList as $attachment) {
+                $this->entityManager->removeEntity($attachment);
+                $this->entityManager->getRepository('Attachment')->deleteFromDb($attachment->id);
+            }
+        }
+
+        $arrayValueList = $this->entityManager
+            ->getRepository('ArrayValue')
+            ->where([
+                'entityType' => $entity->getEntityType(),
+                'entityId' => $entity->id,
+            ])
+            ->find();
+
+        foreach ($arrayValueList as $arrayValue) {
+            $this->entityManager->getRepository('ArrayValue')->deleteFromDb($arrayValue->id);
+        }
+    }
+
+    private function cleanupDeletedRecords(): void
+    {
+        if (!$this->config->get('cleanupDeletedRecords')) {
+            return;
+        }
+
+        $period = '-' . $this->config->get('cleanupDeletedRecordsPeriod', $this->cleanupDeletedRecordsPeriod);
+
+        $datetime = new DateTime($period);
+
+        $scopeList = array_keys($this->metadata->get(['scopes']));
+
+        foreach ($scopeList as $scope) {
+            if (!$this->metadata->get(['scopes', $scope, 'entity'])) {
+                continue;
+            }
+
+            if ($scope === 'Attachment') {
+                continue;
+            }
+
+            if (!$this->entityManager->hasRepository($scope)) {
+                continue;
+            }
+
+            $repository = $this->entityManager->getRepository($scope);
+
+            if (!$repository) {
+                continue;
+            }
+
+            if (!method_exists($repository, 'find')) continue;
+            if (!method_exists($repository, 'clone')) continue;
+            if (!method_exists($repository, 'where')) continue;
+            if (!method_exists($repository, 'select')) continue;
+            if (!method_exists($repository, 'deleteFromDb')) continue;
+
+            $hasCleanupMethod = false;
+
+            $service = $this->recordServiceContainer->get($scope);
+
+            if (method_exists($service, 'cleanup')) {
+                $hasCleanupMethod = true;
+            }
+
+            $whereClause = [
+                'deleted' => 1,
+            ];
+
+            if ($this->metadata->get(['entityDefs', $scope, 'fields', 'modifiedAt'])) {
+                $whereClause['modifiedAt<'] = $datetime->format('Y-m-d H:i:s');
+            }
+            else if ($this->metadata->get(['entityDefs', $scope, 'fields', 'createdAt'])) {
+                $whereClause['createdAt<'] = $datetime->format('Y-m-d H:i:s');
+            }
+
+            $query = $this->entityManager->getQueryBuilder()
+                ->select()
+                ->from($scope)
+                ->withDeleted()
+                ->build();
+
+            $deletedEntityList = $repository
+                ->clone($query)
+                ->select(['id', 'deleted'])
+                ->where($whereClause)
+                ->find();
+
+            foreach ($deletedEntityList as $entity) {
+                if ($hasCleanupMethod) {
+                    try {
+                        $service->cleanup($entity->id);
+                    }
+                    catch (Throwable $e) {
+                        $this->log->error("Cleanup job: Cleanup scope {$scope}: " . $e->getMessage());
+                    }
+                }
+
+                $this->cleanupDeletedEntity($entity);
+            }
+        }
+    }
+}

application/Espo/Classes/Jobs/Dummy.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
  * Website: https://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,12 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Jobs;
+namespace Espo\Classes\Jobs;
 
-class Dummy extends \Espo\Core\Jobs\Base
+use Espo\Core\Job\JobDataLess;
+
+class Dummy implements JobDataLess
 {
-    public function run()
-    {
-
-    }
-}
+    public function run(): void {}
+}

application/Espo/Classes/Jobs/ProcessWebhookQueue.php

@@ -0,0 +1,50 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 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\Jobs;
+
+use Espo\Core\{
+    Job\JobDataLess,
+    Webhook\Queue,
+};
+
+class ProcessWebhookQueue implements JobDataLess
+{
+    private $queue;
+
+    public function __construct(Queue $queue)
+    {
+        $this->queue = $queue;
+    }
+
+    public function run(): void
+    {
+        $this->queue->process();
+    }
+}