Merge branch 'hotfix/5.9.1' of github.com:espocrm/espocrm into hotfix/5.9.1

* Implementing feature "Skip rebuild".

* fixes

.gitignore

@@ -4,6 +4,7 @@
 /data/preferences/*
 /data/.backup/*
 /data/config.php
+/data/tmp/*
 /build
 /node_modules
 npm-debug.log
@@ -13,6 +14,7 @@ npm-debug.log
 /tests/unit/testData/cache/*
 !/tests/unit/testData/cache/.data
 /tests/integration/config.php
+.phpunit.result.cache
 composer.phar
 vendor/
 /custom/Espo/Custom/*

.htaccess

@@ -20,5 +20,5 @@ DirectoryIndex index.php index.html
 
   RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
 
-  RewriteRule reset/?$ reset.html [QSA,L]
+  RewriteRule /?web\.config - [F]
 </IfModule>

CONTRIBUTING.md

@@ -4,6 +4,12 @@ Before we can merge your pull request you need to accept our CLA [here](https://
 
 [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
 
 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-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -18,6 +18,16 @@
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
  ************************************************************************/
+
+ /**
+  * * `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 test running
+  * * `grant run-tests` - build and run unit and integratino tests
+  */
+
 module.exports = function (grunt) {
 
     var jsFilesToMinify = [
@@ -71,6 +81,7 @@ module.exports = function (grunt) {
         'client/src/theme-manager.js',
         'client/src/session-storage.js',
         'client/src/view-helper.js',
+        'client/src/page-title.js',
 
         'client/src/app.js'
     ];
@@ -83,6 +94,10 @@ module.exports = function (grunt) {
     }
 
     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) {
@@ -108,8 +123,10 @@ module.exports = function (grunt) {
         lessData[theme] = o;
     });
 
+    var pkg = grunt.file.readJSON('package.json');
+
     grunt.initConfig({
-        pkg: grunt.file.readJSON('package.json'),
+        pkg: pkg,
 
         mkdir: {
             tmp: {
@@ -125,8 +142,13 @@ module.exports = function (grunt) {
         clean: {
             start: ['build/EspoCRM-*'],
             final: ['build/tmp'],
+            release: ['build/EspoCRM-' + pkg.version],
             beforeFinal: {
-                src: ['build/tmp/custom/Espo/Custom/*', '!build/tmp/custom/Espo/Custom/.htaccess', 'build/tmp/install/config.php']
+                src: [
+                    'build/tmp/custom/Espo/Custom/*',
+                    '!build/tmp/custom/Espo/Custom/.htaccess',
+                    'build/tmp/install/config.php',
+                ]
             }
         },
         less: lessData,
@@ -146,6 +168,9 @@ module.exports = function (grunt) {
             })
         },
         copy: {
+            options: {
+                mode: true,
+            },
             frontendFolders: {
                 expand: true,
                 cwd: 'client',
@@ -207,9 +232,6 @@ module.exports = function (grunt) {
             },
         },
         chmod: {
-            options: {
-                mode: '755'
-            },
             php: {
                 options: {
                     mode: '644'
@@ -238,7 +260,21 @@ module.exports = function (grunt) {
                     'build/EspoCRM-<%= pkg.version %>/api/v1/portal-access',
                     'build/EspoCRM-<%= pkg.version %>',
                 ]
-            }
+            },
+            foldersWritable: {
+                options: {
+                    mode: '775'
+                },
+                src: [
+                    'build/EspoCRM-<%= pkg.version %>/data',
+                    'build/EspoCRM-<%= pkg.version %>/custom',
+                    'build/EspoCRM-<%= pkg.version %>/custom/Espo',
+                    'build/EspoCRM-<%= pkg.version %>/custom/Espo/Custom',
+                    'build/EspoCRM-<%= pkg.version %>/client/custom',
+                    'build/EspoCRM-<%= pkg.version %>/client/modules',
+                    'build/EspoCRM-<%= pkg.version %>/application/Espo/Modules',
+                ]
+            },
         },
         replace: {
             version: {
@@ -258,17 +294,57 @@ module.exports = function (grunt) {
                 ]
             }
         },
-        compress: {
-            final: {
-                options: {
-                    archive: 'build/EspoCRM-<%= pkg.version %>.zip',
-                    mode: 'zip'
-                },
-                src: ['**'],
-                cwd: 'build/EspoCRM-<%= pkg.version %>',
-                dest: 'EspoCRM-<%= pkg.version %>'
-            }
-        }
+    });
+
+    grunt.registerTask("chmod-folders", function() {
+        cp.execSync("find . -type d -exec chmod 755 {} + ", {stdio: 'ignore', cwd: 'build/EspoCRM-' + pkg.version});
+    });
+
+    grunt.registerTask("composer", function() {
+        cp.execSync("composer install --ignore-platform-reqs --no-dev", {stdio: 'ignore'});
+    });
+
+    grunt.registerTask("composer-dev", function() {
+        cp.execSync("composer install --ignore-platform-reqs", {stdio: 'ignore'});
+    });
+
+    grunt.registerTask("upgrade", function() {
+        cp.execSync("node diff --all --vendor", {stdio: 'inherit'});
+    });
+
+    grunt.registerTask("unit-tests-run", function() {
+        cp.execSync("vendor/bin/phpunit --bootstrap=vendor/autoload.php tests/unit", {stdio: 'inherit'});
+    });
+
+    grunt.registerTask("integration-tests-run", function() {
+        cp.execSync("vendor/bin/phpunit --bootstrap=vendor/autoload.php tests/integration", {stdio: 'inherit'});
+    });
+
+    grunt.registerTask("zip", function() {
+        var fs = require('fs');
+
+        var resolve = this.async();
+
+        var folder = 'EspoCRM-' + pkg.version;
+
+        var zipPath = 'build/' + folder +'.zip';
+        if (fs.existsSync(zipPath)) fs.unlinkSync(zipPath);
+
+        var archiver = require('archiver');
+        var archive = archiver('zip');
+
+        archive.on('error', function (err) {
+            grunt.fail.warn(err);
+        });
+        var zipOutput = fs.createWriteStream(zipPath);
+        zipOutput.on('close', function () {
+            console.log("EspoCRM package has been built.");
+            resolve();
+        });
+
+        archive.directory(currentPath + '/build/' + folder, folder).pipe(zipOutput);
+
+        archive.finalize();
     });
 
     grunt.loadNpmTasks('grunt-contrib-clean');
@@ -278,10 +354,9 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-replace');
-    grunt.loadNpmTasks('grunt-contrib-compress');
     grunt.loadNpmTasks('grunt-chmod');
 
-    grunt.registerTask('default', [
+    grunt.registerTask('offline', [
         'clean:start',
         'mkdir:tmp',
         'less',
@@ -293,7 +368,48 @@ module.exports = function (grunt) {
         'replace',
         'clean:beforeFinal',
         'copy:final',
-        'chmod',
-        'clean:final'
+        'chmod-folders',
+        'chmod:php',
+        'chmod:folders',
+        'chmod:foldersWritable',
+        'clean:final',
+    ]);
+
+    grunt.registerTask('default', [
+        'composer',
+        'offline',
+    ]);
+
+    grunt.registerTask('release', [
+        'default',
+        'upgrade',
+        'zip',
+        'clean:release',
+    ]);
+
+    grunt.registerTask('run-tests', [
+        'test',
+        'unit-tests-run',
+        'integration-tests-run',
+    ]);
+
+    grunt.registerTask('run-unit-tests', [
+        'composer-dev',
+        'unit-tests-run',
+    ]);
+
+    grunt.registerTask('run-integration-tests', [
+        'test',
+        'integration-tests-run',
+    ]);
+
+    grunt.registerTask('dev', [
+        'composer-dev',
+        'less',
+    ]);
+
+    grunt.registerTask('test', [
+        'composer-dev',
+        'offline',
     ]);
 };

README.md

@@ -1,21 +1,21 @@
 ## EspoCRM
 
-<a href='http://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](http://www.espocrm.com).
+[Download](https://www.espocrm.com/download/) the latest release from our website.
 
 ### Requirements
 
-* PHP 7.1 or above (with pdo, json, gd, openssl, zip, imap, mbstring, curl extensions);
-* MySQL 5.6.0 or above, or MariaDB.
+* PHP 7.2 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,30 +23,13 @@ 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.
 
-### How to get 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.
-
-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.
+* [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)
 
 ### How to contribute
 
@@ -54,24 +37,9 @@ Before we can merge your pull request you need to accept our CLA [here](https://
 
 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.
-
-### 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.
+* *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.
 
 ### License
 

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.

api/v1/.htaccess

@@ -9,4 +9,6 @@ RewriteEngine On
 RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
 
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^ index.php [QSA,L]
+RewriteRule ^ index.php [QSA,L]
+
+RewriteRule /?web\.config - [F]

api/v1/index.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

api/v1/portal-access/.htaccess

@@ -9,4 +9,6 @@ RewriteEngine On
 RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
 
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^ index.php [QSA,L]
+RewriteRule ^ index.php [QSA,L]
+
+RewriteRule /?web\.config - [F]

api/v1/portal-access/index.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Acl/ActionHistoryRecord.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Acl/Attachment.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Acl/Email.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Acl/EmailAddress.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Acl/EmailFilter.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Acl/Import.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Acl/Note.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Acl/Notification.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Acl/PhoneNumber.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Acl/ScheduledJob.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Acl/Team.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Acl/User.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -39,6 +39,16 @@ class User extends \Espo\Core\Acl\Base
         return $user->id === $entity->id;
     }
 
+    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
+    {
+        if (!$user->isAdmin() && $entity->isPortal()) {
+            if ($this->getAclManager()->get($user, 'portalPermission') === 'yes') {
+                return true;
+            }
+        }
+        return $this->checkEntity($user, $entity, $data, 'read');
+    }
+
     public function checkEntityCreate(EntityUser $user, Entity $entity, $data)
     {
         if (!$user->isAdmin()) {

application/Espo/Acl/Webhook.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/AclPortal/Attachment.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/AclPortal/Email.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/AclPortal/EmailAddress.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/AclPortal/Note.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/AclPortal/Notification.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/AclPortal/PhoneNumber.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/AclPortal/User.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/ActionHistoryRecord.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -63,11 +63,6 @@ class ActionHistoryRecord extends \Espo\Core\Controllers\Record
         throw new Forbidden();
     }
 
-    public function beforeMassDelete()
-    {
-        throw new Forbidden();
-    }
-
     public function beforeMassConvertCurrency()
     {
         throw new Forbidden();

application/Espo/Controllers/Admin.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/App.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Attachment.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -57,4 +57,21 @@ class Attachment extends \Espo\Core\Controllers\Record
 
         return $this->getRecordService()->getCopiedAttachment($data)->getValueMap();
     }
+
+    public function getActionFile($params, $data, $request, $response)
+    {
+        $id = $params['id'] ?? null;
+
+        if (!$id) throw new BadRequest();
+
+        $fileData = $this->getRecordService()->getFileData($id);
+
+        $response->headers->set('Content-Type', $fileData->type);
+        $response->headers->set('Content-Disposition', 'Content-Disposition: attachment; filename="'.$fileData->name.'"');
+        if ($fileData->size) {
+            $response->headers->set('Content-Length', $fileData->size);
+        }
+
+        return $fileData->contents;
+    }
 }

application/Espo/Controllers/AuthLogRecord.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/AuthToken.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/CurrencyRate.php

@@ -0,0 +1,59 @@
+<?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\Controllers;
+
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\BadRequest;
+
+class CurrencyRate extends \Espo\Core\Controllers\Base
+{
+    protected function checkControllerAccess()
+    {
+        if (!$this->getAcl()->check('Currency')) {
+            throw new Forbidden();
+        }
+    }
+
+    public function getActionIndex()
+    {
+        if ($this->getAcl()->getLevel('Currency', 'read') !== 'yes') throw new Forbidden();
+
+        return $this->getService('CurrencyRate')->get();
+    }
+
+    public function putActionUpdate($params, $data)
+    {
+        if ($this->getAcl()->getLevel('Currency', 'edit') !== 'yes') throw new Forbidden();
+
+        if (empty($data) || !is_object($data)) throw new BadRequest();
+
+        return $this->getService('CurrencyRate')->set($data);
+    }
+}

application/Espo/Controllers/DashboardTemplate.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/DataPrivacy.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Email.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -75,7 +75,7 @@ class Email extends \Espo\Core\Controllers\Record
                         throw new NotFound();
                     }
                     if (!$this->getUser()->isAdmin()) {
-                        if ($emailAccount->get('assigniedUserId') !== $this->getUser()->id) {
+                        if ($emailAccount->get('assignedUserId') !== $this->getUser()->id) {
                             throw new Forbidden();
                         }
                     }

application/Espo/Controllers/EmailAccount.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/EmailAddress.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/EmailFilter.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/EmailFolder.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/EmailTemplate.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/EmailTemplateCategory.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/EntityManager.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -60,7 +60,7 @@ class EntityManager extends \Espo\Core\Controllers\Base
         $name = filter_var($name, \FILTER_SANITIZE_STRING);
         $type = filter_var($type, \FILTER_SANITIZE_STRING);
 
-        $params = array();
+        $params = [];
 
         if (!empty($data['labelSingular'])) {
             $params['labelSingular'] = $data['labelSingular'];
@@ -187,19 +187,19 @@ class EntityManager extends \Espo\Core\Controllers\Base
 
         $paramList = [
         	'entity',
-        	'entityForeign',
         	'link',
         	'linkForeign',
         	'label',
-        	'labelForeign',
-        	'linkType'
+        	'linkType',
         ];
 
         $additionalParamList = [
+            'entityForeign',
             'relationName',
+            'labelForeign',
         ];
 
-        $params = array();
+        $params = [];
 
         foreach ($paramList as $item) {
         	if (empty($data[$item])) {
@@ -209,9 +209,11 @@ class EntityManager extends \Espo\Core\Controllers\Base
         }
 
         foreach ($additionalParamList as $item) {
-            $params[$item] = filter_var($data[$item], \FILTER_SANITIZE_STRING);
+            $params[$item] = filter_var($data[$item] ?? null, \FILTER_SANITIZE_STRING);
         }
 
+        $params['labelForeign'] = $params['labelForeign'] ?? $params['linkForeign'];
+
         if (array_key_exists('linkMultipleField', $data)) {
             $params['linkMultipleField'] = $data['linkMultipleField'];
         }
@@ -225,6 +227,12 @@ class EntityManager extends \Espo\Core\Controllers\Base
         if (array_key_exists('auditedForeign', $data)) {
             $params['auditedForeign'] = $data['auditedForeign'];
         }
+        if (array_key_exists('parentEntityTypeList', $data)) {
+            $params['parentEntityTypeList'] = $data['parentEntityTypeList'];
+        }
+        if (array_key_exists('foreignLinkEntityTypeList', $data)) {
+            $params['foreignLinkEntityTypeList'] = $data['foreignLinkEntityTypeList'];
+        }
 
         $result = $this->getContainer()->get('entityManagerUtil')->createLink($params);
 
@@ -251,12 +259,12 @@ class EntityManager extends \Espo\Core\Controllers\Base
         	'link',
         	'linkForeign',
         	'label',
-        	'labelForeign'
+        	'labelForeign',
         ];
 
         $additionalParamList = [];
 
-        $params = array();
+        $params = [];
         foreach ($paramList as $item) {
             if (array_key_exists($item, $data)) {
                 $params[$item] = filter_var($data[$item], \FILTER_SANITIZE_STRING);
@@ -280,6 +288,12 @@ class EntityManager extends \Espo\Core\Controllers\Base
         if (array_key_exists('auditedForeign', $data)) {
             $params['auditedForeign'] = $data['auditedForeign'];
         }
+        if (array_key_exists('parentEntityTypeList', $data)) {
+            $params['parentEntityTypeList'] = $data['parentEntityTypeList'];
+        }
+        if (array_key_exists('foreignLinkEntityTypeList', $data)) {
+            $params['foreignLinkEntityTypeList'] = $data['foreignLinkEntityTypeList'];
+        }
 
         $result = $this->getContainer()->get('entityManagerUtil')->updateLink($params);
 

application/Espo/Controllers/Extension.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/ExternalAccount.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -75,7 +75,7 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
         $id = $request->get('id');
         list($integration, $userId) = explode('__', $id);
 
-        if ($this->getUser()->id != $userId) {
+        if ($this->getUser()->id != $userId && !$this->getUser()->isAdmin()) {
             throw new Forbidden();
         }
 
@@ -93,12 +93,7 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
     {
         list($integration, $userId) = explode('__', $params['id']);
 
-        if ($this->getUser()->id != $userId) {
-            throw new Forbidden();
-        }
-
-        $entity = $this->getEntityManager()->getEntity('ExternalAccount', $params['id']);
-        return $entity->toArray();
+        return $this->getRecordService()->read($params['id'])->getValueMap();
     }
 
     public function actionUpdate($params, $data, $request)
@@ -114,7 +109,7 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
 
         list($integration, $userId) = explode('__', $params['id']);
 
-        if ($this->getUser()->id != $userId) {
+        if ($this->getUser()->id != $userId && !$this->getUser()->isAdmin()) {
             throw new Forbidden();
         }
 
@@ -140,7 +135,7 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
 
         list($integration, $userId) = explode('__', $id);
 
-        if ($this->getUser()->id != $userId) {
+        if ($this->getUser()->id != $userId && !$this->getUser()->isAdmin()) {
             throw new Forbidden();
         }
 

application/Espo/Controllers/FieldManager.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/GlobalSearch.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/I18n.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Import.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/InboundEmail.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Integration.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Job.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/LabelManager.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/LastViewed.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Layout.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -30,62 +30,49 @@
 namespace Espo\Controllers;
 
 use Espo\Core\Utils as Utils;
-use \Espo\Core\Exceptions\NotFound;
-use \Espo\Core\Exceptions\Error;
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\NotFound;
+use Espo\Core\Exceptions\Error;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\BadRequest;
 
 class Layout extends \Espo\Core\Controllers\Base
 {
-    public function actionRead($params, $data)
+    public function getActionRead($params, $data)
     {
-        return $this->getServiceFactory()->create('Layout')->getForFrontend($params['scope'], $params['name']);
+        $scope = $params['scope'] ?? null;
+        $name = $params['name'] ?? null;
+
+        return $this->getServiceFactory()->create('Layout')->getForFrontend($scope, $name);
     }
 
-    public function actionUpdate($params, $data, $request)
+    public function putActionUpdate($params, $data, $request)
     {
-        if (is_object($data)) {
-            $data = get_object_vars($data);
-        }
+        if (is_object($data)) $data = get_object_vars($data);
 
-        if (!$this->getUser()->isAdmin()) {
-            throw new Forbidden();
-        }
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
 
-        if (!$request->isPut() && !$request->isPatch()) {
-            throw new BadRequest();
-        }
+        $scope = $params['scope'] ?? null;
+        $name = $params['name'] ?? null;
+        $setId = $params['setId'] ?? null;
 
-        $layoutManager = $this->getContainer()->get('layout');
-        $layoutManager->set($data, $params['scope'], $params['name']);
-        $result = $layoutManager->save();
-
-        if ($result === false) {
-            throw new Error("Error while saving layout.");
-        }
-
-        $this->getContainer()->get('dataManager')->updateCacheTimestamp();
-
-        return $layoutManager->get($params['scope'], $params['name']);
-    }
-
-    public function actionPatch($params, $data, $request)
-    {
-        return $this->actionUpdate($params, $data, $request);
+        return $this->getServiceFactory()->create('Layout')->update($scope, $name, $setId, $data);
     }
 
     public function postActionResetToDefault($params, $data, $request)
     {
-        if (!$this->getUser()->isAdmin()) {
-            throw new Forbidden();
-        }
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
 
-        if (empty($data->scope) || empty($data->name)) {
-            throw new BadRequest();
-        }
+        if (empty($data->scope) || empty($data->name)) throw new BadRequest();
 
-        $this->getContainer()->get('dataManager')->updateCacheTimestamp();
+        return $this->getServiceFactory()->create('Layout')->resetToDefault($data->scope, $data->name, $data->setId ?? null);
+    }
 
-        return $this->getContainer()->get('layout')->resetToDefault($data->scope, $data->name);
+    public function getActionGetOriginal($params, $data, $request)
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+
+        return $this->getServiceFactory()->create('Layout')->getOriginal(
+            $request->get('scope'), $request->get('name'), $request->get('setId')
+        );
     }
 }

application/Espo/Controllers/LayoutSet.php

@@ -0,0 +1,42 @@
+<?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\Controllers;
+
+use Espo\Core\Exceptions\Forbidden;
+
+class LayoutSet extends \Espo\Core\Controllers\Record
+{
+    protected function checkControllerAccess()
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+    }
+}

application/Espo/Controllers/LeadCapture.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/LeadCaptureLogRecord.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Metadata.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Note.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Notification.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Pdf.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/PhoneNumber.php

@@ -0,0 +1,37 @@
+<?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\Controllers;
+
+use \Espo\Core\Exceptions\Forbidden;
+
+class PhoneNumber extends \Espo\Core\Controllers\Record
+{
+
+}

application/Espo/Controllers/Portal.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/PortalRole.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Preferences.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Role.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/ScheduledJob.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/ScheduledJobLogRecord.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Settings.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Stream.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Team.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Template.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/TemplateManager.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/User.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/UserSecurity.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Controllers/Webhook.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Core/Acl.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Core/Acl/Base.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Core/Acl/GlobalRestricton.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Core/Acl/Table.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -182,12 +182,13 @@ class Table
         return 'no';
     }
 
-    public function getHighestLevel($action)
+    public function getHighestLevel($scope, $action)
     {
         if (in_array($action, $this->booleanActionList)) {
             return 'yes';
         } else {
-            return 'all';
+            $level = $this->metadata->get(['scopes', $scope, $this->type . 'HighestLevel']);
+            return $level ?? 'all';
         }
     }
 

application/Espo/Core/AclManager.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -134,7 +134,7 @@ class AclManager
     public function getLevel(User $user, $scope, $action)
     {
         if ($user->isAdmin()) {
-            return $this->getTable($user)->getHighestLevel($action);
+            return $this->getTable($user)->getHighestLevel($scope, $action);
         }
         return $this->getTable($user)->getLevel($scope, $action);
     }

application/Espo/Core/AclPortal/Base.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Core/AclPortal/Table.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Core/AppParams/TemplateEntityTypeList.php

@@ -0,0 +1,65 @@
+<?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\Core\AppParams;
+
+class TemplateEntityTypeList extends \Espo\Core\Injectable
+{
+    protected function init()
+    {
+        $this->addDependency('acl');
+        $this->addDependency('selectManagerFactory');
+        $this->addDependency('entityManager');
+    }
+
+    public function get()
+    {
+        if (!$this->getInjection('acl')->checkScope('Template')) {
+            return [];
+        }
+
+        $list = [];
+
+        $selectManager = $this->getInjection('selectManagerFactory')->create('Template');
+
+        $selectParams = $selectManager->getEmptySelectParams();
+        $selectManager->applyAccess($selectParams);
+
+        $templateList = $this->getInjection('entityManager')->getRepository('Template')
+            ->select(['entityType'])
+            ->groupBy(['entityType'])
+            ->find($selectParams);
+
+        foreach ($templateList as $template) {
+            $list[] = $template->get('entityType');
+        }
+
+        return $list;
+    }
+}

application/Espo/Core/Application.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -48,6 +48,7 @@ class Application
         $GLOBALS['log'] = $this->getContainer()->get('log');
 
         $this->initAutoloads();
+        $this->initPreloads();
     }
 
     protected function initContainer()
@@ -259,6 +260,9 @@ class Application
             $route = $slim->router()->getCurrentRoute();
             $conditions = $route->getConditions();
 
+            $response = $slim->response();
+            $response->headers->set('Content-Type', 'application/json');
+
             if (isset($conditions['useController']) && $conditions['useController'] == false) {
                 return;
             }
@@ -303,13 +307,16 @@ class Application
         });
 
         $this->getSlim()->hook('slim.after.router', function () use (&$slim) {
-            $slim->contentType('application/json');
+            $response = $slim->response();
 
-            $res = $slim->response();
-            $res->header('Expires', '0');
-            $res->header('Last-Modified', gmdate("D, d M Y H:i:s") . " GMT");
-            $res->header('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
-            $res->header('Pragma', 'no-cache');
+            if (!$response->headers->has('Content-Type')) {
+                $response->headers->set('Content-Type', 'application/json');
+            }
+
+            $response->headers->set('Expires', '0');
+            $response->headers->set('Last-Modified', gmdate("D, d M Y H:i:s") . " GMT");
+            $response->headers->set('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
+            $response->headers->set('Pragma', 'no-cache');
         });
     }
 
@@ -346,6 +353,15 @@ class Application
         $autoload->register();
     }
 
+    protected function initPreloads()
+    {
+        foreach ($this->getMetadata()->get(['app', 'containerServices']) ?? [] as $name => $defs) {
+            if ($defs['preload'] ?? false) {
+                $this->getContainer()->get($name);
+            }
+        }
+    }
+
     public function setBasePath($basePath)
     {
         $this->getContainer()->get('clientManager')->setBasePath($basePath);

application/Espo/Core/Cleanup/Base.php

@@ -0,0 +1,63 @@
+<?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\Core\Cleanup;
+
+abstract class Base extends \Espo\Core\Injectable
+{
+    protected function init()
+    {
+        $this->addDependency('config');
+        $this->addDependency('metadata');
+        $this->addDependency('entityManager');
+        $this->addDependency('fileManager');
+    }
+
+    protected function getConfig()
+    {
+        return $this->getInjection('config');
+    }
+
+    protected function getMetadata()
+    {
+        return $this->getInjection('metadata');
+    }
+
+    protected function getEntityManager()
+    {
+        return $this->getInjection('entityManager');
+    }
+
+    protected function getFileManager()
+    {
+        return $this->getInjection('fileManager');
+    }
+
+    abstract public function process();
+}

application/Espo/Core/Cleanup/Reminders.php

@@ -0,0 +1,50 @@
+<?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\Core\Cleanup;
+
+class Reminders extends Base
+{
+    protected $cleanupRemindersPeriod = '15 days';
+
+    public function process()
+    {
+        $period = '-' . $this->getConfig()->get('cleanupRemindersPeriod', $this->cleanupRemindersPeriod);
+
+        $datetime = new \DateTime();
+        $datetime->modify($period);
+
+        $pdo = $this->getEntityManager()->getPDO();
+
+        $query = "DELETE FROM `reminder` WHERE DATE(remind_at) < " . $pdo->quote($datetime->format('Y-m-d'));
+
+        $sth = $pdo->prepare($query);
+        $sth->execute();
+    }
+}

application/Espo/Core/Cleanup/WebhookQueue.php

@@ -0,0 +1,59 @@
+<?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\Core\Cleanup;
+
+class WebhookQueue extends Base
+{
+    protected $cleanupWebhookQueuePeriod = '10 days';
+
+    public function process()
+    {
+        $pdo = $this->getEntityManager()->getPDO();
+
+        $period = '-' . $this->getConfig()->get('cleanupWebhookQueuePeriod', $this->cleanupWebhookQueuePeriod);
+        $datetime = new \DateTime();
+        $datetime->modify($period);
+        $from = $datetime->format('Y-m-d H:i:s');
+
+        $query = "
+            DELETE FROM `webhook_queue_item`
+            WHERE
+                DATE(created_at) < ".$pdo->quote($from)." AND
+                (status <> 'Pending' OR deleted = 1)
+        ";
+        $pdo->query($query);
+
+        $query = "
+            DELETE FROM `webhook_event_queue_item`
+            WHERE DATE(created_at) < ".$pdo->quote($from)." AND (is_processed = 1 OR deleted = 1)
+        ";
+        $pdo->query($query);
+    }
+}

application/Espo/Core/Console/CommandManager.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Core/Console/Commands/AclCheck.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Core/Console/Commands/AuthTokenCheck.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Core/Console/Commands/Base.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Core/Console/Commands/ClearCache.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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

application/Espo/Core/Console/Commands/Extension.php

@@ -0,0 +1,195 @@
+<?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\Core\Console\Commands;
+
+use Espo\Core\Exceptions\Error;
+
+class Extension extends Base
+{
+    protected $extensionManager = null;
+
+    public function run($options, $flagList, $argumentList)
+    {
+        if (in_array('u', $flagList)) {
+            // uninstall
+
+            $name = $options['name'] ?? null;
+            $id = $options['id'] ?? null;
+            if (!$name && !$id) {
+                $this->out("Can't uninstall. Specify --name=\"Extension Name\".\n");
+                return;
+            }
+            $params = [];
+            if ($id) {
+                $params['id'] = $id;
+            } else {
+                $params['name'] = $name;
+            }
+            $params['delete'] = !in_array('k', $flagList);
+
+            $this->runUninstall($params);
+            return;
+        } else {
+            // install
+
+            $file = $options['file'] ?? null;
+            if (!$file) {
+                $this->out("Can't install. Specify --file=\"path/to/package.zip\".\n");
+                return;
+            }
+
+            $this->runInstall($file);
+            return;
+        }
+    }
+
+    protected function runInstall(string $file)
+    {
+        $manager = $this->createExtensionManager();
+
+        if (!file_exists($file)) {
+            $this->out("File does not exist.\n");
+            return;
+        }
+
+        $fileData = file_get_contents($file);
+        $fileData = 'data:application/zip;base64,' . base64_encode($fileData);
+
+        try {
+            $id = $manager->upload($fileData);
+        } catch (\Throwable $e) {
+            $this->out($e->getMessage() . "\n");
+            return;
+        }
+
+        $manifest = $manager->getManifestById($id);
+
+        $name = $manifest['name'] ?? null;
+        $version = $manifest['version'] ?? null;
+
+        if (!$name) {
+            $this->out("Can't install. Bad manifest.\n");
+            return;
+        }
+
+        $this->out("Installing... Do not close the terminal. This may take a while...");
+
+        try {
+            $manager->install(['id' => $id]);
+        } catch (\Throwable $e) {
+            $this->out("\n");
+            $this->out($e->getMessage() . "\n");
+            return;
+        }
+
+        $this->out("\n");
+        $this->out("Extension '{$name}' version {$version} is installed.\nExtension ID: '{$id}'.\n");
+    }
+
+    protected function runUninstall(array $params)
+    {
+        $id = $params['id'] ?? null;
+
+        if ($id) {
+            $record = $this->getEntityManager()->getRepository('Extension')->where([
+                'id' => $id,
+                'isInstalled' => true,
+            ])->findOne();
+
+            if (!$record) {
+                $this->out("Extension with ID '{$id}' is not installed.\n");
+                return;
+            }
+
+            $name = $record->get('name');
+        } else {
+            $name = $params['name'] ?? null;
+            if (!$name) {
+                $this->out("Can't uninstall. No --name or --id specified.\n");
+                return;
+            }
+
+            $record = $this->getEntityManager()->getRepository('Extension')->where([
+                'name' => $name,
+                'isInstalled' => true,
+            ])->findOne();
+
+            if (!$record) {
+                $this->out("Extension '{$name}' is not installed.\n");
+                return;
+            }
+
+            $id = $record->id;
+        }
+
+        $manager = $this->createExtensionManager();
+
+        $this->out("Uninstalling... Do not close the terminal. This may take a while...");
+
+        try {
+            $manager->uninstall(['id' => $id]);
+        } catch (\Throwable $e) {
+            $this->out("\n");
+            $this->out($e->getMessage() . "\n");
+            return;
+        }
+
+        $this->out("\n");
+
+        if ($params['delete'] ?? false) {
+            try {
+                $manager->delete(['id' => $id]);
+            } catch (\Throwable $e) {
+                $this->out($e->getMessage() . "\n");
+                $this->out("Extension '{$name}' is uninstalled but could not be deleted.\n");
+                return;
+            }
+
+            $this->out("Extension '{$name}' is uninstalled and deleted.\n");
+        } else {
+            $this->out("Extension '{$name}' is uninstalled.\n");
+        }
+    }
+
+    protected function createExtensionManager()
+    {
+        return new \Espo\Core\ExtensionManager($this->getContainer());
+    }
+
+    protected function getEntityManager()
+    {
+        return $this->getContainer()->get('entityManager');
+    }
+
+    protected function out(string $string)
+    {
+        fwrite(\STDOUT, $string);
+    }
+}

application/Espo/Core/Console/Commands/Rebuild.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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