email index skip mysql 5.7

Save database type and version while rebuild
fix metadata and language acl
2026-03-06 17:07:01 +00:00 · 2019-11-12 11:08:46 +02:00 · 2019-11-12 10:56:12 +02:00 · 2019-11-11 10:22:22 +02:00 · 2019-11-06 15:29:00 +02:00 · 2019-11-04 14:04:10 +02:00
4398 changed files with 168469 additions and 49108 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -6,21 +6,14 @@
 /data/config.php
 /build
 /node_modules
+npm-debug.log
 /test.php
 /main.html
-/client/css/espo.css
-/client/css/espo-vertical.css
-/client/css/sakura.css
-/client/css/sakura-vertical.css
-/client/css/violet.css
-/client/css/violet-vertical.css
-/client/css/espo-rtl.css
-/client/css/hazyblue.css
-/client/css/hazyblue-vertical.css

 /tests/unit/testData/cache/*
 !/tests/unit/testData/cache/.data
 /tests/integration/config.php
 composer.phar
 vendor/
-/custom/Espo/Custom/*
+/custom/Espo/Custom/*
+/install/config.php
--- a/.htaccess
+++ b/.htaccess
@@ -9,16 +9,13 @@ DirectoryIndex index.php index.html

  # PROTECTED DIRECTORIES
  RewriteCond %{REQUEST_FILENAME} -d
-  RewriteRule ^/?(data|api)/ - [F]
+  RewriteRule ^/?(api|client)/ - [F]

-  RewriteRule ^/?data/config\.php$ - [F]
-  RewriteRule ^/?data/logs/ - [F]
-  RewriteRule ^/?data/cache/ - [F]
-  RewriteRule ^/?data/upload/ - [F]
-  RewriteRule ^/?data/\.backup/ - [F]
+  RewriteRule ^/?data/ - [F]
  RewriteRule ^/?application/ - [F]
  RewriteRule ^/?custom/ - [F]
  RewriteRule ^/?vendor/ - [F]
+  RewriteRule ^/?client/?$ - [F]
  #END PROTECTED DIRECTORIES

  RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,4 +6,4 @@ Before we can merge your pull request you need to accept our CLA [here](https://

 ## Issues

-We don't provide developer help or any kind of support on github. Please use our [forum](http://forum.espocrm.com/) for this.
+We don't provide developer help or any kind of support on github. Please use our [forum](https://forum.espocrm.com) for this.
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,8 +2,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -28,19 +28,86 @@ module.exports = function (grunt) {
        '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-with-data.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',
+
        'client/src/namespace.js',
        'client/src/exceptions.js',
        'client/src/loader.js',
-        'client/src/utils.js'
+        'client/src/utils.js',
+
+        'client/src/acl.js',
+        'client/src/model.js',
+        'client/src/model-offline.js',
+        'client/src/ajax.js',
+        'client/src/controller.js',
+
+        '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/app.js'
    ];

+    function camelCaseToHyphen (string){
+        if (string == null) {
+            return string;
+        }
+        return string.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+    }
+
+    var fs = require('fs');
+
+    var themeList = [];
+    fs.readdirSync('application/Espo/Resources/metadata/themes').forEach(function (file) {
+        themeList.push(file.substr(0, file.length - 5));
+    });
+
+    var cssminFilesData = {};
+    var lessData = {};
+    themeList.forEach(function (theme) {
+        var name = camelCaseToHyphen(theme);
+        var 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 = {
+            options: {
+                yuicompress: true,
+            },
+            files: files
+        };
+        lessData[theme] = o;
+    });
+
    grunt.initConfig({
        pkg: grunt.file.readJSON('package.json'),

@@ -56,95 +123,22 @@ module.exports = function (grunt) {
            }
        },
        clean: {
-            start: ['build/*'],
+            start: ['build/EspoCRM-*'],
            final: ['build/tmp'],
-        },
-        less: {
-            espo: {
-                options: {
-                    yuicompress: true,
-                },
-                files: {
-                    'client/css/espo.css': 'frontend/less/espo/main.less',
-                }
-            },
-            espoVertical: {
-                options: {
-                    yuicompress: true,
-                },
-                files: {
-                    'client/css/espo-vertical.css': 'frontend/less/espo-vertical/main.less',
-                }
-            },
-            espoRtl: {
-                options: {
-                    yuicompress: true
-                },
-                files: {
-                    'client/css/espo-rtl.css': 'frontend/less/espo-rtl/main.less'
-                }
-            },
-            hazyblueVertical: {
-                options: {
-                    yuicompress: true,
-                },
-                files: {
-                    'client/css/hazyblue-vertical.css': 'frontend/less/hazyblue-vertical/main.less',
-                }
-            },
-            hazyblue: {
-                options: {
-                    yuicompress: true,
-                },
-                files: {
-                    'client/css/hazyblue.css': 'frontend/less/hazyblue/main.less',
-                }
-            },
-            sakura: {
-                options: {
-                    yuicompress: true,
-                },
-                files: {
-                    'client/css/sakura.css': 'frontend/less/sakura/main.less',
-                }
-            },
-            sakuraVertical: {
-                options: {
-                    yuicompress: true,
-                },
-                files: {
-                    'client/css/sakura-vertical.css': 'frontend/less/sakura-vertical/main.less',
-                }
-            },
-            violet: {
-                options: {
-                    yuicompress: true,
-                },
-                files: {
-                    'client/css/violet.css': 'frontend/less/violet/main.less',
-                }
-            },
-            violetVertical: {
-                options: {
-                    yuicompress: true,
-                },
-                files: {
-                    'client/css/violet-vertical.css': 'frontend/less/violet-vertical/main.less',
-                }
+            beforeFinal: {
+                src: ['build/tmp/custom/Espo/Custom/*', '!build/tmp/custom/Espo/Custom/.htaccess', 'build/tmp/install/config.php']
            }
        },
+        less: lessData,
        cssmin: {
-            minify: {
-                files: {
-                    'build/tmp/client/css/espo.css': [
-                        'client/css/espo.css',
-                    ]
-                }
-            },
+            themes: {
+                files: cssminFilesData
+            }
        },
        uglify: {
            options: {
                mangle: false,
+                sourceMap: true,
                banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
            },
            'build/tmp/client/espo.min.js': jsFilesToMinify.map(function (item) {
@@ -168,10 +162,6 @@ module.exports = function (grunt) {
                ],
                dest: 'build/tmp/client',
            },
-            frontendHtml: {
-                src: 'frontend/reset.html',
-                dest: 'build/tmp/reset.html'
-            },
            frontendLib: {
                expand: true,
                dot: true,
@@ -193,10 +183,14 @@ module.exports = function (grunt) {
                    'html/**',
                    'bootstrap.php',
                    'cron.php',
+                    'daemon.php',
                    'rebuild.php',
                    'clear_cache.php',
                    'upgrade.php',
                    'extension.php',
+                    'websocket.php',
+                    'command.php',
+                    'oauth-callback.php',
                    'index.php',
                    'LICENSE.txt',
                    '.htaccess',
@@ -247,26 +241,6 @@ module.exports = function (grunt) {
            }
        },
        replace: {
-            timestamp: {
-                options: {
-                    patterns: [
-                        {
-                            match: 'timestamp',
-                            replacement: '<%= new Date().getTime() %>'
-                        }
-                    ]
-                },
-                files: [
-                    {
-                        src: 'build/tmp/html/main.html',
-                        dest: 'build/tmp/html/main.html'
-                    },
-                    {
-                        src: 'build/tmp/html/portal.html',
-                        dest: 'build/tmp/html/portal.html'
-                    }
-                ]
-            },
            version: {
                options: {
                    patterns: [
@@ -314,13 +288,12 @@ module.exports = function (grunt) {
        'cssmin',
        'uglify',
        'copy:frontendFolders',
-        'copy:frontendHtml',
        'copy:frontendLib',
        'copy:backend',
        'replace',
+        'clean:beforeFinal',
        'copy:final',
        'chmod',
-        'clean:final',
+        'clean:final'
    ]);
-
 };
--- a/README.md
+++ b/README.md
@@ -8,15 +8,23 @@ Download the latest release from our [website](http://www.espocrm.com).

 ### Requirements

-* PHP 5.5 or above (with pdo, json, gd, mcrypt extensions);
-* MySQL 5.1 or above.
+* PHP 7.1 or above (with pdo, json, gd, openssl, zip, imap, mbstring, curl extensions);
+* MySQL 5.6.0 or above, or MariaDB.

-For more information about server configuration see [this article](http://blog.espocrm.com/administration/server-configuration-for-espocrm/).
+For more information about server configuration see [this article](https://www.espocrm.com/documentation/administration/server-configuration/).

-### How to report bug
+### Documentation
+
+Documentation for administrators, users and developers is available [here](https://www.espocrm.com/documentation/).
+
+### How to report a bug

 Create an issue [here](https://github.com/espocrm/espocrm/issues) or post on our [forum](http://forum.espocrm.com/forum/bug-reports).

+### 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.
+
 ### How to get started (for developers)

 1. Clone repository to your local computer.
@@ -30,7 +38,7 @@ 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
+### How to build (for developers)

 You need to have nodejs and Grunt CLI installed.

@@ -44,6 +52,12 @@ The build will be created in the `build` directory.

 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.

+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:
@@ -62,4 +76,3 @@ 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).
-
--- a/api/v1/index.php
+++ b/api/v1/index.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/api/v1/portal-access/index.php
+++ b/api/v1/portal-access/index.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/Acl/ActionHistoryRecord.php
+++ b/application/Espo/Acl/ActionHistoryRecord.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/Acl/Attachment.php
+++ b/application/Espo/Acl/Attachment.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/Acl/Email.php
+++ b/application/Espo/Acl/Email.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -34,6 +34,7 @@ use \Espo\ORM\Entity;

 class Email extends \Espo\Core\Acl\Base
 {
+    protected $ownerUserIdAttribute = 'usersIds';

    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
    {
@@ -118,4 +119,3 @@ class Email extends \Espo\Core\Acl\Base
        return false;
    }
 }
-
--- a/application/Espo/Acl/EmailAddress.php
+++ b/application/Espo/Acl/EmailAddress.php
@@ -0,0 +1,65 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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;
+    }
+}
+
--- a/application/Espo/Acl/EmailFilter.php
+++ b/application/Espo/Acl/EmailFilter.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/Acl/Import.php
+++ b/application/Espo/Acl/Import.php
@@ -0,0 +1,53 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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 Import extends \Espo\Core\Acl\Base
+{
+
+    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
+    {
+        if ($user->isAdmin()) return true;
+        if ($user->id === $entity->get('createdById')) return true;
+
+        return false;
+    }
+
+    public function checkEntityDelete(EntityUser $user, Entity $entity, $data)
+    {
+        if ($user->isAdmin()) return true;
+        if ($user->id === $entity->get('createdById')) return true;
+
+        return false;
+    }
+}
--- a/application/Espo/Acl/Note.php
+++ b/application/Espo/Acl/Note.php
@@ -0,0 +1,119 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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;
+    }
+}
--- a/application/Espo/Acl/Notification.php
+++ b/application/Espo/Acl/Notification.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/Acl/PhoneNumber.php
+++ b/application/Espo/Acl/PhoneNumber.php
@@ -0,0 +1,65 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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;
+    }
+}
--- a/application/Espo/Acl/ScheduledJob.php
+++ b/application/Espo/Acl/ScheduledJob.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/Acl/Team.php
+++ b/application/Espo/Acl/Team.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/Acl/User.php
+++ b/application/Espo/Acl/User.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -30,6 +30,7 @@
 namespace Espo\Acl;

 use \Espo\ORM\Entity;
+use \Espo\Entities\User as EntityUser;

 class User extends \Espo\Core\Acl\Base
 {
@@ -37,5 +38,51 @@ class User extends \Espo\Core\Acl\Base
    {
        return $user->id === $entity->id;
    }
-}

+    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');
+    }
+
+    public function checkEntityDelete(EntityUser $user, Entity $entity, $data)
+    {
+        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) {
+                return false;
+            }
+        }
+        if ($entity->isSuperAdmin() && !$user->isSuperAdmin()) {
+            return false;
+        }
+        return $this->checkEntity($user, $entity, $data, 'edit');
+    }
+}
--- a/application/Espo/Acl/Webhook.php
+++ b/application/Espo/Acl/Webhook.php
@@ -0,0 +1,73 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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;
+    }
+}
--- a/application/Espo/AclPortal/Attachment.php
+++ b/application/Espo/AclPortal/Attachment.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/AclPortal/Email.php
+++ b/application/Espo/AclPortal/Email.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -34,6 +34,7 @@ use \Espo\ORM\Entity;

 class Email extends \Espo\Core\AclPortal\Base
 {
+    protected $ownerUserIdAttribute = 'usersIds';

    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
    {
--- a/application/Espo/AclPortal/EmailAddress.php
+++ b/application/Espo/AclPortal/EmailAddress.php
@@ -0,0 +1,56 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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 EmailAddress extends \Espo\Core\AclPortal\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;
+                    break;
+                }
+            }
+        }
+        return !$isFobidden;
+    }
+}
--- a/application/Espo/AclPortal/Note.php
+++ b/application/Espo/AclPortal/Note.php
@@ -0,0 +1,66 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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 Note extends \Espo\Core\AclPortal\Base
+{
+    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('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->getEntityManager()->getEntity($entity->get('parentType'), $entity->get('parentId'));
+        if ($parent) {
+            if ($this->getAclManager()->checkEntity($user, $parent, 'stream')) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
--- a/application/Espo/AclPortal/Notification.php
+++ b/application/Espo/AclPortal/Notification.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/AclPortal/PhoneNumber.php
+++ b/application/Espo/AclPortal/PhoneNumber.php
@@ -0,0 +1,57 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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 PhoneNumber extends \Espo\Core\AclPortal\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;
+                    break;
+                }
+            }
+        }
+
+        return !$isFobidden;
+    }
+}
--- a/application/Espo/AclPortal/User.php
+++ b/application/Espo/AclPortal/User.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/Controllers/ActionHistoryRecord.php
+++ b/application/Espo/Controllers/ActionHistoryRecord.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -33,39 +33,43 @@ use \Espo\Core\Exceptions\Forbidden;

 class ActionHistoryRecord extends \Espo\Core\Controllers\Record
 {
-    public function actionUpdate($params, $data, $request)
+    public function beforeUpdate()
    {
        throw new Forbidden();
    }

-    public function actionCreate($params, $data, $request)
+    public function beforeCreate()
    {
        throw new Forbidden();
    }

-    public function actionListLinked($params, $data, $request)
+    public function beforeListLinked()
    {
        throw new Forbidden();
    }

-    public function actionMassUpdate($params, $data, $request)
+    public function beforeMassUpdate()
    {
        throw new Forbidden();
    }

-    public function actionCreateLink($params, $data, $request)
+    public function beforeCreateLink()
    {
        throw new Forbidden();
    }

-    public function actionRemoveLink($params, $data, $request)
+    public function beforeRemoveLink()
    {
        throw new Forbidden();
    }

-    public function actionMassDelete($params, $data, $request)
+    public function beforeMassDelete()
+    {
+        throw new Forbidden();
+    }
+
+    public function beforeMassConvertCurrency()
    {
        throw new Forbidden();
    }
 }
-
--- a/application/Espo/Controllers/Admin.php
+++ b/application/Espo/Controllers/Admin.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -53,7 +53,7 @@ class Admin extends \Espo\Core\Controllers\Base
        return $result;
    }

-    public function postActionClearCache($params, $data)
+    public function postActionClearCache($params)
    {
        $result = $this->getContainer()->get('dataManager')->clearCache();
        return $result;
@@ -69,7 +69,7 @@ class Admin extends \Espo\Core\Controllers\Base
    public function postActionUploadUpgradePackage($params, $data)
    {
        if ($this->getConfig()->get('restrictedMode')) {
-            if (!$this->getUser()->get('isSuperAdmin')) {
+            if (!$this->getUser()->isSuperAdmin()) {
                throw new Forbidden();
            }
        }
@@ -87,21 +87,31 @@ class Admin extends \Espo\Core\Controllers\Base
    public function postActionRunUpgrade($params, $data)
    {
        if ($this->getConfig()->get('restrictedMode')) {
-            if (!$this->getUser()->get('isSuperAdmin')) {
+            if (!$this->getUser()->isSuperAdmin()) {
                throw new Forbidden();
            }
        }

        $upgradeManager = new \Espo\Core\UpgradeManager($this->getContainer());
-        $upgradeManager->install($data);
+        $upgradeManager->install(get_object_vars($data));

        return true;
    }

-    public function actionCronMessage($params, $data)
+    public function actionCronMessage($params)
    {
        return $this->getContainer()->get('scheduledJob')->getSetupMessage();
    }

-}
+    public function actionAdminNotificationList($params)
+    {
+        $adminNotificationManager = new \Espo\Core\Utils\AdminNotificationManager($this->getContainer());
+        return $adminNotificationManager->getNotificationList();
+    }

+    public function actionSystemRequirementList($params)
+    {
+        $systemRequirementManager = new \Espo\Core\Utils\SystemRequirements($this->getContainer());
+        return $systemRequirementManager->getAllRequiredList();
+    }
+}
--- a/application/Espo/Controllers/App.php
+++ b/application/Espo/Controllers/App.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -35,57 +35,16 @@ class App extends \Espo\Core\Controllers\Base
 {
    public function actionUser()
    {
-        $preferences = $this->getPreferences()->getValues();
-        unset($preferences['smtpPassword']);
-
-        $user = $this->getUser();
-        if (!$user->has('teamsIds')) {
-            $user->loadLinkMultipleField('teams');
-        }
-        if ($user->get('isPortalUser')) {
-            $user->loadAccountField();
-            $user->loadLinkMultipleField('accounts');
-        }
-
-        $userData = $user->getValues();
-
-        $emailAddressList = [];
-        foreach ($user->get('emailAddresses') as $emailAddress) {
-            if ($emailAddress->get('invalid')) continue;
-            if ($user->get('emailAddrses') === $emailAddress->get('name')) continue;
-            $emailAddressList[] = $emailAddress->get('name');
-        }
-        if ($user->get('emailAddrses')) {
-            array_unshift($emailAddressList, $user->get('emailAddrses'));
-        }
-        $userData['emailAddressList'] = $emailAddressList;
-
-        $settings = (object)[];
-        foreach ($this->getConfig()->get('userItems') as $item) {
-            $settings->$item = $this->getConfig()->get($item);
-        }
-
-        unset($userData['authTokenId']);
-        unset($userData['password']);
-
-        return array(
-            'user' => $userData,
-            'acl' => $this->getAcl()->getMap(),
-            'preferences' => $preferences,
-            'token' => $this->getUser()->get('token'),
-            'settings' => $settings
-        );
+        return $this->getServiceFactory()->create('App')->getUserData();
    }

    public function postActionDestroyAuthToken($params, $data)
    {
-        $token = $data['token'];
-        if (empty($token)) {
+        if (empty($data->token)) {
            throw new BadRequest();
        }

        $auth = new \Espo\Core\Utils\Auth($this->getContainer());
-        return $auth->destroyAuthToken($token);
+        return $auth->destroyAuthToken($data->token);
    }
 }
-
--- a/application/Espo/Controllers/Attachment.php
+++ b/application/Espo/Controllers/Attachment.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -34,32 +34,27 @@ use \Espo\Core\Exceptions\BadRequest;

 class Attachment extends \Espo\Core\Controllers\Record
 {
-    public function actionUpload($params, $data, $request)
+    public function actionList($params, $data, $request)
    {
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
-
-        if (!$this->getAcl()->checkScope('Attachment', 'create')) {
+        if (!$this->getUser()->isAdmin()) {
            throw new Forbidden();
        }
-
-        $arr = explode(',', $data);
-        if (count($arr) > 1) {
-            list($prefix, $contents) = $arr;
-            $contents = base64_decode($contents);
-        } else {
-            $contents = '';
-        }
-
-        $attachment = $this->getEntityManager()->getEntity('Attachment');
-        $this->getEntityManager()->saveEntity($attachment);
-        $this->getContainer()->get('fileStorageManager')->putContents($attachment, $contents);
-
-        return array(
-            'attachmentId' => $attachment->id
-        );
+        return parent::actionList($params, $data, $request);
    }

-}
+    public function postActionGetAttachmentFromImageUrl($params, $data)
+    {
+        if (empty($data->url)) throw new BadRequest();
+        if (empty($data->field)) throw new BadRequest('postActionGetAttachmentFromImageUrl: No field specified');

+        return $this->getRecordService()->getAttachmentFromImageUrl($data)->getValueMap();
+    }
+
+    public function postActionGetCopiedAttachment($params, $data)
+    {
+        if (empty($data->id)) throw new BadRequest();
+        if (empty($data->field)) throw new BadRequest('postActionGetCopiedAttachment copy: No field specified');
+
+        return $this->getRecordService()->getCopiedAttachment($data)->getValueMap();
+    }
+}
--- a/application/Espo/Controllers/AuthLogRecord.php
+++ b/application/Espo/Controllers/AuthLogRecord.php
@@ -0,0 +1,72 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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 AuthLogRecord extends \Espo\Core\Controllers\Record
+{
+    protected function checkControllerAccess()
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+    }
+
+    public function beforeUpdate()
+    {
+        throw new Forbidden();
+    }
+
+    public function beforeMassUpdate()
+    {
+        throw new Forbidden();
+    }
+
+    public function beforeCreate()
+    {
+        throw new Forbidden();
+    }
+
+    public function beforeCreateLink()
+    {
+        throw new Forbidden();
+    }
+
+    public function beforeRemoveLink()
+    {
+        throw new Forbidden();
+    }
+
+    public function beforeMassConvertCurrency()
+    {
+        throw new Forbidden();
+    }
+}
--- a/application/Espo/Controllers/AuthToken.php
+++ b/application/Espo/Controllers/AuthToken.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -42,12 +42,17 @@ class AuthToken extends \Espo\Core\Controllers\Record

    public function actionUpdate($params, $data, $request)
    {
+        $dataAr = get_object_vars($data);
+
        if (
-            is_array($data) &&
-            array_key_exists('isActive', $data) &&
-            $data['isActive'] === false &&
-            count(array_keys($data)) === 1)
-        {
+            is_object($data)
+            &&
+            isset($data->isActive)
+            &&
+            $data->isActive === false
+            &&
+            count(array_keys($dataAr)) === 1
+        ) {
            return parent::actionUpdate($params, $data, $request);
        }
        throw new Forbidden();
@@ -55,16 +60,19 @@ class AuthToken extends \Espo\Core\Controllers\Record

    public function actionMassUpdate($params, $data, $request)
    {
-        if (empty($data['attributes'])) {
+        if (empty($data->attributes)) {
            throw new BadRequest();
        }

-        $attributes = $data['attributes'];
+        $attributes = $data->attributes;

        if (
-            is_object($attributes) &&
-            isset($attributes->isActive) &&
-            $attributes->isActive === false &&
+            is_object($attributes)
+            &&
+            isset($attributes->isActive)
+            &&
+            $attributes->isActive === false
+            &&
            count(array_keys(get_object_vars($attributes))) === 1
        ) {
            return parent::actionMassUpdate($params, $data, $request);
@@ -72,19 +80,23 @@ class AuthToken extends \Espo\Core\Controllers\Record
        throw new Forbidden();
    }

-    public function actionCreate($params, $data, $request)
+    public function beforeCreate()
    {
        throw new Forbidden();
    }

-    public function actionCreateLink($params, $data, $request)
+    public function beforeCreateLink()
    {
        throw new Forbidden();
    }

-    public function actionRemoveLink($params, $data, $request)
+    public function beforeRemoveLink()
+    {
+        throw new Forbidden();
+    }
+
+    public function beforeMassConvertCurrency()
    {
        throw new Forbidden();
    }
 }
-
--- a/application/Espo/Controllers/DashboardTemplate.php
+++ b/application/Espo/Controllers/DashboardTemplate.php
@@ -0,0 +1,67 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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 DashboardTemplate extends \Espo\Core\Controllers\Record
+{
+    protected function checkControllerAccess()
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+    }
+
+    public function postActionDeployToUsers($params, $data)
+    {
+        if (empty($data->id)) throw new BadRequest();
+        if (empty($data->userIdList)) throw new BadRequest();
+
+        return $this->getServiceFactory()->create('DashboardTemplate')->deployToUsers(
+            $data->id,
+            $data->userIdList,
+            !empty($data->append)
+        );
+    }
+
+    public function postActionDeployToTeam($params, $data)
+    {
+        if (empty($data->id)) throw new BadRequest();
+        if (empty($data->teamId)) throw new BadRequest();
+
+        return $this->getServiceFactory()->create('DashboardTemplate')->deployToTeam(
+            $data->id,
+            $data->teamId,
+            !empty($data->append)
+        );
+    }
+}
--- a/application/Espo/Controllers/DataPrivacy.php
+++ b/application/Espo/Controllers/DataPrivacy.php
@@ -0,0 +1,55 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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\Error;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\NotFound;
+use Espo\Core\Exceptions\BadRequest;
+
+class DataPrivacy extends \Espo\Core\Controllers\Base
+{
+    protected function checkControllerAccess()
+    {
+        if ($this->getAcl()->get('dataPrivacyPermission') === 'no') {
+            throw new Forbidden();
+        }
+    }
+
+    public function postActionErase($params, $data)
+    {
+        if (empty($data->entityType) || empty($data->id) || empty($data->fieldList) || !is_array($data->fieldList)) {
+            throw new BadRequest();
+        }
+
+        return $this->getServiceFactory()->create('DataPrivacy')->erase($data->entityType, $data->id, $data->fieldList);
+    }
+
+}
--- a/application/Espo/Controllers/Email.php
+++ b/application/Espo/Controllers/Email.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -38,94 +38,103 @@ class Email extends \Espo\Core\Controllers\Record
 {
    public function postActionGetCopiedAttachments($params, $data, $request)
    {
-        if (empty($data['id'])) {
+        if (empty($data->id)) {
            throw new BadRequest();
        }
-        $id = $data['id'];
+        $id = $data->id;

        return $this->getRecordService()->getCopiedAttachments($id);
    }

-    public function actionSendTestEmail($params, $data, $request)
+    public function postActionSendTestEmail($params, $data, $request)
    {
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
-
        if (!$this->getAcl()->checkScope('Email')) {
            throw new Forbidden();
        }

-        if (is_null($data['password'])) {
-            if ($data['type'] == 'preferences') {
-                if (!$this->getUser()->isAdmin() && $data['id'] !== $this->getUser()->id) {
+        if (is_null($data->password)) {
+            if ($data->type == 'preferences') {
+                if (!$this->getUser()->isAdmin() && $data->id !== $this->getUser()->id) {
                    throw new Forbidden();
                }
-                $preferences = $this->getEntityManager()->getEntity('Preferences', $data['id']);
+                $preferences = $this->getEntityManager()->getEntity('Preferences', $data->id);
                if (!$preferences) {
                    throw new NotFound();
                }

-                if (is_null($data['password'])) {
-                    $data['password'] = $this->getContainer()->get('crypt')->decrypt($preferences->get('smtpPassword'));
+                if (is_null($data->password)) {
+                    $data->password = $this->getContainer()->get('crypt')->decrypt($preferences->get('smtpPassword'));
                }
-            } else if ($data['type'] == 'emailAccount') {
+            } else if ($data->type == 'emailAccount') {
                if (!$this->getAcl()->checkScope('EmailAccount')) {
                    throw new Forbidden();
                }
-                if (!empty($data['id'])) {
-                    $emailAccount = $this->getEntityManager()->getEntity('EmailAccount', $data['id']);
+                if (!empty($data->id)) {
+                    $emailAccount = $this->getEntityManager()->getEntity('EmailAccount', $data->id);
                    if (!$emailAccount) {
                        throw new NotFound();
                    }
                    if (!$this->getUser()->isAdmin()) {
-                        if ($emailAccount->get('assigniedUserId') !== $this->getUser()->id) {
+                        if ($emailAccount->get('assignedUserId') !== $this->getUser()->id) {
                            throw new Forbidden();
                        }
                    }
-                    if (is_null($data['password'])) {
-                        $data['password'] = $this->getContainer()->get('crypt')->decrypt($emailAccount->get('smtpPassword'));
+                    if (is_null($data->password)) {
+                        $data->password = $this->getContainer()->get('crypt')->decrypt($emailAccount->get('smtpPassword'));
+                    }
+                }
+            } else if ($data->type == 'inboundEmail') {
+                if (!$this->getUser()->isAdmin()) {
+                    throw new Forbidden();
+                }
+                if (!empty($data->id)) {
+                    $emailAccount = $this->getEntityManager()->getEntity('InboundEmail', $data->id);
+                    if (!$emailAccount) {
+                        throw new NotFound();
+                    }
+                    if (is_null($data->password)) {
+                        $data->password = $this->getContainer()->get('crypt')->decrypt($emailAccount->get('smtpPassword'));
                    }
                }
            } else {
                if (!$this->getUser()->isAdmin()) {
                    throw new Forbidden();
                }
-                if (is_null($data['password'])) {
-                    $data['password'] = $this->getConfig()->get('smtpPassword');
+                if (is_null($data->password)) {
+                    $data->password = $this->getConfig()->get('smtpPassword');
                }
            }
        }

-        return $this->getRecordService()->sendTestEmail($data);
+        return $this->getRecordService()->sendTestEmail(get_object_vars($data));
    }

    public function postActionMarkAsRead($params, $data, $request)
    {
-        if (!empty($data['ids'])) {
-            $ids = $data['ids'];
+        if (!empty($data->ids)) {
+            $idList = $data->ids;
        } else {
-            if (!empty($data['id'])) {
-                $ids = [$data['id']];
+            if (!empty($data->id)) {
+                $idList = [$data->id];
            } else {
                throw new BadRequest();
            }
        }
-        return $this->getRecordService()->markAsReadByIdList($ids);
+        return $this->getRecordService()->markAsReadByIdList($idList);
    }

    public function postActionMarkAsNotRead($params, $data, $request)
    {
-        if (!empty($data['ids'])) {
-            $ids = $data['ids'];
+        if (!empty($data->ids)) {
+            $idList = $data->ids;
        } else {
-            if (!empty($data['id'])) {
-                $ids = [$data['id']];
+            if (!empty($data->id)) {
+                $idList = [$data->id];
            } else {
                throw new BadRequest();
            }
        }
-        return $this->getRecordService()->markAsNotReadByIdList($ids);
+        return $this->getRecordService()->markAsNotReadByIdList($idList);
    }

    public function postActionMarkAllAsRead($params, $data, $request)
@@ -135,58 +144,58 @@ class Email extends \Espo\Core\Controllers\Record

    public function postActionMarkAsImportant($params, $data, $request)
    {
-        if (!empty($data['ids'])) {
-            $ids = $data['ids'];
+        if (!empty($data->ids)) {
+            $idList = $data->ids;
        } else {
-            if (!empty($data['id'])) {
-                $ids = [$data['id']];
+            if (!empty($data->id)) {
+                $idList = [$data->id];
            } else {
                throw new BadRequest();
            }
        }
-        return $this->getRecordService()->markAsImportantByIdList($ids);
+        return $this->getRecordService()->markAsImportantByIdList($idList);
    }

    public function postActionMarkAsNotImportant($params, $data, $request)
    {
-        if (!empty($data['ids'])) {
-            $ids = $data['ids'];
+        if (!empty($data->ids)) {
+            $idList = $data->ids;
        } else {
-            if (!empty($data['id'])) {
-                $ids = [$data['id']];
+            if (!empty($data->id)) {
+                $idList = [$data->id];
            } else {
                throw new BadRequest();
            }
        }
-        return $this->getRecordService()->markAsNotImportantByIdList($ids);
+        return $this->getRecordService()->markAsNotImportantByIdList($idList);
    }

    public function postActionMoveToTrash($params, $data)
    {
-        if (!empty($data['ids'])) {
-            $ids = $data['ids'];
+        if (!empty($data->ids)) {
+            $idList = $data->ids;
        } else {
-            if (!empty($data['id'])) {
-                $ids = [$data['id']];
+            if (!empty($data->id)) {
+                $idList = [$data->id];
            } else {
                throw new BadRequest();
            }
        }
-        return $this->getRecordService()->moveToTrashByIdList($ids);
+        return $this->getRecordService()->moveToTrashByIdList($idList);
    }

    public function postActionRetrieveFromTrash($params, $data)
    {
-        if (!empty($data['ids'])) {
-            $ids = $data['ids'];
+        if (!empty($data->ids)) {
+            $idList = $data->ids;
        } else {
-            if (!empty($data['id'])) {
-                $ids = [$data['id']];
+            if (!empty($data->id)) {
+                $idList = [$data->id];
            } else {
                throw new BadRequest();
            }
        }
-        return $this->getRecordService()->retrieveFromTrashByIdList($ids);
+        return $this->getRecordService()->retrieveFromTrashByIdList($idList);
    }

    public function getActionGetFoldersNotReadCounts(&$params, $request, $data)
@@ -206,20 +215,19 @@ class Email extends \Espo\Core\Controllers\Record

    public function postActionMoveToFolder($params, $data)
    {
-        if (!empty($data['ids'])) {
-            $ids = $data['ids'];
+        if (!empty($data->ids)) {
+            $idList = $data->ids;
        } else {
-            if (!empty($data['id'])) {
-                $ids = [$data['id']];
+            if (!empty($data->id)) {
+                $idList = [$data->id];
            } else {
                throw new BadRequest();
            }
        }

-        if (empty($data['folderId'])) {
+        if (empty($data->folderId)) {
            throw new BadRequest();
        }
-        return $this->getRecordService()->moveToFolderByIdList($ids, $data['folderId']);
+        return $this->getRecordService()->moveToFolderByIdList($idList, $data->folderId);
    }
 }
-
--- a/application/Espo/Controllers/EmailAccount.php
+++ b/application/Espo/Controllers/EmailAccount.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -34,16 +34,18 @@ use \Espo\Core\Exceptions\BadRequest;

 class EmailAccount extends \Espo\Core\Controllers\Record
 {
-    public function actionGetFolders($params, $data, $request)
+    public function postActionGetFolders($params, $data)
    {
-        return $this->getRecordService()->getFolders(array(
-            'host' => $request->get('host'),
-            'port' => $request->get('port'),
-            'ssl' => $request->get('ssl') === 'true',
-            'username' => $request->get('username'),
-            'password' => $request->get('password'),
-            'id' => $request->get('id')
-        ));
+        return $this->getRecordService()->getFolders([
+            'host' => $data->host ?? null,
+            'port' => $data->port ?? null,
+            'ssl' =>  $data->ssl ?? false,
+            'username' => $data->username ?? null,
+            'password' => $data->password ?? null,
+            'id' => $data->id ?? null,
+            'emailAddress' => $data->emailAddress ?? null,
+            'userId' => $data->userId ?? null,
+        ]);
    }

    protected function checkControllerAccess()
@@ -53,15 +55,11 @@ class EmailAccount extends \Espo\Core\Controllers\Record
        }
    }

-    public function actionTestConnection($params, $data, $request)
+    public function postActionTestConnection($params, $data, $request)
    {
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
-
-        if (is_null($data['password'])) {
-            $emailAccount = $this->getEntityManager()->getEntity('EmailAccount', $data['id']);
-            if (!$emailAccount) {
+        if (is_null($data->password)) {
+            $emailAccount = $this->getEntityManager()->getEntity('EmailAccount', $data->id);
+            if (!$emailAccount || !$emailAccount->id) {
                throw new Error();
            }

@@ -69,10 +67,9 @@ class EmailAccount extends \Espo\Core\Controllers\Record
                throw new Forbidden();
            }

-            $data['password'] = $this->getContainer()->get('crypt')->decrypt($emailAccount->get('password'));
+            $data->password = $this->getContainer()->get('crypt')->decrypt($emailAccount->get('password'));
        }

-        return $this->getRecordService()->testConnection($data);
+        return $this->getRecordService()->testConnection(get_object_vars($data));
    }
 }
-
--- a/application/Espo/Controllers/EmailAddress.php
+++ b/application/Espo/Controllers/EmailAddress.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -42,11 +42,13 @@ class EmailAddress extends \Espo\Core\Controllers\Record
            throw new Forbidden();
        }
        $q = $request->get('q');
-        $limit = intval($request->get('limit'));
-        if (empty($limit) || $limit > 30) {
-            $limit = 5;
+        $maxSize = intval($request->get('maxSize'));
+        if (empty($maxSize) || $maxSize > 50) {
+            $maxSize = $this->getConfig()->get('recordsPerPage', 20);
        }
-        return $this->getRecordService()->searchInAddressBook($q, $limit);
+
+        $onlyActual = $request->get('onlyActual') === 'true';
+
+        return $this->getRecordService()->searchInAddressBook($q, $maxSize, $onlyActual);
    }
 }
-
--- a/application/Espo/Controllers/EmailFilter.php
+++ b/application/Espo/Controllers/EmailFilter.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/Controllers/EmailFolder.php
+++ b/application/Espo/Controllers/EmailFolder.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -35,22 +35,22 @@ class EmailFolder extends \Espo\Core\Controllers\Record
 {
    public function postActionMoveUp($params, $data, $request)
    {
-        if (empty($data['id'])) {
+        if (empty($data->id)) {
            throw new BadRequest();
        }

-        $this->getRecordService()->moveUp($data['id']);
+        $this->getRecordService()->moveUp($data->id);

        return true;
    }

    public function postActionMoveDown($params, $data, $request)
    {
-        if (empty($data['id'])) {
+        if (empty($data->id)) {
            throw new BadRequest();
        }

-        $this->getRecordService()->moveDown($data['id']);
+        $this->getRecordService()->moveDown($data->id);

        return true;
    }
@@ -60,4 +60,3 @@ class EmailFolder extends \Espo\Core\Controllers\Record
        return $this->getRecordService()->listAll();
    }
 }
-
--- a/application/Espo/Controllers/EmailTemplate.php
+++ b/application/Espo/Controllers/EmailTemplate.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/Controllers/EmailTemplateCategory.php
+++ b/application/Espo/Controllers/EmailTemplateCategory.php
@@ -0,0 +1,35 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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;
+
+class EmailTemplateCategory extends \Espo\Core\Templates\Controllers\CategoryTree
+{
+
+}
--- a/application/Espo/Controllers/EntityManager.php
+++ b/application/Espo/Controllers/EntityManager.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -44,6 +44,8 @@ class EntityManager extends \Espo\Core\Controllers\Base

    public function actionCreateEntity($params, $data, $request)
    {
+        $data = get_object_vars($data);
+
        if (!$request->isPost()) {
            throw new BadRequest();
        }
@@ -81,6 +83,23 @@ class EntityManager extends \Espo\Core\Controllers\Base
        if (isset($data['textFilterFields']) && is_array($data['textFilterFields'])) {
            $params['textFilterFields'] = $data['textFilterFields'];
        }
+        if (!empty($data['color'])) {
+            $params['color'] = $data['color'];
+        }
+        if (!empty($data['iconClass'])) {
+            $params['iconClass'] = $data['iconClass'];
+        }
+        if (isset($data['fullTextSearch'])) {
+            $params['fullTextSearch'] = $data['fullTextSearch'];
+        }
+        if (isset($data['countDisabled'])) {
+            $params['countDisabled'] = $data['countDisabled'];
+        }
+
+        $params['kanbanViewMode'] = !empty($data['kanbanViewMode']);
+        if (!empty($data['kanbanStatusIgnoreList'])) {
+            $params['kanbanStatusIgnoreList'] = $data['kanbanStatusIgnoreList'];
+        }

        $result = $this->getContainer()->get('entityManagerUtil')->create($name, $type, $params);

@@ -103,6 +122,8 @@ class EntityManager extends \Espo\Core\Controllers\Base

    public function actionUpdateEntity($params, $data, $request)
    {
+        $data = get_object_vars($data);
+
        if (!$request->isPost()) {
            throw new BadRequest();
        }
@@ -112,10 +133,6 @@ class EntityManager extends \Espo\Core\Controllers\Base
        $name = $data['name'];
        $name = filter_var($name, \FILTER_SANITIZE_STRING);

-        if (!empty($data['sortDirection'])) {
-            $data['asc'] = $data['sortDirection'] === 'asc';
-        }
-
        $result = $this->getContainer()->get('entityManagerUtil')->update($name, $data);

        if ($result) {
@@ -129,6 +146,8 @@ class EntityManager extends \Espo\Core\Controllers\Base

    public function actionRemoveEntity($params, $data, $request)
    {
+        $data = get_object_vars($data);
+
        if (!$request->isPost()) {
            throw new BadRequest();
        }
@@ -160,6 +179,8 @@ class EntityManager extends \Espo\Core\Controllers\Base

    public function actionCreateLink($params, $data, $request)
    {
+        $data = get_object_vars($data);
+
        if (!$request->isPost()) {
            throw new BadRequest();
        }
@@ -218,6 +239,8 @@ class EntityManager extends \Espo\Core\Controllers\Base

    public function actionUpdateLink($params, $data, $request)
    {
+        $data = get_object_vars($data);
+
        if (!$request->isPost()) {
            throw new BadRequest();
        }
@@ -235,7 +258,9 @@ class EntityManager extends \Espo\Core\Controllers\Base

        $params = array();
        foreach ($paramList as $item) {
-        	$params[$item] = filter_var($data[$item], \FILTER_SANITIZE_STRING);
+            if (array_key_exists($item, $data)) {
+                $params[$item] = filter_var($data[$item], \FILTER_SANITIZE_STRING);
+            }
        }

        foreach ($additionalParamList as $item) {
@@ -269,6 +294,8 @@ class EntityManager extends \Espo\Core\Controllers\Base

    public function actionRemoveLink($params, $data, $request)
    {
+        $data = get_object_vars($data);
+
        if (!$request->isPost()) {
            throw new BadRequest();
        }
@@ -295,20 +322,31 @@ class EntityManager extends \Espo\Core\Controllers\Base

    public function postActionFormula($params, $data, $request)
    {
-        if (empty($data['scope'])) {
+        if (empty($data->scope)) {
            throw new BadRequest();
        }
-        if (!array_key_exists('data', $data)) {
+        if (!property_exists($data, 'data')) {
            throw new BadRequest();
        }

-        $formulaData = get_object_vars($data['data']);
+        $formulaData = get_object_vars($data->data);

-        $this->getContainer()->get('entityManagerUtil')->setFormulaData($data['scope'], $formulaData);
+        $this->getContainer()->get('entityManagerUtil')->setFormulaData($data->scope, $formulaData);

        $this->getContainer()->get('dataManager')->clearCache();

        return true;
    }
-}

+    public function postActionResetToDefault($params, $data, $request)
+    {
+        if (empty($data->scope)) {
+            throw new BadRequest();
+        }
+
+        $this->getContainer()->get('entityManagerUtil')->resetToDefaults($data->scope);
+        $this->getContainer()->get('dataManager')->clearCache();
+
+        return true;
+    }
+}
--- a/application/Espo/Controllers/Extension.php
+++ b/application/Espo/Controllers/Extension.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -66,14 +66,14 @@ class Extension extends \Espo\Core\Controllers\Record
            throw new Forbidden();
        }
        if ($this->getConfig()->get('restrictedMode')) {
-            if (!$this->getUser()->get('isSuperAdmin')) {
+            if (!$this->getUser()->isSuperAdmin()) {
                throw new Forbidden();
            }
        }

        $manager = new \Espo\Core\ExtensionManager($this->getContainer());

-        $manager->install($data);
+        $manager->install(get_object_vars($data));

        return true;
    }
@@ -84,35 +84,16 @@ class Extension extends \Espo\Core\Controllers\Record
            throw new Forbidden();
        }
        if ($this->getConfig()->get('restrictedMode')) {
-            if (!$this->getUser()->get('isSuperAdmin')) {
+            if (!$this->getUser()->isSuperAdmin()) {
                throw new Forbidden();
            }
        }

        $manager = new \Espo\Core\ExtensionManager($this->getContainer());
-        $manager->uninstall($data);
+        $manager->uninstall(get_object_vars($data));
        return true;
    }

-    public function actionCreate($params, $data, $request)
-    {
-        throw new Forbidden();
-    }
-
-    public function actionUpdate($params, $data, $request)
-    {
-        throw new Forbidden();
-    }
-
-    public function actionPatch($params, $data, $request)
-    {
-        throw new Forbidden();
-    }
-
-    public function actionListLinked($params, $data, $request)
-    {
-        throw new Forbidden();
-    }

    public function actionDelete($params, $data, $request)
    {
@@ -120,7 +101,7 @@ class Extension extends \Espo\Core\Controllers\Record
            throw BadRequest();
        }
        if ($this->getConfig()->get('restrictedMode')) {
-            if (!$this->getUser()->get('isSuperAdmin')) {
+            if (!$this->getUser()->isSuperAdmin()) {
                throw new Forbidden();
            }
        }
@@ -129,24 +110,43 @@ class Extension extends \Espo\Core\Controllers\Record
        return true;
    }

-    public function actionMassUpdate($params, $data, $request)
+    public function beforeCreate()
    {
        throw new Forbidden();
    }

-    public function actionMassDelete($params, $data, $request)
+    public function beforeUpdate()
    {
        throw new Forbidden();
    }

-    public function actionCreateLink($params, $data, $request)
+    public function beforePatch()
    {
        throw new Forbidden();
    }

-    public function actionRemoveLink($params, $data, $request)
+    public function beforeListLinked()
+    {
+        throw new Forbidden();
+    }
+
+    public function beforeMassUpdate()
+    {
+        throw new Forbidden();
+    }
+
+    public function beforeMassDelete()
+    {
+        throw new Forbidden();
+    }
+
+    public function beforeCreateLink()
+    {
+        throw new Forbidden();
+    }
+
+    public function beforeRemoveLink()
    {
        throw new Forbidden();
    }
 }
-
--- a/application/Espo/Controllers/ExternalAccount.php
+++ b/application/Espo/Controllers/ExternalAccount.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -47,17 +47,27 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
    public function actionList($params, $data, $request)
    {
        $integrations = $this->getEntityManager()->getRepository('Integration')->find();
-        $arr = array();
+
+        $list = [];
        foreach ($integrations as $entity) {
            if ($entity->get('enabled') && $this->getMetadata()->get('integrations.' . $entity->id .'.allowUserAccounts')) {
-                $arr[] = array(
+
+                $userAccountAclScope = $this->getMetadata()->get(['integrations', $entity->id, 'userAccountAclScope']);
+
+                if ($userAccountAclScope) {
+                    if (!$this->getAcl()->checkScope($userAccountAclScope)) {
+                        continue;
+                    }
+                }
+
+                $list[] = [
                    'id' => $entity->id
-                );
+                ];
            }
        }
-        return array(
-            'list' => $arr
-        );
+        return [
+            'list' => $list
+        ];
    }

    public function actionGetOAuth2Info($params, $data, $request)
@@ -65,7 +75,6 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
        $id = $request->get('id');
        list($integration, $userId) = explode('__', $id);

-
        if ($this->getUser()->id != $userId) {
            throw new Forbidden();
        }
@@ -109,8 +118,8 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
            throw new Forbidden();
        }

-        if (isset($data['enabled']) && !$data['enabled']) {
-            $data['data'] = null;
+        if (isset($data->enabled) && !$data->enabled) {
+            $data->data = null;
        }

        $entity = $this->getEntityManager()->getEntity('ExternalAccount', $params['id']);
@@ -126,8 +135,8 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
            throw new Error('Bad HTTP method type.');
        }

-        $id = $data['id'];
-        $code = $data['code'];
+        $id = $data->id;
+        $code = $data->code;

        list($integration, $userId) = explode('__', $id);

@@ -139,4 +148,3 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
        return $service->authorizationCode($integration, $userId, $code);
    }
 }
-
--- a/application/Espo/Controllers/FieldManager.php
+++ b/application/Espo/Controllers/FieldManager.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -60,21 +60,26 @@ class FieldManager extends \Espo\Core\Controllers\Base

    public function postActionCreate($params, $data)
    {
-        if (empty($params['scope']) || empty($data['name'])) {
+        if (empty($params['scope']) || empty($data->name)) {
            throw new BadRequest();
        }

        $fieldManager = $this->getContainer()->get('fieldManager');
-        $fieldManager->create($params['scope'], $data['name'], $data);
+        $fieldManager->create($params['scope'], $data->name, get_object_vars($data));

        try {
            $this->getContainer()->get('dataManager')->rebuild($params['scope']);
        } catch (Error $e) {
-            $fieldManager->delete($params['scope'], $data['name']);
+            $fieldManager->delete($params['scope'], $data->name);
            throw new Error($e->getMessage());
        }

-        return $fieldManager->read($params['scope'], $data['name']);
+        return $fieldManager->read($params['scope'], $data->name);
+    }
+
+    public function patchActionUpdate($params, $data)
+    {
+        return $this->putActionUpdate($params, $data);
    }

    public function putActionUpdate($params, $data)
@@ -84,7 +89,7 @@ class FieldManager extends \Espo\Core\Controllers\Base
        }

        $fieldManager = $this->getContainer()->get('fieldManager');
-        $fieldManager->update($params['scope'], $params['name'], $data);
+        $fieldManager->update($params['scope'], $params['name'], get_object_vars($data));

        if ($fieldManager->isChanged()) {
            $this->getContainer()->get('dataManager')->rebuild($params['scope']);
@@ -110,15 +115,16 @@ class FieldManager extends \Espo\Core\Controllers\Base

    public function postActionResetToDefault($params, $data)
    {
-        if (empty($data['scope']) || empty($data['name'])) {
+        if (empty($data->scope) || empty($data->name)) {
            throw new BadRequest();
        }

-        $this->getContainer()->get('fieldManager')->resetToDefault($data['scope'], $data['name']);
+        $this->getContainer()->get('fieldManager')->resetToDefault($data->scope, $data->name);
+
+        $this->getContainer()->get('dataManager')->clearCache();

        $this->getContainer()->get('dataManager')->rebuildMetadata();

        return true;
    }
 }
-
--- a/application/Espo/Controllers/GlobalSearch.php
+++ b/application/Espo/Controllers/GlobalSearch.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/Controllers/I18n.php
+++ b/application/Espo/Controllers/I18n.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -31,8 +31,15 @@ namespace Espo\Controllers;

 class I18n extends \Espo\Core\Controllers\Base
 {
-    public function actionRead($params, $data)
+    public function actionRead($params, $data, $request)
    {
-        return $this->getContainer()->get('language')->getAll();
+        $default = $request->get('default') === 'true';
+
+        return $this->getServiceFactory()->create('Language')->getDataForFrontend($default);
+
+        /*if ($request->get('default')) {
+            return $this->getContainer()->get('defaultLanguage')->getAll();
+        }
+        return $this->getContainer()->get('language')->getAll();*/
    }
 }
--- a/application/Espo/Controllers/Import.php
+++ b/application/Espo/Controllers/Import.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -38,32 +38,32 @@ class Import extends \Espo\Core\Controllers\Record
 {
    protected function checkControllerAccess()
    {
-        if (!$this->getUser()->isAdmin()) {
+        if (!$this->getAcl()->check('Import')) {
            throw new Forbidden();
        }
    }

-    public function actionPatch($params, $data, $request)
+    public function beforePatch()
    {
        throw new BadRequest();
    }

-    public function actionUpdate($params, $data, $request)
+    public function beforeUpdate()
    {
        throw new BadRequest();
    }

-    public function actionMassUpdate($params, $data, $request)
+    public function beforeMassUpdate()
    {
        throw new BadRequest();
    }

-    public function actionCreateLink($params, $data, $request)
+    public function beforeCreateLink()
    {
        throw new BadRequest();
    }

-    public function actionRemoveLink($params, $data, $request)
+    public function beforeRemoveLink()
    {
        throw new BadRequest();
    }
@@ -90,35 +90,34 @@ class Import extends \Espo\Core\Controllers\Record
        $attachment->set('type', 'text/csv');
        $attachment->set('role', 'Import File');
        $attachment->set('name', 'import-file.csv');
+        $attachment->set('contents', $contents);
        $this->getEntityManager()->saveEntity($attachment);

-        $this->getFileStorageManager()->putContents($attachment, $contents);
-
-        return array(
+        return [
            'attachmentId' => $attachment->id
-        );
+        ];
    }

    public function actionRevert($params, $data, $request)
    {
-        if (empty($data['id'])) {
+        if (empty($data->id)) {
            throw new BadRequest();
        }
        if (!$request->isPost()) {
            throw new BadRequest();
        }
-        return $this->getService('Import')->revert($data['id']);
+        return $this->getService('Import')->revert($data->id);
    }

    public function actionRemoveDuplicates($params, $data, $request)
    {
-        if (empty($data['id'])) {
+        if (empty($data->id)) {
            throw new BadRequest();
        }
        if (!$request->isPost()) {
            throw new BadRequest();
        }
-        return $this->getService('Import')->removeDuplicates($data['id']);
+        return $this->getService('Import')->removeDuplicates($data->id);
    }

    public function actionCreate($params, $data, $request)
@@ -127,87 +126,91 @@ class Import extends \Espo\Core\Controllers\Record
            throw new BadRequest();
        }

-        if (!isset($data['fieldDelimiter'])) {
+        if (!isset($data->delimiter)) {
            throw new BadRequest();
        }

-        if (!isset($data['textQualifier'])) {
+        if (!isset($data->textQualifier)) {
            throw new BadRequest();
        }

-        if (!isset($data['dateFormat'])) {
+        if (!isset($data->dateFormat)) {
            throw new BadRequest();
        }

-        if (!isset($data['timeFormat'])) {
+        if (!isset($data->timeFormat)) {
            throw new BadRequest();
        }

-        if (!isset($data['personNameFormat'])) {
+        if (!isset($data->personNameFormat)) {
            throw new BadRequest();
        }

-        if (!isset($data['decimalMark'])) {
+        if (!isset($data->decimalMark)) {
            throw new BadRequest();
        }

-        if (!isset($data['defaultValues'])) {
+        if (!isset($data->defaultValues)) {
            throw new BadRequest();
        }

-        if (!isset($data['action'])) {
+        if (!isset($data->action)) {
            throw new BadRequest();
        }

-        if (!isset($data['attachmentId'])) {
+        if (!isset($data->attachmentId)) {
            throw new BadRequest();
        }

-        if (!isset($data['entityType'])) {
+        if (!isset($data->entityType)) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data->attributeList)) {
            throw new BadRequest();
        }

        $timezone = 'UTC';
-        if (isset($data['timezone'])) {
-           $timezone = $data['timezone'];
+        if (isset($data->timezone)) {
+           $timezone = $data->timezone;
        }

-        $importParams = array(
-            'headerRow' => !empty($data['headerRow']),
-            'fieldDelimiter' => $data['fieldDelimiter'],
-            'textQualifier' => $data['textQualifier'],
-            'dateFormat' => $data['dateFormat'],
-            'timeFormat' => $data['timeFormat'],
+        $importParams = [
+            'headerRow' => !empty($data->headerRow),
+            'delimiter' => $data->delimiter,
+            'textQualifier' => $data->textQualifier,
+            'dateFormat' => $data->dateFormat,
+            'timeFormat' => $data->timeFormat,
            'timezone' => $timezone,
-            'personNameFormat' => $data['personNameFormat'],
-            'decimalMark' => $data['decimalMark'],
-            'currency' => $data['currency'],
-            'defaultValues' => $data['defaultValues'],
-            'action' => $data['action'],
-            'skipDuplicateChecking' => !empty($data['skipDuplicateChecking']),
-            'idleMode' => !empty($data['idleMode'])
-        );
+            'personNameFormat' => $data->personNameFormat,
+            'decimalMark' => $data->decimalMark,
+            'currency' => $data->currency,
+            'defaultValues' => $data->defaultValues,
+            'action' => $data->action,
+            'skipDuplicateChecking' => !empty($data->skipDuplicateChecking),
+            'idleMode' => !empty($data->idleMode),
+            'silentMode' => !empty($data->silentMode),
+        ];

-        if (array_key_exists('updateBy', $data)) {
-            $importParams['updateBy'] = $data['updateBy'];
+        if (property_exists($data, 'updateBy')) {
+            $importParams['updateBy'] = $data->updateBy;
        }

-        $attachmentId = $data['attachmentId'];
+        $attachmentId = $data->attachmentId;

-        if (!$this->getAcl()->check($data['entityType'], 'edit')) {
+        if (!$this->getAcl()->check($data->entityType, 'edit')) {
            throw new Forbidden();
        }

-        return $this->getService('Import')->import($data['entityType'], $data['fields'], $attachmentId, $importParams);
+        return $this->getService('Import')->import($data->entityType, $data->attributeList, $attachmentId, $importParams);
    }

    public function postActionUnmarkAsDuplicate($params, $data)
    {
-        if (empty($data['id']) || empty($data['entityType']) || empty($data['entityId'])) {
+        if (empty($data->id) || empty($data->entityType) || empty($data->entityId)) {
            throw new BadRequest();
        }
-        $this->getService('Import')->unmarkAsDuplicate($data['id'], $data['entityType'], $data['entityId']);
+        $this->getService('Import')->unmarkAsDuplicate($data->id, $data->entityType, $data->entityId);
        return true;
    }
 }
-
--- a/application/Espo/Controllers/InboundEmail.php
+++ b/application/Espo/Controllers/InboundEmail.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -41,33 +41,28 @@ class InboundEmail extends \Espo\Core\Controllers\Record
        }
    }

-    public function actionGetFolders($params, $data, $request)
+    public function postActionGetFolders($params, $data, $request)
    {
-        return $this->getRecordService()->getFolders(array(
-            'host' => $request->get('host'),
-            'port' => $request->get('port'),
-            'ssl' => $request->get('ssl') === 'true',
-            'username' => $request->get('username'),
-            'password' => $request->get('password'),
-            'id' => $request->get('id')
-        ));
+        return $this->getRecordService()->getFolders([
+            'host' => $data->host ?? null,
+            'port' => $data->port ?? null,
+            'ssl' =>  $data->ssl ?? false,
+            'username' => $data->username ?? null,
+            'password' => $data->password ?? null,
+            'id' => $data->id ?? null,
+        ]);
    }

-    public function actionTestConnection($params, $data, $request)
+    public function postActionTestConnection($params, $data, $request)
    {
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
-
-        if (is_null($data['password'])) {
-            $inboundEmail = $this->getEntityManager()->getEntity('InboundEmail', $data['id']);
-            if (!$inboundEmail) {
+        if (is_null($data->password)) {
+            $inboundEmail = $this->getEntityManager()->getEntity('InboundEmail', $data->id);
+            if (!$inboundEmail || !$inboundEmail->id) {
                throw new Error();
            }
-            $data['password'] = $this->getContainer()->get('crypt')->decrypt($inboundEmail->get('password'));
+            $data->password = $this->getContainer()->get('crypt')->decrypt($inboundEmail->get('password'));
        }

-        return $this->getRecordService()->testConnection($data);
+        return $this->getRecordService()->testConnection(get_object_vars($data));
    }
-
 }
--- a/application/Espo/Controllers/Integration.php
+++ b/application/Espo/Controllers/Integration.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -79,7 +79,6 @@ class Integration extends \Espo\Core\Controllers\Record

        $this->getConfig()->save();

-
        return $entity->toArray();
    }
 }
--- a/application/Espo/Controllers/Job.php
+++ b/application/Espo/Controllers/Job.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -41,39 +41,38 @@ class Job extends \Espo\Core\Controllers\Record
        }
    }

-    public function actionCreate($params, $data, $request)
+    public function beforeCreate()
    {
        throw new Forbidden();
    }

-    public function actionUpdate($params, $data, $request)
+    public function beforeUpdate()
    {
        throw new Forbidden();
    }

-    public function actionPatch($params, $data, $request)
+    public function beforePatch()
    {
        throw new Forbidden();
    }

-    public function actionListLinked($params, $data, $request)
+    public function beforeListLinked()
    {
        throw new Forbidden();
    }

-    public function actionMassUpdate($params, $data, $request)
+    public function beforeMassUpdate()
    {
        throw new Forbidden();
    }

-    public function actionCreateLink($params, $data, $request)
+    public function beforeCreateLink()
    {
        throw new Forbidden();
    }

-    public function actionRemoveLink($params, $data, $request)
+    public function beforeRemoveLink()
    {
        throw new Forbidden();
    }
 }
-
--- a/application/Espo/Controllers/LabelManager.php
+++ b/application/Espo/Controllers/LabelManager.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -53,23 +53,23 @@ class LabelManager extends \Espo\Core\Controllers\Base

    public function postActionGetScopeData($params, $data, $request)
    {
-        if (empty($data['scope']) || empty($data['language'])) {
+        if (empty($data->scope) || empty($data->language)) {
            throw new BadRequest();
        }
        $labelManager = $this->getContainer()->get('injectableFactory')->createByClassName('\\Espo\\Core\\Utils\\LabelManager');
-        return $labelManager->getScopeData($data['language'], $data['scope']);
+        return $labelManager->getScopeData($data->language, $data->scope);
    }

    public function postActionSaveLabels($params, $data)
    {
-        if (empty($data['scope']) || empty($data['language']) || !isset($data['labels'])) {
+        if (empty($data->scope) || empty($data->language) || !isset($data->labels)) {
            throw new BadRequest();
        }

-        $labels = get_object_vars($data['labels']);
+        $labels = get_object_vars($data->labels);

        $labelManager = $this->getContainer()->get('injectableFactory')->createByClassName('\\Espo\\Core\\Utils\\LabelManager');
-        $returnData = $labelManager->saveLabels($data['language'], $data['scope'], $labels);
+        $returnData = $labelManager->saveLabels($data->language, $data->scope, $labels);

        $this->getContainer()->get('dataManager')->clearCache();

--- a/application/Espo/Controllers/LastViewed.php
+++ b/application/Espo/Controllers/LastViewed.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -35,12 +35,24 @@ class LastViewed extends \Espo\Core\Controllers\Base
 {
    public function getActionIndex($params, $data, $request)
    {
-        $result = $this->getServiceFactory()->create('LastViewed')->get();
+        $params = [];

-        return [
-            'total' => $result['total'],
-            'list' => isset($result['collection']) ? $result['collection']->toArray() : $result['list']
+        $params['offset'] = $request->get('offset', 0);
+        $params['maxSize'] = $request->get('maxSize');
+
+        $maxSizeLimit = $this->getConfig()->get('recordListMaxSizeLimit', \Espo\Core\Controllers\Record::MAX_SIZE_LIMIT);
+        if (empty($params['maxSize'])) {
+            $params['maxSize'] = $maxSizeLimit;
+        }
+        if (!empty($params['maxSize']) && $params['maxSize'] > $maxSizeLimit) {
+            throw new Forbidden("Max size should should not exceed " . $maxSizeLimit . ". Use offset and limit.");
+        }
+
+        $result = $this->getServiceFactory()->create('LastViewed')->getList($params);
+
+        return (object) [
+            'total' => $result->total,
+            'list' => $result->collection->getValueMapList()
        ];
    }
 }
-
--- a/application/Espo/Controllers/Layout.php
+++ b/application/Espo/Controllers/Layout.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -39,15 +39,15 @@ class Layout extends \Espo\Core\Controllers\Base
 {
    public function actionRead($params, $data)
    {
-        $data = $this->getContainer()->get('layout')->get($params['scope'], $params['name']);
-        if (empty($data)) {
-            throw new NotFound("Layout " . $params['scope'] . ":" . $params['name'] . ' is not found.');
-        }
-        return $data;
+        return $this->getServiceFactory()->create('Layout')->getForFrontend($params['scope'], $params['name']);
    }

    public function actionUpdate($params, $data, $request)
    {
+        if (is_object($data)) {
+            $data = get_object_vars($data);
+        }
+
        if (!$this->getUser()->isAdmin()) {
            throw new Forbidden();
        }
@@ -74,15 +74,18 @@ class Layout extends \Espo\Core\Controllers\Base
        return $this->actionUpdate($params, $data, $request);
    }

-    public function actionResetToDefault($params, $data, $request)
+    public function postActionResetToDefault($params, $data, $request)
    {
-        if (!$request->isPost()) {
-            throw new BadRequest();
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
        }
-        if (empty($data['scope']) || empty($data['name'])) {
+
+        if (empty($data->scope) || empty($data->name)) {
            throw new BadRequest();
        }

-        return $this->getContainer()->get('layout')->resetToDefault($data['scope'], $data['name']);
+        $this->getContainer()->get('dataManager')->updateCacheTimestamp();
+
+        return $this->getContainer()->get('layout')->resetToDefault($data->scope, $data->name);
    }
 }
--- a/application/Espo/Controllers/LeadCapture.php
+++ b/application/Espo/Controllers/LeadCapture.php
@@ -0,0 +1,79 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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;
+use \Espo\Core\Exceptions\NotFound;
+
+class LeadCapture extends \Espo\Core\Controllers\Record
+{
+    public function postActionLeadCapture($params, $data, $request, $response)
+    {
+        if (empty($params['apiKey'])) throw new BadRequest('No API key provided.');
+        if (empty($data)) throw new BadRequest('No payload provided.');
+
+        $allowOrigin = $this->getConfig()->get('leadCaptureAllowOrigin', '*');
+        $response->headers->set('Access-Control-Allow-Origin', $allowOrigin);
+
+        return $this->getRecordService()->leadCapture($params['apiKey'], $data);
+    }
+
+    public function optionsActionLeadCapture($params, $data, $request, $response)
+    {
+        if (empty($params['apiKey'])) throw new BadRequest('No API key provided.');
+
+        if (!$this->getRecordService()->isApiKeyValid($params['apiKey'])) {
+            throw new NotFound();
+        }
+
+        $allowOrigin = $this->getConfig()->get('leadCaptureAllowOrigin', '*');
+
+        $response->headers->set('Access-Control-Allow-Headers', 'Content-Type, Accept');
+        $response->headers->set('Access-Control-Allow-Origin', $allowOrigin);
+        $response->headers->set('Access-Control-Allow-Methods', 'POST');
+
+        return true;
+    }
+
+    public function postActionGenerateNewApiKey($params, $data, $request)
+    {
+        if (empty($data->id)) throw new BadRequest();
+
+        return $this->getRecordService()->generateNewApiKeyForEntity($data->id)->getValueMap();
+    }
+
+    public function getActionSmtpAccountDataList()
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+
+        return $this->getServiceFactory()->create('LeadCapture')->getSmtpAccountDataList();
+    }
+}
--- a/application/Espo/Controllers/LeadCaptureLogRecord.php
+++ b/application/Espo/Controllers/LeadCaptureLogRecord.php
@@ -0,0 +1,38 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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 LeadCaptureLogRecord extends \Espo\Core\Controllers\Record
+{
+
+}
--- a/application/Espo/Controllers/Metadata.php
+++ b/application/Espo/Controllers/Metadata.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -36,7 +36,7 @@ class Metadata extends \Espo\Core\Controllers\Base

    public function actionRead($params, $data)
    {
-        return $this->getMetadata()->getAllForFrontend();
+        return $this->getServiceFactory()->create('Metadata')->getDataForFrontend();
    }

    public function getActionGet($params, $data, $request)
--- a/application/Espo/Controllers/Note.php
+++ b/application/Espo/Controllers/Note.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/Controllers/Notification.php
+++ b/application/Espo/Controllers/Notification.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -35,7 +35,7 @@ class Notification extends \Espo\Core\Controllers\Record
 {
    public static $defaultAction = 'list';

-    public function actionList($params, $data, $request)
+    public function getActionList($params, $data, $request, $response)
    {
        $userId = $this->getUser()->id;

@@ -73,29 +73,28 @@ class Notification extends \Espo\Core\Controllers\Record
        return $this->getService('Notification')->markAllRead($userId);
    }

-    public function actionExport($params, $data, $request)
+    public function beforeExport()
    {
        throw new Error();
    }

-    public function actionMassUpdate($params, $data, $request)
+    public function beforeMassUpdate()
    {
        throw new Error();
    }

-    public function actionCreateLink($params, $data, $request)
+    public function beforeCreateLink()
    {
        throw new Error();
    }

-    public function actionRemoveLink($params, $data, $request)
+    public function beforeRemoveLink()
    {
        throw new Error();
    }

-    public function actionMerge($params, $data, $request)
+    public function beforeMerge()
    {
        throw new Error();
    }
 }
-
--- a/application/Espo/Controllers/Pdf.php
+++ b/application/Espo/Controllers/Pdf.php
@@ -0,0 +1,60 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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;
+use \Espo\Core\Exceptions\Error;
+
+class Pdf extends \Espo\Core\Controllers\Base
+{
+    public function postActionMassPrint($params, $data)
+    {
+        if (empty($data->idList) || !is_array($data->idList)) {
+            throw new BadRequest();
+        }
+        if (empty($data->entityType)) {
+            throw new BadRequest();
+        }
+        if (empty($data->templateId)) {
+            throw new BadRequest();
+        }
+        if (!$this->getAcl()->checkScope('Template')) {
+            throw new Forbidden();
+        }
+        if (!$this->getAcl()->checkScope($data->entityType)) {
+            throw new Forbidden();
+        }
+
+        return [
+            'id' => $this->getServiceFactory()->create('Pdf')->massGenerate($data->entityType, $data->idList, $data->templateId, true)
+        ];
+    }
+}
--- a/application/Espo/Controllers/Portal.php
+++ b/application/Espo/Controllers/Portal.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/Controllers/PortalRole.php
+++ b/application/Espo/Controllers/PortalRole.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/Controllers/Preferences.php
+++ b/application/Espo/Controllers/Preferences.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -88,16 +88,16 @@ class Preferences extends \Espo\Core\Controllers\Base
            throw new BadRequest();
        }

-        if ($this->getAcl()->getLevel('Preferences', 'read') === 'no') {
+        if ($this->getAcl()->getLevel('Preferences', 'edit') === 'no') {
            throw new Forbidden();
        }

        foreach ($this->getAcl()->getScopeForbiddenAttributeList('Preferences', 'edit') as $attribute) {
-            unset($data[$attribute]);
+            unset($data->$attribute);
        }

-        if (array_key_exists('smtpPassword', $data)) {
-            $data['smtpPassword'] = $this->getCrypt()->encrypt($data['smtpPassword']);
+        if (property_exists($data, 'smtpPassword')) {
+            $data->smtpPassword = $this->getCrypt()->encrypt($data->smtpPassword);
        }

        $user = $this->getEntityManager()->getEntity('User', $userId);
@@ -113,7 +113,7 @@ class Preferences extends \Espo\Core\Controllers\Base

            $entity->clear('smtpPassword');

-            return $entity->toArray();
+            return $entity->getValueMap();
        }
        throw new Error();
    }
@@ -132,7 +132,7 @@ class Preferences extends \Espo\Core\Controllers\Base

        $entity->set('smtpEmailAddress', $user->get('emailAddress'));
        $entity->set('name', $user->get('name'));
-        $entity->set('isPortalUser', $user->get('isPortalUser'));
+        $entity->set('isPortalUser', $user->isPortal());

        $entity->clear('smtpPassword');

@@ -140,7 +140,47 @@ class Preferences extends \Espo\Core\Controllers\Base
            $entity->clear($attribute);
        }

-        return $entity->toArray();
+        return $entity->getValueMap();
+    }
+
+    public function postActionResetDashboard($params, $data)
+    {
+        if (empty($data->id)) throw new BadRequest();
+
+        $userId = $data->id;
+
+        $this->handleUserAccess($userId);
+
+        $user = $this->getEntityManager()->getEntity('User', $userId);
+        $preferences = $this->getEntityManager()->getEntity('Preferences', $userId);
+        if (!$user)  throw new NotFound();
+        if (!$preferences)  throw new NotFound();
+
+        if ($user->isPortal()) throw new Forbidden();
+
+        if ($this->getAcl()->getLevel('Preferences', 'edit') === 'no') {
+            throw new Forbidden();
+        }
+
+        $forbiddenAttributeList = $this->getAcl()->getScopeForbiddenAttributeList('Preferences', 'edit');
+
+        if (in_array('dashboardLayout', $forbiddenAttributeList)) {
+            throw new Forbidden();
+        }
+
+        $dashboardLayout = $this->getConfig()->get('dashboardLayout');
+        $dashletsOptions = $this->getConfig()->get('dashletsOptions');
+
+        $preferences->set([
+            'dashboardLayout' => $dashboardLayout,
+            'dashletsOptions' => $dashletsOptions
+        ]);
+
+        $this->getEntityManager()->saveEntity($preferences);
+
+        return (object) [
+            'dashboardLayout' => $preferences->get('dashboardLayout'),
+            'dashletsOptions' => $preferences->get('dashletsOptions')
+        ];
    }
 }
-
--- a/application/Espo/Controllers/Role.php
+++ b/application/Espo/Controllers/Role.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/application/Espo/Controllers/ScheduledJob.php
+++ b/application/Espo/Controllers/ScheduledJob.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -25,10 +25,12 @@
 *
 * 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 ScheduledJob extends \Espo\Core\Controllers\Record
 {
    protected function checkControllerAccess()
@@ -38,4 +40,3 @@ class ScheduledJob extends \Espo\Core\Controllers\Record
        }
    }
 }
-
--- a/application/Espo/Controllers/ScheduledJobLogRecord.php
+++ b/application/Espo/Controllers/ScheduledJobLogRecord.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -25,10 +25,12 @@
 *
 * 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 ScheduledJobLogRecord extends \Espo\Core\Controllers\Record
 {
    protected function checkControllerAccess()
@@ -38,4 +40,3 @@ class ScheduledJobLogRecord extends \Espo\Core\Controllers\Record
        }
    }
 }
-
--- a/application/Espo/Controllers/Settings.php
+++ b/application/Espo/Controllers/Settings.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -29,30 +29,23 @@

 namespace Espo\Controllers;

-use \Espo\Core\Exceptions\Error;
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\BadRequest;

 class Settings extends \Espo\Core\Controllers\Base
 {
    protected function getConfigData()
    {
-        if ($this->getUser()->id == 'system') {
-            $data = $this->getConfig()->getData();
-        } else {
-            $data = $this->getConfig()->getData($this->getUser()->isAdmin());
+        $data = $this->getServiceFactory()->create('Settings')->getConfigData();
+
+        $data->jsLibs = $this->getMetadata()->get(['app', 'jsLibs']);
+
+        unset($data->loginView);
+        $loginView = $this->getMetadata()->get(['clientDefs', 'App', 'loginView']);
+        if ($loginView) {
+            $data->loginView = $loginView;
        }

-        $fieldDefs = $this->getMetadata()->get('entityDefs.Settings.fields');
-
-        foreach ($fieldDefs as $field => $d) {
-            if ($d['type'] == 'password') {
-                unset($data[$field]);
-            }
-        }
-
-        $data['jsLibs'] = $this->getMetadata()->get('app.jsLibs');
-
        return $data;
    }

@@ -76,25 +69,7 @@ class Settings extends \Espo\Core\Controllers\Base
            throw new BadRequest();
        }

-        if (
-            (isset($data['useCache']) && $data['useCache'] != $this->getConfig()->get('useCache'))
-            ||
-            (isset($data['aclStrictMode']) && $data['aclStrictMode'] !== $this->getConfig()->get('aclStrictMode'))
-        ) {
-            $this->getContainer()->get('dataManager')->clearCache();
-        }
-
-        $this->getConfig()->setData($data, $this->getUser()->isAdmin());
-        $result = $this->getConfig()->save();
-        if ($result === false) {
-            throw new Error('Cannot save settings');
-        }
-
-        /** Rebuild for Currency Settings */
-        if (isset($data['baseCurrency']) || isset($data['currencyRates'])) {
-            $this->getContainer()->get('dataManager')->rebuildDatabase(array());
-        }
-        /** END Rebuild for Currency Settings */
+        $this->getServiceFactory()->create('Settings')->setConfigData($data);

        return $this->getConfigData();
    }
@@ -105,10 +80,12 @@ class Settings extends \Espo\Core\Controllers\Base
            throw new Forbidden();
        }

-        if (!isset($data['password'])) {
-            $data['password'] = $this->getConfig()->get('ldapPassword');
+        if (!isset($data->password)) {
+            $data->password = $this->getConfig()->get('ldapPassword');
        }

+        $data = get_object_vars($data);
+
        $ldapUtils = new \Espo\Core\Utils\Authentication\LDAP\Utils();
        $options = $ldapUtils->normalizeOptions($data);

--- a/application/Espo/Controllers/Stream.php
+++ b/application/Espo/Controllers/Stream.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -46,27 +46,64 @@ class Stream extends \Espo\Core\Controllers\Base
        $maxSize = intval($request->get('maxSize'));
        $after = $request->get('after');
        $filter = $request->get('filter');
+        $skipOwn = $request->get('skipOwn') === 'true';

        $service = $this->getService('Stream');

+        $maxSizeLimit = $this->getConfig()->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
        if (empty($maxSize)) {
-            $maxSize = self::MAX_SIZE_LIMIT;
+            $maxSize = $maxSizeLimit;
        }
-        if (!empty($maxSize) && $maxSize > self::MAX_SIZE_LIMIT) {
-            throw new Forbidden();
+        if (!empty($maxSize) && $maxSize > $maxSizeLimit) {
+            throw new Forbidden("Max size should should not exceed " . $maxSizeLimit . ". Use offset and limit.");
        }

-        $result = $service->find($scope, $id, array(
+        $result = $service->find($scope, $id, [
            'offset' => $offset,
            'maxSize' => $maxSize,
            'after' => $after,
-            'filter' => $filter
-        ));
+            'filter' => $filter,
+            'skipOwn' => $skipOwn,
+        ]);

-        return array(
-            'total' => $result['total'],
-            'list' => $result['collection']->toArray()
-        );
+        return (object) [
+            'total' => $result->total,
+            'list' => $result->collection->getValueMapList()
+        ];
+    }
+
+    public function getActionListPosts($params, $data, $request)
+    {
+        $scope = $params['scope'];
+        $id = isset($params['id']) ? $params['id'] : null;
+
+        $offset = intval($request->get('offset'));
+        $maxSize = intval($request->get('maxSize'));
+        $after = $request->get('after');
+
+        $where = $request->get('where');
+
+        $service = $this->getService('Stream');
+
+        $maxSizeLimit = $this->getConfig()->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
+        if (empty($maxSize)) {
+            $maxSize = $maxSizeLimit;
+        }
+        if (!empty($maxSize) && $maxSize > $maxSizeLimit) {
+            throw new Forbidden("Max size should should not exceed " . $maxSizeLimit . ". Use offset and limit.");
+        }
+
+        $result = $service->find($scope, $id, [
+            'offset' => $offset,
+            'maxSize' => $maxSize,
+            'after' => $after,
+            'filter' => 'posts',
+            'where' => $where,
+        ]);
+
+        return (object) [
+            'total' => $result->total,
+            'list' => $result->collection->getValueMapList()
+        ];
    }
 }
-
--- a/application/Espo/Controllers/Team.php
+++ b/application/Espo/Controllers/Team.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -31,6 +31,4 @@ namespace Espo\Controllers;

 class Team extends \Espo\Core\Controllers\Record
 {
-
-
 }
--- a/application/Espo/Controllers/Template.php
+++ b/application/Espo/Controllers/Template.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -35,4 +35,3 @@ class Template extends \Espo\Core\Controllers\Record
 {

 }
-
--- a/application/Espo/Controllers/TemplateManager.php
+++ b/application/Espo/Controllers/TemplateManager.php
@@ -0,0 +1,122 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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\Utils as Utils;
+use \Espo\Core\Exceptions\NotFound;
+use \Espo\Core\Exceptions\Error;
+use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\BadRequest;
+
+class TemplateManager extends \Espo\Core\Controllers\Base
+{
+    protected function checkControllerAccess()
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+    }
+
+    public function getActionGetTemplate($params, $data, $request)
+    {
+        $name = $request->get('name');
+        if (empty($name)) throw new BadRequest();
+        $scope = $request->get('scope');
+        $module = null;
+        $module = $this->getMetadata()->get(['app', 'templates', $name, 'module']);
+        $hasSubject = !$this->getMetadata()->get(['app', 'templates', $name, 'noSubject']);
+
+        $templateFileManager = $this->getContainer()->get('templateFileManager');
+
+        $returnData = (object) [];
+        $returnData->body = $templateFileManager->getTemplate($name, 'body', $scope, $module);
+
+        if ($hasSubject) {
+            $returnData->subject = $templateFileManager->getTemplate($name, 'subject', $scope, $module);
+        }
+
+        return $returnData;
+    }
+
+    public function postActionSaveTemplate($params, $data)
+    {
+        $scope = null;
+        if (empty($data->name)) {
+            throw new BadRequest();
+        }
+        if (!empty($data->scope)) {
+            $scope = $data->scope;
+        }
+
+        $templateFileManager = $this->getContainer()->get('templateFileManager');
+
+        if (isset($data->subject)) {
+            $templateFileManager->saveTemplate($data->name, 'subject', $data->subject, $scope);
+        }
+
+        if (isset($data->body)) {
+            $templateFileManager->saveTemplate($data->name, 'body', $data->body, $scope);
+        }
+
+        return true;
+    }
+
+    public function postActionResetTemplate($params, $data)
+    {
+        $scope = null;
+        if (empty($data->name)) {
+            throw new BadRequest();
+        }
+        if (!empty($data->scope)) {
+            $scope = $data->scope;
+        }
+
+        $module = null;
+        $module = $this->getMetadata()->get(['app', 'templates', $data->name, 'module']);
+        $hasSubject = !$this->getMetadata()->get(['app', 'templates', $data->name, 'noSubject']);
+
+        $templateFileManager = $this->getContainer()->get('templateFileManager');
+
+        if ($hasSubject) {
+            $templateFileManager->resetTemplate($data->name, 'subject', $scope);
+        }
+
+        $templateFileManager->resetTemplate($data->name, 'body', $scope);
+
+        $returnData = (object) [];
+        $returnData->body = $templateFileManager->getTemplate($data->name, 'body', $scope, $module);
+
+        if ($hasSubject) {
+            $returnData->subject = $templateFileManager->getTemplate($data->name, 'subject', $scope, $module);
+        }
+
+        return $returnData;
+    }
+}
--- a/application/Espo/Controllers/User.php
+++ b/application/Espo/Controllers/User.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -57,53 +57,81 @@ class User extends \Espo\Core\Controllers\Record

    public function postActionChangeOwnPassword($params, $data, $request)
    {
-        if (!array_key_exists('password', $data) || !array_key_exists('currentPassword', $data)) {
+        if (!property_exists($data, 'password') || !property_exists($data, 'currentPassword')) {
            throw new BadRequest();
        }
-        return $this->getService('User')->changePassword($this->getUser()->id, $data['password'], true, $data['currentPassword']);
+        return $this->getService('User')->changePassword($this->getUser()->id, $data->password, true, $data->currentPassword);
    }

    public function postActionChangePasswordByRequest($params, $data, $request)
    {
-        if (empty($data['requestId']) || empty($data['password'])) {
+        if (empty($data->requestId) || empty($data->password)) {
            throw new BadRequest();
        }

-        $p = $this->getEntityManager()->getRepository('PasswordChangeRequest')->where(array(
-            'requestId' => $data['requestId']
-        ))->findOne();
+        if ($this->getConfig()->get('passwordRecoveryDisabled')) {
+            throw new Forbidden("Password recovery disabled");
+        }

-        if (!$p) {
+        $request = $this->getEntityManager()->getRepository('PasswordChangeRequest')->where([
+            'requestId' => $data->requestId
+        ])->findOne();
+
+        if (!$request) {
            throw new Forbidden();
        }
-        $userId = $p->get('userId');
+
+        $userId = $request->get('userId');
        if (!$userId) {
            throw new Error();
        }

-        $this->getEntityManager()->removeEntity($p);
-
-        if ($this->getService('User')->changePassword($userId, $data['password'])) {
-            return array(
-                'url' => $p->get('url')
-            );
+        if ($this->getService('User')->changePassword($userId, $data->password)) {
+            $this->getEntityManager()->removeEntity($request);
+            return [
+                'url' => $request->get('url')
+            ];
        }
    }

    public function postActionPasswordChangeRequest($params, $data, $request)
    {
-        if (empty($data['userName']) || empty($data['emailAddress'])) {
+        if (empty($data->userName) || empty($data->emailAddress)) {
            throw new BadRequest();
        }

-        $userName = $data['userName'];
-        $emailAddress = $data['emailAddress'];
+        $userName = $data->userName;
+        $emailAddress = $data->emailAddress;
        $url = null;
-        if (!empty($data['url'])) {
-            $url = $data['url'];
+        if (!empty($data->url)) {
+            $url = $data->url;
        }

        return $this->getService('User')->passwordChangeRequest($userName, $emailAddress, $url);
    }
-}

+    public function postActionGenerateNewApiKey($params, $data, $request)
+    {
+        if (empty($data->id)) throw new BadRequest();
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+        return $this->getRecordService()->generateNewApiKeyForEntity($data->id)->getValueMap();
+    }
+
+    public function postActionGenerateNewPassword($params, $data, $request)
+    {
+        if (empty($data->id)) throw new BadRequest();
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+        $this->getRecordService()->generateNewPasswordForUser($data->id);
+        return true;
+    }
+
+    public function beforeCreateLink()
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+    }
+
+    public function beforeRemoveLink($params, $data, $request)
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+    }
+}
--- a/application/Espo/Controllers/UserSecurity.php
+++ b/application/Espo/Controllers/UserSecurity.php
@@ -0,0 +1,77 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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\Error;
+use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\NotFound;
+use \Espo\Core\Exceptions\BadRequest;
+
+class UserSecurity extends \Espo\Core\Controllers\Base
+{
+    protected function checkControllerAccess()
+    {
+        if (!$this->getUser()->isAdmin() && !$this->getUser()->isRegular()) {
+            throw new Forbidden();
+        }
+    }
+
+    public function getActionRead($params, $data, $request)
+    {
+        $id = $params['id'] ?? null;
+
+        if (!$id) throw new BadRequest();
+        if (!$this->getUser()->isAdmin() && $id !== $this->getUser()->id) throw new Forbidden();
+
+        return $this->getService('UserSecurity')->read($id);
+    }
+
+    public function postActionGenerate2FAData($params, $data)
+    {
+        $data = $data ?? (object) [];
+        $id = $data->id;
+
+        if (!$id) throw new BadRequest();
+        if (!$this->getUser()->isAdmin() && $id !== $this->getUser()->id) throw new Forbidden();
+
+        return $this->getService('UserSecurity')->generate2FAData($id, $data);
+    }
+
+    public function putActionUpdate($params, $data)
+    {
+        $id = $params['id'] ?? null;
+        $data = $data ?? (object) [];
+
+        if (!$id) throw new BadRequest();
+        if (!$this->getUser()->isAdmin() && $id !== $this->getUser()->id) throw new Forbidden();
+
+        return $this->getService('UserSecurity')->update($id, $data);
+    }
+}
--- a/application/Espo/Controllers/Webhook.php
+++ b/application/Espo/Controllers/Webhook.php
@@ -0,0 +1,50 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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\Error;
+use \Espo\Core\Exceptions\Forbidden;
+
+class Webhook extends \Espo\Core\Controllers\Record
+{
+    protected function checkControllerAccess()
+    {
+        if (!$this->getUser()->isAdmin() && !$this->getUser()->isApi()) {
+            throw new Forbidden();
+        }
+    }
+
+    public function actionCreate($params, $data, $request, $response = null)
+    {
+        $result = parent::actionCreate($params, $data, $request, $response);
+        if ($response) $response->setStatus(201);
+        return $result;
+    }
+}
--- a/application/Espo/Core/Acl.php
+++ b/application/Espo/Core/Acl.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -124,6 +124,11 @@ class Acl
        return $this->getAclManager()->getScopeForbiddenFieldList($this->getUser(), $scope, $action, $thresholdLevel);
    }

+    public function getScopeForbiddenLinkList($scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        return $this->getAclManager()->getScopeForbiddenLinkList($this->getUser(), $scope, $action, $thresholdLevel);
+    }
+
    public function checkUserPermission($target, $permissionType = 'userPermission')
    {
        return $this->getAclManager()->checkUserPermission($this->getUser(), $target, $permissionType);
@@ -133,5 +138,19 @@ class Acl
    {
        return $this->getAclManager()->checkAssignmentPermission($this->getUser(), $target);
    }
-}

+    public function getScopeRestrictedFieldList($scope, $type)
+    {
+        return $this->getAclManager()->getScopeRestrictedFieldList($scope, $type);
+    }
+
+    public function getScopeRestrictedAttributeList($scope, $type)
+    {
+        return $this->getAclManager()->getScopeRestrictedAttributeList($scope, $type);
+    }
+
+    public function getScopeRestrictedLinkList($scope, $type)
+    {
+        return $this->getAclManager()->getScopeRestrictedLinkList($scope, $type);
+    }
+}
--- a/application/Espo/Core/Acl/Base.php
+++ b/application/Espo/Core/Acl/Base.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -36,15 +36,21 @@ use \Espo\ORM\Entity;

 class Base implements Injectable
 {
-    protected $dependencies = array(
+    protected $dependencyList = [
        'config',
        'entityManager',
-        'aclManager'
-    );
+        'aclManager',
+    ];
+
+    protected $dependencies = []; // for backward compatibility

    protected $scope;

-    protected $injections = array();
+    protected $injections = [];
+
+    protected $ownerUserIdAttribute = null;
+
+    protected $allowDeleteCreatedThresholdPeriod = '24 hours';

    public function inject($name, $object)
    {
@@ -75,12 +81,12 @@ class Base implements Injectable

    protected function addDependency($name)
    {
-        $this->dependencies[] = $name;
+        $this->dependencyList[] = $name;
    }

    public function getDependencyList()
    {
-        return $this->dependencies;
+        return array_merge($this->dependencyList, $this->dependencies);
    }

    protected function getConfig()
@@ -217,7 +223,7 @@ class Base implements Injectable
            }
        }

-        if ($entity->hasAttribute('assignedUsersIds') && $entity->hasRelation('assignedUsers')) {
+        if ($entity->hasLinkMultipleField('assignedUsers')) {
            if ($entity->hasLinkMultipleId('assignedUsers', $user->id)) {
                return true;
            }
@@ -260,16 +266,31 @@ class Base implements Injectable

        if (is_object($data)) {
            if ($data->edit !== 'no' || $data->create !== 'no') {
-                if ($entity->has('createdById') && $entity->get('createdById') == $user->id) {
+                if (
+                    $this->getConfig()->get('aclAllowDeleteCreated')
+                    &&
+                    $entity->has('createdById') && $entity->get('createdById') == $user->id
+                ) {
+                    $isDeletedAllowed = false;
                    if (!$entity->has('assignedUserId')) {
-                        return true;
+                        $isDeletedAllowed = true;
                    } else {
                        if (!$entity->get('assignedUserId')) {
-                            return true;
+                            $isDeletedAllowed = true;
+                        } else if ($entity->get('assignedUserId') == $entity->get('createdById')) {
+                            $isDeletedAllowed = true;
                        }
-                        if ($entity->get('assignedUserId') == $entity->get('createdById')) {
-                            return true;
+                    }
+
+                    if ($isDeletedAllowed) {
+                        $createdAt = $entity->get('createdAt');
+                        if ($createdAt) {
+                            $deleteThresholdPeriod = $this->getConfig()->get('aclAllowDeleteCreatedThresholdPeriod', $this->allowDeleteCreatedThresholdPeriod);
+                            if (\Espo\Core\Utils\DateTime::isAfterThreshold($createdAt, $deleteThresholdPeriod)) {
+                                return false;
+                            }
                        }
+                        return true;
                    }
                }
            }
@@ -277,5 +298,23 @@ class Base implements Injectable

        return false;
    }
-}

+    public function getOwnerUserIdAttribute(Entity $entity)
+    {
+        if ($this->ownerUserIdAttribute) {
+            return $this->ownerUserIdAttribute;
+        }
+
+        if ($entity->hasLinkMultipleField('assignedUsers')) {
+            return 'assignedUsersIds';
+        }
+
+        if ($entity->hasAttribute('assignedUserId')) {
+            return 'assignedUserId';
+        }
+
+        if ($entity->hasAttribute('createdById')) {
+            return 'createdById';
+        }
+    }
+}
--- a/application/Espo/Core/Acl/GlobalRestricton.php
+++ b/application/Espo/Core/Acl/GlobalRestricton.php
@@ -0,0 +1,197 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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\Acl;
+
+class GlobalRestricton
+{
+    protected $fieldTypeList = [
+        'forbidden', // totally forbidden
+        'internal', // reading forbidden, writing allowed
+        'onlyAdmin', // forbidden for non admin users
+        'readOnly', // read-only for all users
+        'nonAdminReadOnly' // read-only for non-admin users
+    ];
+
+    protected $linkTypeList = [
+        'forbidden', // totally forbidden
+        'internal', // reading forbidden, writing allowed
+        'onlyAdmin', // forbidden for non admin users
+        'readOnly', // read-only for all users
+        'nonAdminReadOnly' // read-only for non-admin users
+    ];
+
+    protected $cacheFilePath = 'data/cache/application/entityAcl.php';
+
+    private $metadata;
+
+    private $fileManager;
+
+    private $fieldManagerUtil;
+
+    private $data;
+
+    public function __construct(
+        \Espo\Core\Utils\Metadata $metadata,
+        \Espo\Core\Utils\File\Manager $fileManager,
+        \Espo\Core\Utils\FieldManagerUtil $fieldManagerUtil,
+        bool $useCache = true
+    )
+    {
+        $this->metadata = $metadata;
+        $this->fileManager = $fileManager;
+        $this->fieldManagerUtil = $fieldManagerUtil;
+
+        $isFromCache = false;
+
+        if ($useCache) {
+            if (file_exists($this->cacheFilePath)) {
+                $this->data = include($this->cacheFilePath);
+                $isFromCache = true;
+
+                if (!($this->data instanceof \StdClass)) {
+                    $GLOBALS['log']->error("ACL GlobalRestricton: Bad data fetched from cache.");
+                    $this->data = null;
+                }
+            }
+        }
+
+        if (!$this->data) {
+            $this->buildData();
+        }
+
+        if ($useCache) {
+            if (!$isFromCache) {
+                $this->storeCacheFile();
+            }
+        }
+    }
+
+    protected function storeCacheFile()
+    {
+        $this->getFileManager()->putPhpContents($this->cacheFilePath, $this->data, true);
+    }
+
+    protected function buildData()
+    {
+        $scopeList = array_keys($this->getMetadata()->get(['entityDefs'], []));
+
+        $data = (object) [];
+
+        foreach ($scopeList as $scope) {
+            $fieldList = array_keys($this->getMetadata()->get(['entityDefs', $scope, 'fields'], []));
+            $linkList = array_keys($this->getMetadata()->get(['entityDefs', $scope, 'links'], []));
+
+            $isNotEmpty = false;
+
+            $scopeData = (object) [
+                'fields' => (object) [],
+                'attributes' => (object) [],
+                'links' => (object) []
+            ];
+
+            foreach ($this->fieldTypeList as $type) {
+                $resultFieldList = [];
+                $resultAttributeList = [];
+
+                foreach ($fieldList as $field) {
+                    if ($this->getMetadata()->get(['entityAcl', $scope, 'fields', $field, $type])) {
+                        $isNotEmpty = true;
+                        $resultFieldList[] = $field;
+                        $fieldAttributeList = $this->getFieldManagerUtil()->getAttributeList($scope, $field);
+                        foreach ($fieldAttributeList as $attribute) {
+                            $resultAttributeList[] = $attribute;
+                        }
+                    }
+                }
+
+                $scopeData->fields->$type = $resultFieldList;
+                $scopeData->attributes->$type = $resultAttributeList;
+            }
+            foreach ($this->linkTypeList as $type) {
+                $resultLinkList = [];
+                foreach ($linkList as $link) {
+                    if ($this->getMetadata()->get(['entityAcl', $scope, 'links', $link, $type])) {
+                        $isNotEmpty = true;
+                        $resultLinkList[] = $link;
+                    }
+                }
+                $scopeData->links->$type = $resultLinkList;
+            }
+
+            if ($isNotEmpty) {
+                $data->$scope = $scopeData;
+            }
+        }
+
+        $this->data = $data;
+    }
+
+    protected function getMetadata()
+    {
+        return $this->metadata;
+    }
+
+    protected function getFileManager()
+    {
+        return $this->fileManager;
+    }
+
+    protected function getFieldManagerUtil()
+    {
+        return $this->fieldManagerUtil;
+    }
+
+    public function getScopeRestrictedFieldList($scope, $type)
+    {
+        if (!property_exists($this->data, $scope)) return [];
+        if (!property_exists($this->data->$scope, 'fields')) return [];
+        if (!property_exists($this->data->$scope->fields, $type)) return [];
+
+        return $this->data->$scope->fields->$type;
+    }
+
+    public function getScopeRestrictedAttributeList($scope, $type)
+    {
+        if (!property_exists($this->data, $scope)) return [];
+        if (!property_exists($this->data->$scope, 'attributes')) return [];
+        if (!property_exists($this->data->$scope->attributes, $type)) return [];
+
+        return $this->data->$scope->attributes->$type;
+    }
+
+    public function getScopeRestrictedLinkList($scope, $type)
+    {
+        if (!property_exists($this->data, $scope)) return [];
+        if (!property_exists($this->data->$scope, 'links')) return [];
+        if (!property_exists($this->data->$scope->links, $type)) return [];
+
+        return $this->data->$scope->links->$type;
+    }
+}
--- a/application/Espo/Core/Acl/Table.php
+++ b/application/Espo/Core/Acl/Table.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -59,13 +59,9 @@ class Table

    protected $fieldLevelList = ['yes', 'no'];

-    protected $valuePermissionList = ['assignmentPermission', 'userPermission', 'portalPermission'];
+    protected $valuePermissionHighestLevels = array();

-    protected $valuePrtmissionHighestLevels = array(
-        'assignmentPermission' => 'all',
-        'userPermission' => 'all',
-        'portalPermission' => 'yes'
-    );
+    protected $valuePermissionList = [];

    private $fileManager;

@@ -77,6 +73,8 @@ class Table

    protected $forbiddenFieldsCache = array();

+    protected $isStrictModeForced = false;
+
    protected $isStrictMode = false;

    public function __construct(User $user, Config $config = null, FileManager $fileManager = null, Metadata $metadata = null, FieldManagerUtil $fieldManager = null)
@@ -87,7 +85,11 @@ class Table
            'fieldTableQuickAccess' => (object) [],
        ];

-        $this->isStrictMode = $config->get('aclStrictMode', false);
+        if ($this->isStrictModeForced) {
+            $this->isStrictMode = true;
+        } else {
+            $this->isStrictMode = $config->get('aclStrictMode', true);
+        }

        $this->user = $user;

@@ -104,7 +106,8 @@ class Table
        if ($fileManager) {
            $this->fileManager = $fileManager;
        }
-        $this->valuePermissionList = $this->metadata->get('app.' . $this->type . '.defs.valuePermissionList', $this->valuePermissionList);
+        $this->valuePermissionList = $this->metadata->get(['app', $this->type, 'valuePermissionList'], []);
+        $this->valuePermissionHighestLevels = $this->metadata->get(['app', $this->type, 'valuePermissionHighestLevels'], array());

        $this->initCacheFilePath();

@@ -166,7 +169,7 @@ class Table
        if (isset($this->data->$permission)) {
            return $this->data->$permission;
        }
-        return null;
+        return 'no';
    }

    public function getLevel($scope, $action)
@@ -179,6 +182,15 @@ class Table
        return 'no';
    }

+    public function getHighestLevel($action)
+    {
+        if (in_array($action, $this->booleanActionList)) {
+            return 'yes';
+        } else {
+            return 'all';
+        }
+    }
+
    private function load()
    {
        $valuePermissionLists = (object)[];
@@ -207,6 +219,7 @@ class Table
            $this->applyDisabled($aclTable, $fieldTable);
            $this->applyMandatory($aclTable, $fieldTable);
            $this->applyAdditional($aclTable, $fieldTable, $valuePermissionLists);
+            $this->applyReadOnlyFields($fieldTable);
        } else {
            $aclTable = (object) [];
            foreach ($this->getScopeList() as $scope) {
@@ -241,8 +254,12 @@ class Table
        $this->fillFieldTableQuickAccess();

        if (!$this->getUser()->isAdmin()) {
+            $permissionsDefaultsGroupName = 'permissionsDefaults';
+            if ($this->isStrictMode) {
+                $permissionsDefaultsGroupName = 'permissionsStrictDefaults';
+            }
            foreach ($this->valuePermissionList as $permission) {
-                $this->data->$permission = $this->mergeValueList($valuePermissionLists->$permission, $this->metadata->get('app.'.$this->type.'.default.' . $permission, 'yes'));
+                $this->data->$permission = $this->mergeValueList($valuePermissionLists->$permission, $this->metadata->get(['app', $this->type, $permissionsDefaultsGroupName, $permission, 'yes']));
                if ($this->metadata->get('app.'.$this->type.'.mandatory.' . $permission)) {
                    $this->data->$permission = $this->metadata->get('app.'.$this->type.'.mandatory.' . $permission);
                }
@@ -250,8 +267,8 @@ class Table

        } else {
            foreach ($this->valuePermissionList as $permission) {
-                if (isset($this->valuePrtmissionHighestLevels[$permission])) {
-                    $this->data->$permission = $this->valuePrtmissionHighestLevels[$permission];
+                if (isset($this->valuePermissionHighestLevels[$permission])) {
+                    $this->data->$permission = $this->valuePermissionHighestLevels[$permission];
                    continue;
                }
                $this->data->$permission = 'all';
@@ -404,7 +421,12 @@ class Table
            return;
        }

-        $data = $this->metadata->get('app.'.$this->type.'.default.scopeLevel', array());
+        $defaultsGroupName = 'default';
+        if ($this->isStrictMode) {
+            $defaultsGroupName = 'strictDefault';
+        }
+
+        $data = $this->metadata->get(['app', $this->type, $defaultsGroupName, 'scopeLevel'], []);

        foreach ($data as $scope => $item) {
            if (isset($table->$scope)) continue;
@@ -415,7 +437,7 @@ class Table
            $table->$scope = $value;
        }

-        $defaultFieldData = $this->metadata->get('app.'.$this->type.'.default.fieldLevel', array());
+        $defaultFieldData = $this->metadata->get(['app', $this->type, $defaultsGroupName, 'fieldLevel'], []);

        foreach ($this->getScopeList() as $scope) {
            if (isset($table->$scope) && $table->$scope === false) continue;
@@ -423,7 +445,7 @@ class Table

            $fieldList = array_keys($this->getMetadata()->get("entityDefs.{$scope}.fields", []));

-            $defaultScopeFieldData = $this->metadata->get('app.'.$this->type.'.default.scopeFieldLevel.' . $scope, array());
+            $defaultScopeFieldData = $this->metadata->get('app.'.$this->type.'.'.$defaultsGroupName.'.scopeFieldLevel.' . $scope, []);

            foreach (array_merge($defaultFieldData, $defaultScopeFieldData) as $field => $f) {
                if (!in_array($field, $fieldList)) continue;
@@ -541,7 +563,7 @@ class Table

    protected function applyAdditional(&$table, &$fieldTable, &$valuePermissionLists)
    {
-        if ($this->getUser()->get('isPortalUser')) {
+        if ($this->getUser()->isPortal()) {
            foreach ($this->getScopeList() as $scope) {
                $table->$scope = false;
                unset($fieldTable->$scope);
@@ -701,25 +723,29 @@ class Table
    private function buildCache()
    {
        $this->fileManager->putPhpContents($this->cacheFilePath, $this->data, true);
-        /*$contents = '<' . '?'. 'php return ' .  $this->varExport($this->data)  . ';';
-        $this->fileManager->putContents($this->cacheFilePath, $contents);*/
    }

-    /*private function varExport($variable)
+    protected function applyReadOnlyFields(&$fieldTable)
    {
-        if ($variable instanceof \StdClass) {
-            $result = '(object) ' . $this->varExport(get_object_vars($variable), true);
-        } else if (is_array($variable)) {
-            $array = array();
-            foreach ($variable as $key => $value) {
-                $array[] = var_export($key, true).' => ' . $this->varExport($value, true);
+        // TODO Enable in 5.4.0
+        return;
+        $scopeList = $this->getScopeWithAclList();
+        foreach ($scopeList as $scope) {
+            if (!property_exists($fieldTable, $scope)) continue;
+            $fieldList = array_keys($this->getMetadata()->get(['entityDefs', $scope, 'fields'], []));
+            foreach ($fieldList as $field) {
+                if ($this->getMetadata()->get(['entityDefs', $scope, 'fields', $field, 'readOnly'])) {
+                    if (property_exists($fieldTable->$scope, $field)) {
+                        $fieldTable->$scope->$field->edit = 'no';
+                    } else {
+                        $fieldTable->$scope->$field = (object) [];
+                        foreach ($this->fieldActionList as $action) {
+                            $fieldTable->$scope->$field->$action = 'yes';
+                        }
+                        $fieldTable->$scope->$field->edit = 'no';
+                    }
+                }
            }
-            $result = '['.implode(', ', $array).']';
-        } else {
-            $result = var_export($variable, true);
        }
-
-        return $result;
-    }*/
+    }
 }
-
--- a/application/Espo/Core/AclManager.php
+++ b/application/Espo/Core/AclManager.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -41,16 +41,27 @@ class AclManager

    private $metadata;

-    private $implementationHashMap = array();
+    private $implementationHashMap = [];

-    private $tableHashMap = array();
+    private $tableHashMap = [];

    protected $tableClassName = '\\Espo\\Core\\Acl\\Table';

+    protected $userAclClassName = '\\Espo\\Core\\Acl';
+
+    protected $globalRestricton;
+
    public function __construct(Container $container)
    {
        $this->container = $container;
        $this->metadata = $container->get('metadata');
+
+        $this->globalRestricton = new \Espo\Core\Acl\GlobalRestricton(
+            $container->get('metadata'),
+            $container->get('fileManager'),
+            $container->get('fieldManagerUtil'),
+            $container->get('config')->get('useCache')
+        );
    }

    protected function getContainer()
@@ -83,8 +94,8 @@ class AclManager

            if (class_exists($className)) {
                $acl = new $className($scope);
-                $dependencies = $acl->getDependencyList();
-                foreach ($dependencies as $name) {
+                $dependencyList = $acl->getDependencyList();
+                foreach ($dependencyList as $name) {
                    $acl->inject($name, $this->getContainer()->get($name));
                }
                $this->implementationHashMap[$scope] = $acl;
@@ -123,7 +134,7 @@ class AclManager
    public function getLevel(User $user, $scope, $action)
    {
        if ($user->isAdmin()) {
-            return 'all';
+            return $this->getTable($user)->getHighestLevel($action);
        }
        return $this->getTable($user)->getLevel($scope, $action);
    }
@@ -180,9 +191,15 @@ class AclManager

        $impl = $this->getImplementation($scope);

-        $methodName = 'checkEntity' . ucfirst($action);
-        if (method_exists($impl, $methodName)) {
-            return $impl->$methodName($user, $entity, $data);
+        if (!$action) {
+            $action = 'read';
+        }
+
+        if ($action) {
+            $methodName = 'checkEntity' . ucfirst($action);
+            if (method_exists($impl, $methodName)) {
+                return $impl->$methodName($user, $entity, $data);
+            }
        }

        return $impl->checkEntity($user, $entity, $data, $action);
@@ -233,16 +250,80 @@ class AclManager
        return true;
    }

+    protected function getGlobalRestrictionTypeList(User $user, $action = 'read')
+    {
+        $typeList = ['forbidden'];
+
+        if ($action === 'read') {
+            $typeList[] = 'internal';
+        }
+
+        if (!$user->isAdmin()) {
+            $typeList[] = 'onlyAdmin';
+        }
+
+        if ($action === 'edit') {
+            $typeList[] = 'readOnly';
+            if (!$user->isAdmin()) {
+                $typeList[] = 'nonAdminReadOnly';
+            }
+        }
+
+        return $typeList;
+    }
+
    public function getScopeForbiddenAttributeList(User $user, $scope, $action = 'read', $thresholdLevel = 'no')
    {
-        if ($user->isAdmin()) return [];
-        return $this->getTable($user)->getScopeForbiddenAttributeList($scope, $action, $thresholdLevel);
+        $list = [];
+
+        if (!$user->isAdmin()) {
+            $list = $this->getTable($user)->getScopeForbiddenAttributeList($scope, $action, $thresholdLevel);
+        }
+
+        if ($thresholdLevel === 'no') {
+            $list = array_merge(
+                $list,
+                $this->getScopeRestrictedAttributeList($scope, $this->getGlobalRestrictionTypeList($user, $action))
+            );
+            $list = array_values($list);
+        }
+
+        return $list;
    }

    public function getScopeForbiddenFieldList(User $user, $scope, $action = 'read', $thresholdLevel = 'no')
    {
-        if ($user->isAdmin()) return [];
-        return $this->getTable($user)->getScopeForbiddenFieldList($scope, $action, $thresholdLevel);
+        $list = [];
+
+        if (!$user->isAdmin()) {
+            $list = $this->getTable($user)->getScopeForbiddenFieldList($scope, $action, $thresholdLevel);
+        }
+
+        if ($thresholdLevel === 'no') {
+            $list = array_merge(
+                $list,
+                $this->getScopeRestrictedFieldList($scope, $this->getGlobalRestrictionTypeList($user, $action))
+            );
+            $list = array_values($list);
+        }
+
+        return $list;
+    }
+
+
+    public function getScopeForbiddenLinkList(User $user, $scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        $list = [];
+
+        if ($thresholdLevel === 'no') {
+            $list = array_merge(
+                $list,
+                $this->getScopeRestrictedLinkList($scope, $this->getGlobalRestrictionTypeList($user, $action))
+            );
+            $list = array_values($list);
+        }
+
+        return $list;
    }

    public function checkUserPermission(User $user, $target, $permissionType = 'userPermission')
@@ -279,5 +360,53 @@ class AclManager
    {
        return $this->checkUserPermission($user, $target, 'assignmentPermission');
    }
-}

+    public function createUserAcl(User $user)
+    {
+        $className = $this->userAclClassName;
+        $acl = new $className($this, $user);
+        return $acl;
+    }
+
+    public function getScopeRestrictedFieldList($scope, $type)
+    {
+        if (is_array($type)) {
+            $typeList = $type;
+            $list = [];
+            foreach ($typeList as $type) {
+                $list = array_merge($list, $this->globalRestricton->getScopeRestrictedFieldList($scope, $type));
+            }
+            $list = array_values($list);
+            return $list;
+        }
+        return $this->globalRestricton->getScopeRestrictedFieldList($scope, $type);
+    }
+
+    public function getScopeRestrictedAttributeList($scope, $type)
+    {
+        if (is_array($type)) {
+            $typeList = $type;
+            $list = [];
+            foreach ($typeList as $type) {
+                $list = array_merge($list, $this->globalRestricton->getScopeRestrictedAttributeList($scope, $type));
+            }
+            $list = array_values($list);
+            return $list;
+        }
+        return $this->globalRestricton->getScopeRestrictedAttributeList($scope, $type);
+    }
+
+    public function getScopeRestrictedLinkList($scope, $type)
+    {
+        if (is_array($type)) {
+            $typeList = $type;
+            $list = [];
+            foreach ($typeList as $type) {
+                $list = array_merge($list, $this->globalRestricton->getScopeRestrictedLinkList($scope, $type));
+            }
+            $list = array_values($list);
+            return $list;
+        }
+        return $this->globalRestricton->getScopeRestrictedLinkList($scope, $type);
+    }
+}
--- a/application/Espo/Core/AclPortal/Base.php
+++ b/application/Espo/Core/AclPortal/Base.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -104,6 +104,13 @@ class Base extends \Espo\Core\Acl\Base
            }
            if ($inAccount) {
                return true;
+            } else {
+                if (is_null($isOwnContact) && $entity) {
+                    $isOwnContact = $this->checkIsOwnContact($user, $entity);
+                }
+                if ($isOwnContact) {
+                    return true;
+                }
            }
        }

@@ -117,7 +124,6 @@ class Base extends \Espo\Core\Acl\Base
        }

        return false;
-
    }

    public function checkReadOnlyAccount(User $user, $data)
@@ -152,13 +158,13 @@ class Base extends \Espo\Core\Acl\Base
    {
        $accountIdList = $user->getLinkMultipleIdList('accounts');
        if (count($accountIdList)) {
-            if ($entity->hasAttribute('accountId')) {
+            if ($entity->hasAttribute('accountId') && $entity->getRelationParam('account', 'entity') === 'Account') {
                if (in_array($entity->get('accountId'), $accountIdList)) {
                    return true;
                }
            }

-            if ($entity->hasRelation('accounts')) {
+            if ($entity->hasRelation('accounts') && $entity->getRelationParam('accounts', 'entity') === 'Account') {
                $repository = $this->getEntityManager()->getRepository($entity->getEntityType());
                foreach ($accountIdList as $accountId) {
                    if ($repository->isRelated($entity, 'accounts', $accountId)) {
@@ -183,13 +189,13 @@ class Base extends \Espo\Core\Acl\Base
    {
        $contactId = $user->get('contactId');
        if ($contactId) {
-            if ($entity->hasAttribute('contactId')) {
+            if ($entity->hasAttribute('contactId') && $entity->getRelationParam('contact', 'entity') === 'Contact') {
                if ($entity->get('contactId') === $contactId) {
                    return true;
                }
            }

-            if ($entity->hasRelation('contacts')) {
+            if ($entity->hasRelation('contacts') && $entity->getRelationParam('contacts', 'entity') === 'Contact') {
                $repository = $this->getEntityManager()->getRepository($entity->getEntityType());
                if ($repository->isRelated($entity, 'contacts', $contactId)) {
                    return true;
@@ -207,6 +213,4 @@ class Base extends \Espo\Core\Acl\Base

        return false;
    }
-
 }
-
--- a/application/Espo/Core/AclPortal/Table.php
+++ b/application/Espo/Core/AclPortal/Table.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -50,7 +50,7 @@ class Table extends \Espo\Core\Acl\Table

    protected $levelList = ['yes', 'all', 'account', 'contact', 'own', 'no'];

-    protected $valuePermissionList = [];
+    protected $isStrictModeForced = true;

    public function __construct(User $user, Portal $portal, Config $config = null, FileManager $fileManager = null, Metadata $metadata = null, FieldManagerUtil $fieldManager = null)
    {
--- a/application/Espo/Core/Application.php
+++ b/application/Espo/Core/Application.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -81,6 +81,11 @@ class Application
        return $this->container;
    }

+    protected function getConfig()
+    {
+        return $this->getContainer()->get('config');
+    }
+
    public function run($name = 'default')
    {
        $this->routeHooks();
@@ -91,9 +96,10 @@ class Application
    public function runClient()
    {
        $this->getContainer()->get('clientManager')->display();
+        exit;
    }

-    public function runEntryPoint($entryPoint, $data = array(), $final = false)
+    public function runEntryPoint($entryPoint, $data = [], $final = false)
    {
        if (empty($entryPoint)) {
            throw new \Error();
@@ -127,12 +133,19 @@ class Application

            $slim->run();
        } catch (\Exception $e) {
-            $container->get('output')->processError($e->getMessage(), $e->getCode(), true);
+            try {
+                $container->get('output')->processError($e->getMessage(), $e->getCode(), true, $e);
+            } catch (\Slim\Exception\Stop $e) {}
        }
    }

    public function runCron()
    {
+        if ($this->getConfig()->get('cronDisabled')) {
+            $GLOBALS['log']->warning("Cron is not run because it's disabled with 'cronDisabled' param.");
+            return;
+        }
+
        $auth = $this->createAuth();
        $auth->useNoAuth();

@@ -140,6 +153,56 @@ class Application
        $cronManager->run();
    }

+    public function runDaemon()
+    {
+        $maxProcessNumber = $this->getConfig()->get('daemonMaxProcessNumber');
+        $interval = $this->getConfig()->get('daemonInterval');
+        $timeout = $this->getConfig()->get('daemonProcessTimeout');
+
+        $phpExecutablePath = $this->getConfig()->get('phpExecutablePath');
+        if (!$phpExecutablePath) {
+            $phpExecutablePath = (new \Symfony\Component\Process\PhpExecutableFinder)->find();
+        }
+
+        if (!$maxProcessNumber || !$interval) {
+            $GLOBALS['log']->error("Daemon config params are not set.");
+            return;
+        }
+
+        $processList = [];
+        while (true) {
+            $toSkip = false;
+            $runningCount = 0;
+            foreach ($processList as $i => $process) {
+                if ($process->isRunning()) {
+                    $runningCount++;
+                } else {
+                    unset($processList[$i]);
+                }
+            }
+            $processList = array_values($processList);
+            if ($runningCount >= $maxProcessNumber) {
+                $toSkip = true;
+            }
+            if (!$toSkip) {
+                $process = new \Symfony\Component\Process\Process([$phpExecutablePath, 'cron.php']);
+                $process->setTimeout($timeout);
+                $process->run();
+                $processList[] = $process;
+            }
+            sleep($interval);
+        }
+    }
+
+    public function runJob($id)
+    {
+        $auth = $this->createAuth();
+        $auth->useNoAuth();
+
+        $cronManager = new \Espo\Core\CronManager($this->container);
+        $cronManager->runJobById($id);
+    }
+
    public function runRebuild()
    {
        $dataManager = $this->getContainer()->get('dataManager');
@@ -152,9 +215,18 @@ class Application
        $dataManager->clearCache();
    }

+    public function runCommand(string $command)
+    {
+        $auth = $this->createAuth();
+        $auth->useNoAuth();
+
+        $consoleCommandManager = $this->getContainer()->get('consoleCommandManager');
+        return $consoleCommandManager->run($command);
+    }
+
    public function isInstalled()
    {
-        $config = $this->getContainer()->get('config');
+        $config = $this->getConfig();

        if (file_exists($config->getConfigPath()) && $config->get('isInstalled')) {
            return true;
@@ -176,7 +248,7 @@ class Application
        try {
            $auth = $this->createAuth();
        } catch (\Exception $e) {
-            $container->get('output')->processError($e->getMessage(), $e->getCode());
+            $container->get('output')->processError($e->getMessage(), $e->getCode(), false, $e);
        }

        $apiAuth = $this->createApiAuth($auth);
@@ -192,7 +264,7 @@ class Application
            }

            $routeOptions = call_user_func($route->getCallable());
-            $routeKeys = is_array($routeOptions) ? array_keys($routeOptions) : array();
+            $routeKeys = is_array($routeOptions) ? array_keys($routeOptions) : [];

            if (!in_array('controller', $routeKeys, true)) {
                return $container->get('output')->render($routeOptions);
@@ -223,10 +295,10 @@ class Application

            try {
                $controllerManager = $this->getContainer()->get('controllerManager');
-                $result = $controllerManager->process($controllerName, $actionName, $params, $data, $slim->request());
+                $result = $controllerManager->process($controllerName, $actionName, $params, $data, $slim->request(), $slim->response());
                $container->get('output')->render($result);
            } catch (\Exception $e) {
-                $container->get('output')->processError($e->getMessage(), $e->getCode());
+                $container->get('output')->processError($e->getMessage(), $e->getCode(), false, $e);
            }
        });

@@ -243,24 +315,22 @@ class Application

    protected function getRouteList()
    {
-        $routes = new \Espo\Core\Utils\Route($this->getContainer()->get('config'), $this->getMetadata(), $this->getContainer()->get('fileManager'));
-
-
+        $routes = new \Espo\Core\Utils\Route($this->getConfig(), $this->getMetadata(), $this->getContainer()->get('fileManager'));
        return $routes->getAll();
    }

    protected function initRoutes()
    {
-        $crudList = array_keys($this->getContainer()->get('config')->get('crud'));
+        $crudList = array_keys($this->getConfig()->get('crud'));

        foreach ($this->getRouteList() as $route) {
            $method = strtolower($route['method']);
-            if (!in_array($method, $crudList)) {
+            if (!in_array($method, $crudList) && $method !== 'options') {
                $GLOBALS['log']->error('Route: Method ['.$method.'] does not exist. Please check your route ['.$route['route'].']');
                continue;
            }

-            $currentRoute = $this->getSlim()->$method($route['route'], function() use ($route) {   //todo change "use" for php 5.4
+            $currentRoute = $this->getSlim()->$method($route['route'], function() use ($route) {
                return $route['params'];
            });

@@ -272,31 +342,8 @@ class Application

    protected function initAutoloads()
    {
-        $autoload = new \Espo\Core\Utils\Autoload($this->getContainer()->get('config'), $this->getMetadata(), $this->getContainer()->get('fileManager'));
-
-        try {
-            $autoloadList = $autoload->getAll();
-        } catch (\Exception $e) {} //bad permissions
-
-        if (empty($autoloadList)) {
-            return;
-        }
-
-        $namespacesPath = 'vendor/composer/autoload_namespaces.php';
-        $existingNamespaces = file_exists($namespacesPath) ? include($namespacesPath) : array();
-        if (!empty($existingNamespaces) && is_array($existingNamespaces)) {
-            $existingNamespaces = array_keys($existingNamespaces);
-        }
-
-        $classLoader = new \Composer\Autoload\ClassLoader();
-
-        foreach ($autoloadList as $prefix => $path) {
-            if (!in_array($prefix, $existingNamespaces)) {
-                $classLoader->add($prefix, $path);
-            }
-        }
-
-        $classLoader->register(true);
+        $autoload = new \Espo\Core\Utils\Autoload($this->getConfig(), $this->getMetadata(), $this->getContainer()->get('fileManager'));
+        $autoload->register();
    }

    public function setBasePath($basePath)
@@ -315,7 +362,9 @@ class Application
            return $_GET['portalId'];
        }
        if (!empty($_COOKIE['auth-token'])) {
-            $token = $this->getContainer()->get('entityManager')->getRepository('AuthToken')->where(array('token' => $_COOKIE['auth-token']))->findOne();
+            $token =
+                $this->getContainer()->get('entityManager')
+                    ->getRepository('AuthToken')->where(['token' => $_COOKIE['auth-token']])->findOne();

            if ($token && $token->get('portalId')) {
                return $token->get('portalId');
@@ -327,9 +376,9 @@ class Application
    public function setupSystemUser()
    {
        $user = $this->getContainer()->get('entityManager')->getEntity('User', 'system');
-        $user->sets('isAdmin', true);
+        $user->set('isAdmin', true); // TODO remove in 5.7
+        $user->set('type', 'system');
        $this->getContainer()->setUser($user);
        $this->getContainer()->get('entityManager')->setUser($user);
    }
 }
-
--- a/application/Espo/Core/Console/CommandManager.php
+++ b/application/Espo/Core/Console/CommandManager.php
@@ -0,0 +1,78 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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;
+
+class CommandManager
+{
+    private $container;
+
+    public function __construct(\Espo\Core\Container $container)
+    {
+        $this->container = $container;
+    }
+
+    public function run(string $command)
+    {
+        $command = ucfirst(\Espo\Core\Utils\Util::hyphenToCamelCase($command));
+
+        $argumentList = [];
+        $options = [];
+        $flagList = [];
+
+        $skipIndex = 1;
+        if (isset($_SERVER['argv'][0]) && $_SERVER['argv'][0] === 'command.php') {
+            $skipIndex = 2;
+        }
+
+        foreach ($_SERVER['argv'] as $i => $item) {
+            if ($i < $skipIndex) continue;
+
+            if (strpos($item, '--') === 0 && strpos($item, '=') > 2) {
+                list($name, $value) = explode('=', substr($item, 2));
+                $name = \Espo\Core\Utils\Util::hyphenToCamelCase($name);
+                $options[$name] = $value;
+            } else if (strpos($item, '-') === 0) {
+                $flagList[] = substr($item, 1);
+            } else {
+                $argumentList[] = $item;
+            }
+        }
+
+        $className = '\\Espo\\Core\\Console\\Commands\\' . $command;
+        $className = $this->container->get('metadata')->get(['app', 'consoleCommands', $command, 'className'], $className);
+        if (!class_exists($className)) {
+            $msg = "Command '{$command}' does not exist.";
+            echo $msg . "\n";
+            throw new \Espo\Core\Exceptions\Error($msg);
+        }
+        $impl = new $className($this->container);
+        return $impl->run($options, $flagList, $argumentList);
+    }
+}
--- a/application/Espo/Core/Console/Commands/AclCheck.php
+++ b/application/Espo/Core/Console/Commands/AclCheck.php
@@ -0,0 +1,87 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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;
+
+class AclCheck extends Base
+{
+    public function run($options)
+    {
+        $userId = $options['userId'] ?? null;
+        $scope = $options['scope'] ?? null;
+        $id = $options['id'] ?? null;
+        $action = $options['action'] ?? null;
+
+        if (empty($userId)) return;
+        if (empty($scope)) return;
+        if (empty($id)) return;
+
+        $container = $this->getContainer();
+        $entityManager = $container->get('entityManager');
+
+        $user = $entityManager->getEntity('User', $userId);
+        if (!$user) return;
+
+        if ($user->isPortal()) {
+            $portalIdList = $user->getLinkMultipleIdList('portals');
+            foreach ($portalIdList as $portalId) {
+                $application = new \Espo\Core\Portal\Application($portalId);
+                $containerPortal = $application->getContainer();
+                $entityManager = $containerPortal->get('entityManager');
+
+                $user = $entityManager->getEntity('User', $userId);
+                if (!$user) return;
+
+                $result = $this->check($user, $scope, $id, $action, $containerPortal);
+                if ($result) {
+                    return 'true';
+                }
+            }
+            return;
+        }
+
+        if ($this->check($user, $scope, $id, $action, $container)) {
+            return 'true';
+        }
+    }
+
+    protected function check($user, $scope, $id, $action, $container)
+    {
+        $entityManager = $container->get('entityManager');
+
+        $entity = $entityManager->getEntity($scope, $id);
+        if (!$entity) return;
+
+        $aclManager = $container->get('aclManager');
+
+        if ($aclManager->check($user, $entity, $action)) {
+            return true;
+        }
+    }
+}
--- a/application/Espo/Core/Console/Commands/AuthTokenCheck.php
+++ b/application/Espo/Core/Console/Commands/AuthTokenCheck.php
@@ -0,0 +1,56 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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;
+
+class AuthTokenCheck extends Base
+{
+    public function run($options, $flagList, $argumentList)
+    {
+        $token = $argumentList[0] ?? null;
+        if (empty($token)) return;
+
+        $entityManager = $this->getContainer()->get('entityManager');
+
+        $authToken = $entityManager->getRepository('AuthToken')->where([
+            'token' => $token,
+            'isActive' => true,
+        ])->findOne();
+
+        if (!$authToken) return;
+        if (!$authToken->get('userId')) return;
+
+        $userId = $authToken->get('userId');
+
+        $user = $entityManager->getEntity('User', $userId);
+        if (!$user) return;
+
+        return $user->id;
+    }
+}
--- a/application/Espo/Core/Console/Commands/Base.php
+++ b/application/Espo/Core/Console/Commands/Base.php
@@ -0,0 +1,45 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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;
+
+abstract class Base
+{
+    private $container;
+
+    public function __construct(\Espo\Core\Container $container)
+    {
+        $this->container = $container;
+    }
+
+    protected function getContainer()
+    {
+        return $this->container;
+    }
+}
--- a/application/Espo/Core/Console/Commands/ClearCache.php
+++ b/application/Espo/Core/Console/Commands/ClearCache.php
@@ -0,0 +1,39 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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;
+
+class ClearCache extends Base
+{
+    public function run()
+    {
+        $this->getContainer()->get('dataManager')->clearCache();
+        echo "Cache has been cleared.\n";
+    }
+}
--- a/application/Espo/Core/Console/Commands/Rebuild.php
+++ b/application/Espo/Core/Console/Commands/Rebuild.php
@@ -0,0 +1,39 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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;
+
+class Rebuild extends Base
+{
+    public function run()
+    {
+        $this->getContainer()->get('dataManager')->rebuild();
+        echo "Rebuild has been done.\n";
+    }
+}
--- a/application/Espo/Core/Console/Commands/RunJob.php
+++ b/application/Espo/Core/Console/Commands/RunJob.php
@@ -0,0 +1,68 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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;
+
+class RunJob extends Base
+{
+    public function run($options, $flags, $argumentList)
+    {
+        $jobName = $options['job'] ?? null;
+        $targetId = $options['targetId'] ?? null;
+        $targetType = $options['targetType'] ?? null;
+
+        if (!$jobName && count($argumentList)) {
+            $jobName = $argumentList[0];
+        }
+
+        if (!$jobName) echo "No job specified.\n";
+
+        $jobName = ucfirst(\Espo\Core\Utils\Util::hyphenToCamelCase($jobName));
+
+        $container = $this->getContainer();
+        $entityManager = $container->get('entityManager');
+
+        $job = $entityManager->createEntity('Job', [
+            'name' => $jobName,
+            'job' => $jobName,
+            'targetType' => $targetType,
+            'targetId' => $targetId,
+        ]);
+
+        $cronManager = new \Espo\Core\CronManager($container);
+
+        $result = $cronManager->runJob($job);
+
+        if ($result) {
+            echo "Job '{$jobName}' has been executed.\n";
+        } else {
+            echo "Job '{$jobName}' failed to execute.\n";
+        }
+    }
+}
--- a/application/Espo/Core/Console/Commands/Upgrade.php
+++ b/application/Espo/Core/Console/Commands/Upgrade.php
@@ -0,0 +1,406 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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 Upgrade extends Base
+{
+    protected $upgradeManager;
+
+    protected $upgradeStepList = [
+        'copyBefore',
+        'rebuild',
+        'beforeUpgradeScript',
+        'rebuild',
+        'copy',
+        'rebuild',
+        'copyAfter',
+        'rebuild',
+        'afterUpgradeScript',
+        'rebuild',
+    ];
+
+    public function run($options, $flagList, $argumentList)
+    {
+        $params = $this->normalizeParams($options, $flagList, $argumentList);
+
+        switch ($params['mode']) {
+            case 'local':
+                $this->runLocalUpgrade($params);
+                break;
+
+            default:
+            case 'remote':
+                $this->runRemoteUpgrade($params);
+                break;
+        }
+    }
+
+    /**
+     * Normalize params. Permitted options and flags and $arguments:
+     * -y - without confirmation
+     * -s - single process
+     * --file="EspoCRM-upgrade.zip"
+     * --step="beforeUpgradeScript"
+     * @param  array $options
+     * @param  array $flagList
+     * @param  array $argumentList
+     * @return array
+     */
+    protected function normalizeParams($options, $flagList, $argumentList)
+    {
+        $params = [
+            'mode' => 'remote',
+            'skipConfirmation' => false,
+            'singleProcess' => false,
+        ];
+
+        if (!empty($options['file'])) {
+            $params['mode'] = 'local';
+            $params['file'] = $options['file'];
+        }
+
+        if (in_array('y', $flagList)) {
+            $params['skipConfirmation'] = true;
+        }
+
+        if (in_array('s', $flagList)) {
+            $params['singleProcess'] = true;
+        }
+
+        if (!empty($options['step'])) {
+            $params['step'] = $options['step'];
+        }
+
+        return $params;
+    }
+
+    protected function runLocalUpgrade(array $params)
+    {
+        if (empty($params['file']) || !file_exists($params['file'])) {
+            echo "Upgrade package is not found.\n";
+            return;
+        }
+
+        $packageFile = $params['file'];
+        $fromVersion = $this->getConfig()->get('version');
+
+        fwrite(\STDOUT, "Current version is {$fromVersion}.\n");
+
+        $upgradeId = $this->upload($packageFile);
+        $manifest = $this->getUpgradeManager()->getManifestById($upgradeId);
+        $nextVersion = $manifest['version'];
+
+        if (!$params['skipConfirmation']) {
+            fwrite(\STDOUT, "EspoCRM will be upgraded to version {$nextVersion} now. Enter [Y] to continue.\n");
+
+            if (!$this->confirm()) {
+                echo "Upgrade canceled.\n";
+                return;
+            }
+        }
+
+        fwrite(\STDOUT, "Upgrading... This may take a while...");
+
+        try {
+            $this->runUpgradeProcess($upgradeId, $params);
+        } catch (\Exception $e) {
+            fwrite(\STDOUT, "\n");
+            fwrite(\STDOUT, $e->getMessage() . "\n");
+            return;
+        }
+
+        fwrite(\STDOUT, "\n");
+
+        $app = new \Espo\Core\Application();
+        $currentVerison = $app->getContainer()->get('config')->get('version');
+
+        fwrite(\STDOUT, "Upgrade is complete. Current version is {$currentVerison}.\n");
+
+        $infoData = $this->getVersionInfo();
+        $lastVersion = $infoData->lastVersion ?? null;
+
+        if ($lastVersion && $lastVersion !== $currentVerison && $fromVersion !== $currentVerison) {
+            fwrite(\STDOUT, "Newer version is available.\n");
+            return;
+        }
+
+        if ($lastVersion && $lastVersion === $currentVerison) {
+            fwrite(\STDOUT, "You have the latest version.\n");
+            return;
+        }
+    }
+
+    protected function runRemoteUpgrade(array $params)
+    {
+        $infoData = $this->getVersionInfo();
+        if (!$infoData) return;
+
+        $nextVersion = $infoData->nextVersion ?? null;
+        $lastVersion = $infoData->lastVersion ?? null;
+
+        $fromVersion = $this->getConfig()->get('version');
+
+        fwrite(\STDOUT, "Current version is {$fromVersion}.\n");
+
+        if (!$nextVersion) {
+            echo "There are no available upgrades.\n";
+            return;
+        }
+
+        if (!$params['skipConfirmation']) {
+            fwrite(\STDOUT, "EspoCRM will be upgraded to version {$nextVersion} now. Enter [Y] to continue.\n");
+
+            if (!$this->confirm()) {
+                echo "Upgrade canceled.\n";
+                return;
+            }
+        }
+
+        fwrite(\STDOUT, "Downloading...");
+
+        $upgradePackageFilePath = $this->downloadFile($infoData->nextPackage);
+        if (!$upgradePackageFilePath) return;
+
+        fwrite(\STDOUT, "\n");
+
+        fwrite(\STDOUT, "Upgrading... This may take a while...");
+
+        $upgradeId = $this->upload($upgradePackageFilePath);
+
+        try {
+            $this->runUpgradeProcess($upgradeId, $params);
+        } catch (\Exception $e) {
+            $error = $e->getMessage();
+        }
+
+        $this->getFileManager()->unlink($upgradePackageFilePath);
+
+        fwrite(\STDOUT, "\n");
+
+        if (!empty($error)) {
+            echo $error;
+            return;
+        }
+
+        $app = new \Espo\Core\Application();
+        $currentVerison = $app->getContainer()->get('config')->get('version');
+
+        fwrite(\STDOUT, "Upgrade is complete. Current version is {$currentVerison}.\n");
+
+        if ($lastVersion && $lastVersion !== $currentVerison && $fromVersion !== $currentVerison) {
+            fwrite(\STDOUT, "Newer version is available. Run command again to upgrade.\n");
+            return;
+        }
+
+        if ($lastVersion && $lastVersion === $currentVerison) {
+            fwrite(\STDOUT, "You have the latest version.\n");
+            return;
+        }
+    }
+
+    protected function upload($filePath)
+    {
+        try {
+            $fileData = file_get_contents($filePath);
+            $fileData = 'data:application/zip;base64,' . base64_encode($fileData);
+            $upgradeId = $this->getUpgradeManager()->upload($fileData);
+        } catch (\Exception $e) {
+            die("Error: " . $e->getMessage() . "\n");
+        }
+
+        return $upgradeId;
+    }
+
+    protected function runUpgradeProcess($upgradeId, array $params = [])
+    {
+        $useSingleProcess = array_key_exists('singleProcess', $params) ? $params['singleProcess'] : false;
+
+        $stepList = !empty($params['step']) ? [$params['step']] : $this->upgradeStepList;
+        array_unshift($stepList, 'init');
+        array_push($stepList, 'finalize');
+
+        if (!$useSingleProcess && $this->isShellEnabled()) {
+            return $this->runSteps($upgradeId, $stepList);
+        }
+
+        return $this->runStepsInSingleProcess($upgradeId, $stepList);
+    }
+
+    protected function runStepsInSingleProcess($upgradeId, array $stepList)
+    {
+        $GLOBALS['log']->debug('Installation process ['.$upgradeId.']: Single process mode.');
+
+        try {
+            foreach ($stepList as $stepName) {
+                $upgradeManager = $this->getUpgradeManager(true);
+                $upgradeManager->runInstallStep($stepName, ['id' => $upgradeId]);
+            }
+        } catch (\Exception $e) {
+            $GLOBALS['log']->error('Upgrade Error: ' . $e->getMessage());
+            throw new Error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    protected function runSteps($upgradeId, array $stepList)
+    {
+        $phpExecutablePath = $this->getPhpExecutablePath();
+
+        foreach ($stepList as $stepName) {
+            $command = $phpExecutablePath . " command.php upgrade-step --step=". ucfirst($stepName) ." --id=". $upgradeId;
+
+            $shellResult = shell_exec($command);
+            if ($shellResult !== 'true') {
+                $GLOBALS['log']->error('Upgrade Error: ' . $shellResult);
+                throw new Error($shellResult);
+            }
+        }
+
+        return true;
+    }
+
+    protected function confirm()
+    {
+        $fh = fopen('php://stdin', 'r');
+        $inputLine = trim(fgets($fh));
+        fclose($fh);
+        if (strtolower($inputLine) !== 'y'){
+            return false;
+        }
+        return true;
+    }
+
+    protected function getConfig()
+    {
+        return $this->getContainer()->get('config');
+    }
+
+    protected function getFileManager()
+    {
+        return $this->getContainer()->get('fileManager');
+    }
+
+    protected function getUpgradeManager($reload = false)
+    {
+        if (!$this->upgradeManager || $reload) {
+            $app = new \Espo\Core\Application();
+            $app->setupSystemUser();
+
+            $this->upgradeManager = new \Espo\Core\UpgradeManager($app->getContainer());
+        }
+
+        return $this->upgradeManager;
+    }
+
+    protected function getPhpExecutablePath()
+    {
+        $phpExecutablePath = $this->getConfig()->get('phpExecutablePath');
+
+        if (!$phpExecutablePath) {
+            $phpExecutablePath = (new \Symfony\Component\Process\PhpExecutableFinder)->find();
+        }
+
+        return $phpExecutablePath;
+    }
+
+    protected function getVersionInfo()
+    {
+        $url = 'https://s.espocrm.com/upgrade/next/';
+        $url = $this->getConfig()->get('upgradeNextVersionUrl', $url);
+        $url .= '?fromVersion=' . $this->getConfig()->get('version');
+
+        $ch = curl_init();
+        curl_setopt($ch, \CURLOPT_SSL_VERIFYPEER, true);
+        curl_setopt($ch, \CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, \CURLOPT_URL, $url);
+        $result = curl_exec($ch);
+        curl_close($ch);
+
+        try {
+            $data = json_decode($result);
+        } catch (\Exception $e) {
+            echo "Could not parse info about next version.\n";
+            return;
+        }
+
+        if (!$data) {
+            echo "Could not get info about next version.\n";
+            return;
+        }
+
+        return $data;
+    }
+
+    protected function downloadFile($url)
+    {
+        $localFilePath = 'data/upload/upgrades/' . \Espo\Core\Utils\Util::generateId() . '.zip';
+        $this->getFileManager()->putContents($localFilePath, '');
+
+        if (is_file($url)) {
+            copy($url, $localFilePath);
+        } else {
+            $options = [
+                CURLOPT_FILE  => fopen($localFilePath, 'w'),
+                CURLOPT_TIMEOUT => 3600,
+                CURLOPT_URL => $url
+            ];
+
+            $ch = curl_init();
+            curl_setopt_array($ch, $options);
+            curl_exec($ch);
+            curl_close($ch);
+        }
+
+        if (!$this->getFileManager()->isFile($localFilePath)) {
+            echo "\nCould not download upgrade file.\n";
+            $this->getFileManager()->unlink($localFilePath);
+            return;
+        }
+
+        return realpath($localFilePath);
+    }
+
+    protected function isShellEnabled()
+    {
+        if (!function_exists('exec') || !is_callable('shell_exec')) {
+            return false;
+        }
+
+        $result = shell_exec("echo test");
+        if (empty($result)) {
+            return false;
+        }
+
+        return true;
+    }
+}
--- a/application/Espo/Core/Console/Commands/UpgradeStep.php
+++ b/application/Espo/Core/Console/Commands/UpgradeStep.php
@@ -0,0 +1,71 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 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;
+
+class UpgradeStep extends Base
+{
+    public function run($options, $flagList, $argumentList)
+    {
+        if (empty($options['step'])) {
+            echo "Step is not specified.\n";
+            return;
+        }
+
+        if (empty($options['id'])) {
+            echo "Upgrade ID is not specified.\n";
+            return;
+        }
+
+        $stepName = $options['step'];
+        $upgradeId = $options['id'];
+
+        return $this->runUpgradeStep($stepName, ['id' => $upgradeId]);
+    }
+
+    protected function runUpgradeStep($stepName, array $params)
+    {
+        $app = new \Espo\Core\Application();
+        $app->setupSystemUser();
+
+        $upgradeManager = new \Espo\Core\UpgradeManager($app->getContainer());
+
+        try {
+            $result = $upgradeManager->runInstallStep($stepName, $params); // throw Exception on error
+        } catch (\Exception $e) {
+            die("Error: " . $e->getMessage() . "\n");
+        }
+
+        if (is_bool($result)) {
+            $result = $result ? "true" : "false";
+        }
+
+        return $result;
+    }
+}
--- a/application/Espo/Core/Container.php
+++ b/application/Espo/Core/Container.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -32,17 +32,13 @@ namespace Espo\Core;
 class Container
 {

-    private $data = array();
+    private $data = [];

-
-    /**
-     * Constructor
-     */
    public function __construct()
    {
    }

-    public function get($name)
+    public function get(string $name)
    {
        if (empty($this->data[$name])) {
            $this->load($name);
@@ -67,7 +63,7 @@ class Container
        } else {

            try {
-                $className = $this->get('metadata')->get('app.loaders.' . ucfirst($name));
+                $className = $this->get('metadata')->get(['app', 'loaders', ucfirst($name)]);
            } catch (\Exception $e) {}

            if (!isset($className) || !class_exists($className)) {
@@ -86,10 +82,10 @@ class Container
        return null;
    }

-    protected function getServiceClassName($name, $default)
+    public function getServiceClassName(string $name, string $default)
    {
        $metadata = $this->get('metadata');
-        $className = $metadata->get('app.serviceContainer.classNames.' . $name, $default);
+        $className = $metadata->get(['app', 'serviceContainer', 'classNames',  $name], $default);
        return $className;
    }

@@ -111,6 +107,31 @@ class Container
        );
    }

+    protected function loadLog()
+    {
+        $config = $this->get('config');
+
+        $path = $config->get('logger.path', 'data/logs/espo.log');
+        $rotation = $config->get('logger.rotation', true);
+
+        $log = new \Espo\Core\Utils\Log('Espo');
+        $levelCode = $log::toMonologLevel($config->get('logger.level', 'WARNING'));
+
+        if ($rotation) {
+            $maxFileNumber = $config->get('logger.maxFileNumber', 30);
+            $handler = new \Espo\Core\Utils\Log\Monolog\Handler\RotatingFileHandler($path, $maxFileNumber, $levelCode);
+        } else {
+            $handler = new \Espo\Core\Utils\Log\Monolog\Handler\StreamHandler($path, $levelCode);
+        }
+        $log->pushHandler($handler);
+
+        $errorHandler = new \Monolog\ErrorHandler($log);
+        $errorHandler->registerExceptionHandler(null, false);
+        $errorHandler->registerErrorHandler([], false);
+
+        return $log;
+    }
+
    protected function loadFileManager()
    {
        return new \Espo\Core\Utils\File\Manager(
@@ -151,15 +172,6 @@ class Container
        );
    }

-    protected function loadMailSender()
-    {
-        $className = $this->getServiceClassName('mailSernder', '\\Espo\\Core\\Mail\\Sender');
-        return new $className(
-            $this->get('config'),
-            $this->get('entityManager')
-        );
-    }
-
    protected function loadDateTime()
    {
        return new \Espo\Core\Utils\DateTime(
@@ -184,15 +196,10 @@ class Container
        );
    }

-    protected function loadSelectManagerFactory()
+    protected function loadNotificatorFactory()
    {
-        return new \Espo\Core\SelectManagerFactory(
-            $this->get('entityManager'),
-            $this->get('user'),
-            $this->get('acl'),
-            $this->get('aclManager'),
-            $this->get('metadata'),
-            $this->get('config')
+        return new \Espo\Core\NotificatorFactory(
+            $this
        );
    }

@@ -221,6 +228,14 @@ class Container
        );
    }

+    protected function loadInternalAclManager()
+    {
+        $className = $this->getServiceClassName('acl', '\\Espo\\Core\\AclManager');
+        return new $className(
+            $this->get('container')
+        );
+    }
+
    protected function loadAcl()
    {
        $className = $this->getServiceClassName('acl', '\\Espo\\Core\\Acl');
@@ -247,7 +262,7 @@ class Container
        return new \Espo\Core\Utils\Metadata\OrmMetadata(
            $this->get('metadata'),
            $this->get('fileManager'),
-            $this->get('config')->get('useCache')
+            $this->get('config')
        );
    }

@@ -270,13 +285,23 @@ class Container
        );
    }

+    protected function loadBaseLanguage()
+    {
+        return new \Espo\Core\Utils\Language(
+            'en_US',
+            $this->get('fileManager'),
+            $this->get('metadata'),
+            $this->get('config')->get('useCache')
+        );
+    }
+
    protected function loadDefaultLanguage()
    {
        return new \Espo\Core\Utils\Language(
-            null,
+            \Espo\Core\Utils\Language::detectLanguage($this->get('config')),
            $this->get('fileManager'),
            $this->get('metadata'),
-            $this->get('useCache')
+            $this->get('config')->get('useCache')
        );
    }

@@ -304,8 +329,6 @@ class Container
    protected function loadFieldManager()
    {
        return new \Espo\Core\Utils\FieldManager(
-            $this->get('metadata'),
-            $this->get('language'),
            $this
        );
    }
@@ -325,14 +348,6 @@ class Container
        );
    }

-    protected function loadClientManager()
-    {
-        return new \Espo\Core\Utils\ClientManager(
-            $this->get('config'),
-            $this->get('themeManager')
-        );
-    }
-
    protected function loadInjectableFactory()
    {
        return new \Espo\Core\InjectableFactory(
@@ -345,4 +360,3 @@ class Container
        $this->set('user', $user);
    }
 }
-
--- a/application/Espo/Core/ControllerManager.php
+++ b/application/Espo/Core/ControllerManager.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -40,12 +40,16 @@ class ControllerManager

    private $container;

+    private $controllersHash = null;
+
    public function __construct(\Espo\Core\Container $container)
    {
        $this->container = $container;

        $this->config = $this->container->get('config');
        $this->metadata = $this->container->get('metadata');
+
+        $this->controllersHash = (object) [];
    }

    protected function getConfig()
@@ -58,7 +62,7 @@ class ControllerManager
        return $this->metadata;
    }

-    public function process($controllerName, $actionName, $params, $data, $request)
+    protected function getControllerClassName($controllerName)
    {
        $customClassName = '\\Espo\\Custom\\Controllers\\' . Util::normilizeClassName($controllerName);
        if (class_exists($customClassName)) {
@@ -72,32 +76,48 @@ class ControllerManager
            }
        }

-        if ($data && stristr($request->getContentType(), 'application/json')) {
-            $data = json_decode($data);
-        }
-
-
-        if ($data instanceof \stdClass) {
-            $data = get_object_vars($data);
-        }
-
        if (!class_exists($controllerClassName)) {
            throw new NotFound("Controller '$controllerName' is not found");
        }

-        $controller = new $controllerClassName($this->container, $request->getMethod());
+        return $controllerClassName;
+    }
+
+    public function createController($name)
+    {
+        $controllerClassName = $this->getControllerClassName($name);
+        $controller = new $controllerClassName($this->container);
+
+        return $controller;
+    }
+
+    public function getController($name)
+    {
+        if (!property_exists($this->controllersHash, $name)) {
+            $this->controllersHash->$name = $this->createController($name);
+        }
+        return $this->controllersHash->$name;
+    }
+
+    public function processRequest(\Espo\Core\Controllers\Base $controller, $actionName, $params, $data, $request, $response = null)
+    {
+        if ($data && stristr($request->getContentType(), 'application/json')) {
+            $data = json_decode($data);
+        }

        if ($actionName == 'index') {
-            $actionName = $controllerClassName::$defaultAction;
+            $actionName = $controller::$defaultAction;
        }

+        $requestMethod = $request->getMethod();
+
        $actionNameUcfirst = ucfirst($actionName);

        $beforeMethodName = 'before' . $actionNameUcfirst;
        $actionMethodName = 'action' . $actionNameUcfirst;
        $afterMethodName = 'after' . $actionNameUcfirst;

-        $fullActionMethodName = strtolower($request->getMethod()) . ucfirst($actionMethodName);
+        $fullActionMethodName = strtolower($requestMethod) . ucfirst($actionMethodName);

        if (method_exists($controller, $fullActionMethodName)) {
            $primaryActionMethodName = $fullActionMethodName;
@@ -106,17 +126,24 @@ class ControllerManager
        }

        if (!method_exists($controller, $primaryActionMethodName)) {
-            throw new NotFound("Action '$actionName' (".$request->getMethod().") does not exist in controller '$controllerName'");
+            throw new NotFound("Action {$requestMethod} '{$actionName}' does not exist in controller '".$controller->getName()."'.");
+        }
+
+        // TODO Remove in 5.1.0
+        if ($data instanceof \stdClass) {
+            if ($this->getMetadata()->get(['app', 'deprecatedControllerActions', $controller->getName(), $primaryActionMethodName])) {
+                $data = get_object_vars($data);
+            }
        }

        if (method_exists($controller, $beforeMethodName)) {
-            $controller->$beforeMethodName($params, $data, $request);
+            $controller->$beforeMethodName($params, $data, $request, $response);
        }

-        $result = $controller->$primaryActionMethodName($params, $data, $request);
+        $result = $controller->$primaryActionMethodName($params, $data, $request, $response);

        if (method_exists($controller, $afterMethodName)) {
-            $controller->$afterMethodName($params, $data, $request);
+            $controller->$afterMethodName($params, $data, $request, $response);
        }

        if (is_array($result) || is_bool($result) || $result instanceof \StdClass) {
@@ -126,5 +153,9 @@ class ControllerManager
        return $result;
    }

+    public function process($controllerName, $actionName, $params, $data, $request, $response = null)
+    {
+        $controller = $this->getController($controllerName);
+        return $this->processRequest($controller, $actionName, $params, $data, $request, $response);
+    }
 }
-
--- a/application/Espo/Core/Controllers/Base.php
+++ b/application/Espo/Core/Controllers/Base.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -38,18 +38,12 @@ abstract class Base

    private $container;

-    private $requestMethod;
-
    public static $defaultAction = 'index';

-    public function __construct(Container $container, $requestMethod = null)
+    public function __construct(Container $container)
    {
        $this->container = $container;

-        if (isset($requestMethod)) {
-            $this->setRequestMethod($requestMethod);
-        }
-
        if (empty($this->name)) {
            $name = get_class($this);
            if (preg_match('@\\\\([\w]+)$@', $name, $matches)) {
@@ -61,6 +55,11 @@ abstract class Base
        $this->checkControllerAccess();
    }

+    public function getName()
+    {
+        return $this->name;
+    }
+
    protected function checkControllerAccess()
    {
        return;
@@ -71,21 +70,6 @@ abstract class Base
        return $this->container;
    }

-    /**
-     * Get request method name (Uppercase)
-     *
-     * @return string
-     */
-    protected function getRequestMethod()
-    {
-        return $this->requestMethod;
-    }
-
-    protected function setRequestMethod($requestMethod)
-    {
-        $this->requestMethod = strtoupper($requestMethod);
-    }
-
    protected function getUser()
    {
        return $this->container->get('user');
--- a/application/Espo/Core/Controllers/Record.php
+++ b/application/Espo/Core/Controllers/Record.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -67,13 +67,11 @@ class Record extends Base
    public function actionRead($params, $data, $request)
    {
        $id = $params['id'];
-        $entity = $this->getRecordService()->readEntity($id);
+        $entity = $this->getRecordService()->read($id);

-        if (empty($entity)) {
-            throw new NotFound();
-        }
+        if (!$entity) throw new NotFound();

-        return $entity->toArray();
+        return $entity->getValueMap();
    }

    public function actionPatch($params, $data, $request)
@@ -83,6 +81,8 @@ class Record extends Base

    public function actionCreate($params, $data, $request)
    {
+        if (!is_object($data)) throw new BadRequest();
+
        if (!$request->isPost()) {
            throw new BadRequest();
        }
@@ -93,8 +93,8 @@ class Record extends Base

        $service = $this->getRecordService();

-        if ($entity = $service->createEntity($data)) {
-            return $entity->toArray();
+        if ($entity = $service->create($data)) {
+            return $entity->getValueMap();
        }

        throw new Error();
@@ -102,6 +102,8 @@ class Record extends Base

    public function actionUpdate($params, $data, $request)
    {
+        if (!is_object($data)) throw new BadRequest();
+
        if (!$request->isPut() && !$request->isPatch()) {
            throw new BadRequest();
        }
@@ -112,8 +114,8 @@ class Record extends Base

        $id = $params['id'];

-        if ($entity = $this->getRecordService()->updateEntity($id, $data)) {
-            return $entity->toArray();
+        if ($entity = $this->getRecordService()->update($id, $data)) {
+            return $entity->getValueMap();
        }

        throw new Error();
@@ -125,52 +127,61 @@ class Record extends Base
            throw new Forbidden();
        }

-        $where = $request->get('where');
-        $offset = $request->get('offset');
-        $maxSize = $request->get('maxSize');
-        $asc = $request->get('asc', 'true') === 'true';
-        $sortBy = $request->get('sortBy');
-        $q = $request->get('q');
-        $textFilter = $request->get('textFilter');
-
-        if (empty($maxSize)) {
-            $maxSize = self::MAX_SIZE_LIMIT;
-        }
-        if (!empty($maxSize) && $maxSize > self::MAX_SIZE_LIMIT) {
-            throw new Forbidden("Max should should not exceed " . self::MAX_SIZE_LIMIT . ". Use pagination (offset, limit).");
-        }
-
-        $params = array(
-            'where' => $where,
-            'offset' => $offset,
-            'maxSize' => $maxSize,
-            'asc' => $asc,
-            'sortBy' => $sortBy,
-            'q' => $q,
-            'textFilter' => $textFilter
-        );
-
+        $params = [];
        $this->fetchListParamsFromRequest($params, $request, $data);

-        $result = $this->getRecordService()->findEntities($params);
+        $maxSizeLimit = $this->getConfig()->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
+        if (empty($params['maxSize'])) {
+            $params['maxSize'] = $maxSizeLimit;
+        }
+        if (!empty($params['maxSize']) && $params['maxSize'] > $maxSizeLimit) {
+            throw new Forbidden("Max size should should not exceed " . $maxSizeLimit . ". Use offset and limit.");
+        }

-        return array(
-            'total' => $result['total'],
-            'list' => isset($result['collection']) ? $result['collection']->toArray() : $result['list']
-        );
+        $result = $this->getRecordService()->find($params);
+
+        if (is_array($result)) {
+            return [
+                'total' => $result['total'],
+                'list' => isset($result['collection']) ? $result['collection']->getValueMapList() : $result['list']
+            ];
+        }
+
+        return [
+            'total' => $result->total,
+            'list' => isset($result->collection) ? $result->collection->getValueMapList() : $result->list
+        ];
+    }
+
+    public function getActionListKanban($params, $data, $request)
+    {
+        if (!$this->getAcl()->check($this->name, 'read')) {
+            throw new Forbidden();
+        }
+
+        $params = [];
+        $this->fetchListParamsFromRequest($params, $request, $data);
+
+        $maxSizeLimit = $this->getConfig()->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
+        if (empty($params['maxSize'])) {
+            $params['maxSize'] = $maxSizeLimit;
+        }
+        if (!empty($params['maxSize']) && $params['maxSize'] > $maxSizeLimit) {
+            throw new Forbidden("Max size should should not exceed " . $maxSizeLimit . ". Use offset and limit.");
+        }
+
+        $result = $this->getRecordService()->getListKanban($params);
+
+        return (object) [
+            'total' => $result->total,
+            'list' => $result->collection->getValueMapList(),
+            'additionalData' => $result->additionalData
+        ];
    }

    protected function fetchListParamsFromRequest(&$params, $request, $data)
    {
-        if ($request->get('primaryFilter')) {
-            $params['primaryFilter'] = $request->get('primaryFilter');
-        }
-        if ($request->get('boolFilterList')) {
-            $params['boolFilterList'] = $request->get('boolFilterList');
-        }
-        if ($request->get('filterList')) {
-            $params['filterList'] = $request->get('filterList');
-        }
+        \Espo\Core\Utils\ControllerUtil::fetchListParamsFromRequest($params, $request, $data);
    }

    public function actionListLinked($params, $data, $request)
@@ -178,39 +189,30 @@ class Record extends Base
        $id = $params['id'];
        $link = $params['link'];

-        $where = $request->get('where');
-        $offset = $request->get('offset');
-        $maxSize = $request->get('maxSize');
-        $asc = $request->get('asc', 'true') === 'true';
-        $sortBy = $request->get('sortBy');
-        $q = $request->get('q');
-        $textFilter = $request->get('textFilter');
-
-        if (empty($maxSize)) {
-            $maxSize = self::MAX_SIZE_LIMIT;
-        }
-        if (!empty($maxSize) && $maxSize > self::MAX_SIZE_LIMIT) {
-            throw new Forbidden();
-        }
-
-        $params = array(
-            'where' => $where,
-            'offset' => $offset,
-            'maxSize' => $maxSize,
-            'asc' => $asc,
-            'sortBy' => $sortBy,
-            'q' => $q,
-            'textFilter' => $textFilter
-        );
-
+        $params = [];
        $this->fetchListParamsFromRequest($params, $request, $data);

-        $result = $this->getRecordService()->findLinkedEntities($id, $link, $params);
+        $maxSizeLimit = $this->getConfig()->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
+        if (empty($params['maxSize'])) {
+            $params['maxSize'] = $maxSizeLimit;
+        }
+        if (!empty($params['maxSize']) && $params['maxSize'] > $maxSizeLimit) {
+            throw new Forbidden("Max size should should not exceed " . $maxSizeLimit . ". Use offset and limit.");
+        }

-        return array(
-            'total' => $result['total'],
-            'list' => isset($result['collection']) ? $result['collection']->toArray() : $result['list']
-        );
+        $result = $this->getRecordService()->findLinked($id, $link, $params);
+
+        if (is_array($result)) {
+            return [
+                'total' => $result['total'],
+                'list' => isset($result['collection']) ? $result['collection']->getValueMapList() : $result['list']
+            ];
+        }
+
+        return (object) [
+            'total' => $result->total,
+            'list' => isset($result->collection) ? $result->collection->getValueMapList() : $result->list
+        ];
    }

    public function actionDelete($params, $data, $request)
@@ -221,7 +223,7 @@ class Record extends Base

        $id = $params['id'];

-        if ($this->getRecordService()->deleteEntity($id)) {
+        if ($this->getRecordService()->delete($id)) {
            return true;
        }
        throw new Error();
@@ -229,6 +231,8 @@ class Record extends Base

    public function actionExport($params, $data, $request)
    {
+        if (!is_object($data)) throw new BadRequest();
+
        if (!$request->isPost()) {
            throw new BadRequest();
        }
@@ -237,14 +241,18 @@ class Record extends Base
            throw new Forbidden();
        }

+        if ($this->getAcl()->get('exportPermission') !== 'yes' && !$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+
        if (!$this->getAcl()->check($this->name, 'read')) {
            throw new Forbidden();
        }

-        $ids = isset($data['ids']) ? $data['ids'] : null;
-        $where = isset($data['where']) ? json_decode(json_encode($data['where']), true) : null;
-        $byWhere = isset($data['byWhere']) ? $data['byWhere'] : false;
-        $selectData = isset($data['selectData']) ? json_decode(json_encode($data['selectData']), true) : null;
+        $ids = isset($data->ids) ? $data->ids : null;
+        $where = isset($data->where) ? json_decode(json_encode($data->where), true) : null;
+        $byWhere = isset($data->byWhere) ? $data->byWhere : false;
+        $selectData = isset($data->selectData) ? json_decode(json_encode($data->selectData), true) : null;

        $params = array();
        if ($byWhere) {
@@ -254,21 +262,21 @@ class Record extends Base
            $params['ids'] = $ids;
        }

-        if (isset($data['attributeList'])) {
-            $params['attributeList'] = $data['attributeList'];
+        if (isset($data->attributeList)) {
+            $params['attributeList'] = $data->attributeList;
        }

-        if (isset($data['fieldList'])) {
-            $params['fieldList'] = $data['fieldList'];
+        if (isset($data->fieldList)) {
+            $params['fieldList'] = $data->fieldList;
        }

-        if (isset($data['format'])) {
-            $params['format'] = $data['format'];
+        if (isset($data->format)) {
+            $params['format'] = $data->format;
        }

-        return array(
+        return [
            'id' => $this->getRecordService()->export($params)
-        );
+        ];
    }

    public function actionMassUpdate($params, $data, $request)
@@ -280,49 +288,46 @@ class Record extends Base
        if (!$this->getAcl()->check($this->name, 'edit')) {
            throw new Forbidden();
        }
-        if (empty($data['attributes'])) {
+        if (empty($data->attributes)) {
            throw new BadRequest();
        }

-        $params = array();
-        if (array_key_exists('where', $data) && !empty($data['byWhere'])) {
-            $params['where'] = json_decode(json_encode($data['where']), true);
-            if (array_key_exists('selectData', $data)) {
-                $params['selectData'] = json_decode(json_encode($data['selectData']), true);
-            }
-        } else if (array_key_exists('ids', $data)) {
-            $params['ids'] = $data['ids'];
-        }
-
-        $attributes = $data['attributes'];
-
-        $idsUpdated = $this->getRecordService()->massUpdate($attributes, $params);
-
-        return $idsUpdated;
-    }
-
-    public function actionMassDelete($params, $data, $request)
-    {
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
-        if (!$this->getAcl()->check($this->name, 'delete')) {
+        if ($this->getAcl()->get('massUpdatePermission') !== 'yes') {
            throw new Forbidden();
        }

        $params = array();
-        if (array_key_exists('where', $data) && !empty($data['byWhere'])) {
-            $where = json_decode(json_encode($data['where']), true);
-            $params['where'] = $where;
-            if (array_key_exists('selectData', $data)) {
-                $params['selectData'] = json_decode(json_encode($data['selectData']), true);
+        if (property_exists($data, 'where') && !empty($data->byWhere)) {
+            $params['where'] = json_decode(json_encode($data->where), true);
+            if (property_exists($data, 'selectData')) {
+                $params['selectData'] = json_decode(json_encode($data->selectData), true);
            }
-        }
-        if (array_key_exists('ids', $data)) {
-            $params['ids'] = $data['ids'];
+        } else if (property_exists($data, 'ids')) {
+            $params['ids'] = $data->ids;
        }

-        return $this->getRecordService()->massRemove($params);
+        $attributes = $data->attributes;
+
+        $idsUpdated = $this->getRecordService()->massUpdate($params, $attributes);
+
+        return $idsUpdated;
+    }
+
+    public function postActionMassDelete($params, $data, $request)
+    {
+        if (!$this->getAcl()->check($this->name, 'delete')) {
+            throw new Forbidden();
+        }
+
+        $actionParams = $this->getMassActionParamsFromData($data);
+
+        if (array_key_exists('where', $actionParams)) {
+            if ($this->getAcl()->get('massUpdatePermission') !== 'yes') {
+                throw new Forbidden();
+            }
+        }
+
+        return $this->getRecordService()->massDelete($actionParams);
    }

    public function actionCreateLink($params, $data, $request)
@@ -338,32 +343,32 @@ class Record extends Base
        $id = $params['id'];
        $link = $params['link'];

-        if (!empty($data['massRelate'])) {
-            if (!is_array($data['where'])) {
+        if (!empty($data->massRelate)) {
+            if (!is_array($data->where)) {
                throw new BadRequest();
            }
-            $where = json_decode(json_encode($data['where']), true);
+            $where = json_decode(json_encode($data->where), true);

            $selectData = null;
-            if (isset($data['selectData']) && is_array($data['selectData'])) {
-                $selectData = json_decode(json_encode($data['selectData']), true);
+            if (isset($data->selectData) && is_array($data->selectData)) {
+                $selectData = json_decode(json_encode($data->selectData), true);
            }

-            return $this->getRecordService()->linkEntityMass($id, $link, $where, $selectData);
+            return $this->getRecordService()->massLink($id, $link, $where, $selectData);
        } else {
            $foreignIdList = array();
-            if (isset($data['id'])) {
-                $foreignIdList[] = $data['id'];
+            if (isset($data->id)) {
+                $foreignIdList[] = $data->id;
            }
-            if (isset($data['ids']) && is_array($data['ids'])) {
-                foreach ($data['ids'] as $foreignId) {
+            if (isset($data->ids) && is_array($data->ids)) {
+                foreach ($data->ids as $foreignId) {
                    $foreignIdList[] = $foreignId;
                }
            }

            $result = false;
            foreach ($foreignIdList as $foreignId) {
-                if ($this->getRecordService()->linkEntity($id, $link, $foreignId)) {
+                if ($this->getRecordService()->link($id, $link, $foreignId)) {
                    $result = true;
                }
            }
@@ -388,19 +393,19 @@ class Record extends Base
            throw new BadRequest();
        }

-        $foreignIds = array();
-        if (isset($data['id'])) {
-            $foreignIds[] = $data['id'];
+        $foreignIdList = [];
+        if (isset($data->id)) {
+            $foreignIdList[] = $data->id;
        }
-        if (isset($data['ids']) && is_array($data['ids'])) {
-            foreach ($data['ids'] as $foreignId) {
-                $foreignIds[] = $foreignId;
+        if (isset($data->ids) && is_array($data->ids)) {
+            foreach ($data->ids as $foreignId) {
+                $foreignIdList[] = $foreignId;
            }
        }

        $result = false;
-        foreach ($foreignIds as $foreignId) {
-            if ($this->getRecordService()->unlinkEntity($id, $link, $foreignId)) {
+        foreach ($foreignIdList as $foreignId) {
+            if ($this->getRecordService()->unlink($id, $link, $foreignId)) {
                $result = $result || true;
            }
        }
@@ -441,12 +446,12 @@ class Record extends Base
            throw new BadRequest();
        }

-        if (empty($data['targetId']) || empty($data['sourceIds']) || !is_array($data['sourceIds']) || !($data['attributes'] instanceof \StdClass)) {
+        if (empty($data->targetId) || empty($data->sourceIds) || !is_array($data->sourceIds) || !($data->attributes instanceof \StdClass)) {
            throw new BadRequest();
        }
-        $targetId = $data['targetId'];
-        $sourceIds = $data['sourceIds'];
-        $attributes = get_object_vars($data['attributes']);
+        $targetId = $data->targetId;
+        $sourceIds = $data->sourceIds;
+        $attributes = $data->attributes;

        if (!$this->getAcl()->check($this->name, 'edit')) {
            throw new Forbidden();
@@ -457,7 +462,7 @@ class Record extends Base

    public function postActionGetDuplicateAttributes($params, $data, $request)
    {
-        if (empty($data['id'])) {
+        if (empty($data->id)) {
            throw new BadRequest();
        }

@@ -468,7 +473,7 @@ class Record extends Base
            throw new Forbidden();
        }

-        return $this->getRecordService()->getDuplicateAttributes($data['id']);
+        return $this->getRecordService()->getDuplicateAttributes($data->id);
    }

    public function postActionMassFollow($params, $data, $request)
@@ -477,8 +482,8 @@ class Record extends Base
            throw new Forbidden();
        }

-        if (array_key_exists('ids', $data)) {
-            $params['ids'] = $data['ids'];
+        if (property_exists($data, 'ids')) {
+            $params['ids'] = $data->ids;
        }

        return $this->getRecordService()->massFollow($params);
@@ -490,11 +495,91 @@ class Record extends Base
            throw new Forbidden();
        }

-        if (array_key_exists('ids', $data)) {
-            $params['ids'] = $data['ids'];
+        if (property_exists($data, 'ids')) {
+            $params['ids'] = $data->ids;
        }

        return $this->getRecordService()->massUnfollow($params);
    }
-}

+    protected function getMassActionParamsFromData($data)
+    {
+        $params = [];
+        if (property_exists($data, 'where') && !empty($data->byWhere)) {
+            $where = json_decode(json_encode($data->where), true);
+            $params['where'] = $where;
+            if (property_exists($data, 'selectData')) {
+                $params['selectData'] = json_decode(json_encode($data->selectData), true);
+            }
+        }
+        if (property_exists($data, 'ids')) {
+            $params['ids'] = $data->ids;
+        }
+
+        return $params;
+    }
+
+    public function postActionMassRecalculateFormula($params, $data, $request)
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+        if (!$this->getAcl()->check($this->name, 'edit')) throw new Forbidden();
+
+        return $this->getRecordService()->massRecalculateFormula($this->getMassActionParamsFromData($data));
+    }
+
+    public function postActionRestoreDeleted($params, $data, $request)
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+
+        $id = $data->id ?? null;
+        if (!$id) throw new Forbidden();
+
+        return $this->getRecordService()->restoreDeleted($id);
+    }
+
+    public function postActionMassConvertCurrency($params, $data, $request)
+    {
+        if (!$this->getAcl()->checkScope($this->name, 'edit')) throw new Forbidden();
+        if ($this->getAcl()->get('massUpdatePermission') !== 'yes') throw new Forbidden();
+
+        $fieldList = $data->fieldList ?? null;
+        if (!empty($data->field)) {
+            if (!is_array($fieldList)) $fieldList = [];
+            $fieldList[] = $data->field;
+        }
+
+        $params = [];
+        if (property_exists($data, 'where') && !empty($data->byWhere)) {
+            $params['where'] = json_decode(json_encode($data->where), true);
+            if (property_exists($data, 'selectData')) {
+                $params['selectData'] = json_decode(json_encode($data->selectData), true);
+            }
+        } else if (property_exists($data, 'ids')) {
+            $params['ids'] = $data->ids;
+        }
+
+        if (empty($data->currencyRates)) throw new BadRequest();
+        if (empty($data->targetCurrency)) throw new BadRequest();
+        if (empty($data->baseCurrency)) throw new BadRequest();
+
+        return $this->getRecordService()->massConvertCurrency($params, $data->targetCurrency, $data->baseCurrency, $data->currencyRates, $fieldList);
+    }
+
+    public function postActionConvertCurrency($params, $data, $request)
+    {
+        if (!$this->getAcl()->checkScope($this->name, 'edit')) throw new Forbidden();
+
+        $fieldList = $data->fieldList ?? null;
+        if (!empty($data->field)) {
+            if (!is_array($fieldList)) $fieldList = [];
+            $fieldList[] = $data->field;
+        }
+
+        if (empty($data->id)) throw new BadRequest();
+        if (empty($data->currencyRates)) throw new BadRequest();
+        if (empty($data->targetCurrency)) throw new BadRequest();
+        if (empty($data->baseCurrency)) throw new BadRequest();
+
+        return $this->getRecordService()->convertCurrency($data->id, $data->targetCurrency, $data->baseCurrency, $data->currencyRates, $fieldList);
+    }
+}
--- a/application/Espo/Core/Controllers/RecordTree.php
+++ b/application/Espo/Core/Controllers/RecordTree.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -61,5 +61,15 @@ class RecordTree extends Record
            'path' => $this->getRecordService()->getTreeItemPath($parentId)
        );
    }
-}

+    public function getActionLastChildrenIdList($params, $data, $request)
+    {
+        if (!$this->getAcl()->check($this->name, 'read')) {
+            throw new Forbidden();
+        }
+
+        $parentId = $request->get('parentId');
+
+        return $this->getRecordService()->getLastChildrenIdList($parentId);
+    }
+}
--- a/application/Espo/Core/CronManager.php
+++ b/application/Espo/Core/CronManager.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -28,9 +28,12 @@
 ************************************************************************/

 namespace Espo\Core;
+
 use \PDO;
 use Espo\Core\Utils\Json;
+
 use Espo\Core\Exceptions\NotFound;
+use Espo\Core\Exceptions\Error;

 class CronManager
 {
@@ -44,8 +47,25 @@ class CronManager

    private $scheduledJobUtil;

+    private $cronJobUtil;
+
+    private $cronScheduledJobUtil;
+
+    private $useProcessPool = false;
+
+    private $asSoonAsPossibleSchedulingList = [
+        '*',
+        '* *',
+        '* * *',
+        '* * * *',
+        '* * * * *',
+        '* * * * * *',
+    ];
+
    const PENDING = 'Pending';

+    const READY = 'Ready';
+
    const RUNNING = 'Running';

    const SUCCESS = 'Success';
@@ -64,8 +84,16 @@ class CronManager
        $this->serviceFactory = $this->container->get('serviceFactory');

        $this->scheduledJobUtil = $this->container->get('scheduledJob');
-        $this->cronJob = new \Espo\Core\Utils\Cron\Job($this->config, $this->entityManager);
-        $this->cronScheduledJob = new \Espo\Core\Utils\Cron\ScheduledJob($this->config, $this->entityManager);
+        $this->cronJobUtil = new \Espo\Core\Utils\Cron\Job($this->config, $this->entityManager);
+        $this->cronScheduledJobUtil = new \Espo\Core\Utils\Cron\ScheduledJob($this->config, $this->entityManager);
+
+        if ($this->getConfig()->get('jobRunInParallel')) {
+            if (\Spatie\Async\Pool::isSupported()) {
+                $this->useProcessPool = true;
+            } else {
+                $GLOBALS['log']->warning("CronManager: useProcessPool requires pcntl and posix extensions.");
+            }
+        }
    }

    protected function getContainer()
@@ -98,23 +126,24 @@ class CronManager
        return $this->scheduledJobUtil;
    }

-    protected function getCronJob()
+    protected function getCronJobUtil()
    {
-        return $this->cronJob;
+        return $this->cronJobUtil;
    }

-    protected function getCronScheduledJob()
+    protected function getCronScheduledJobUtil()
    {
-        return $this->cronScheduledJob;
+        return $this->cronScheduledJobUtil;
    }

    protected function getLastRunTime()
    {
        $lastRunData = $this->getFileManager()->getPhpContents($this->lastRunTime);

-        $lastRunTime = time() - intval($this->getConfig()->get('cron.minExecutionTime')) - 1;
        if (is_array($lastRunData) && !empty($lastRunData['time'])) {
            $lastRunTime = $lastRunData['time'];
+        } else {
+            $lastRunTime = time() - intval($this->getConfig()->get('cronMinInterval', 0)) - 1;
        }

        return $lastRunTime;
@@ -132,19 +161,27 @@ class CronManager
    {
        $currentTime = time();
        $lastRunTime = $this->getLastRunTime();
-        $minTime = $this->getConfig()->get('cron.minExecutionTime');
+        $cronMinInterval = $this->getConfig()->get('cronMinInterval', 0);

-        if ($currentTime > ($lastRunTime + $minTime) ) {
+        if ($currentTime > ($lastRunTime + $cronMinInterval)) {
            return true;
        }

        return false;
    }

+    protected function useProcessPool()
+    {
+        return $this->useProcessPool;
+    }
+
+    public function setUseProcessPool($useProcessPool)
+    {
+        $this->useProcessPool = $useProcessPool;
+    }
+
    /**
     * Run Cron
-     *
-     * @return void
     */
    public function run()
    {
@@ -155,144 +192,245 @@ class CronManager

        $this->setLastRunTime(time());

-        $this->getCronJob()->markFailedJobs();
-        $this->getCronJob()->updateFailedJobAttempts();
+        $this->getCronJobUtil()->markJobsFailed();
+        $this->getCronJobUtil()->updateFailedJobAttempts();
        $this->createJobsFromScheduledJobs();
-        $this->getCronJob()->removePendingJobDuplicates();
+        $this->getCronJobUtil()->removePendingJobDuplicates();

-        $pendingJobList = $this->getCronJob()->getPendingJobList();
+        $this->processPendingJobs();
+    }
+
+    public function processPendingJobs($queue = null, $limit = null, $poolDisabled = false, $noLock = false)
+    {
+        if (is_null($limit)) {
+            $limit = intval($this->getConfig()->get('jobMaxPortion', 0));
+        }
+
+        $pendingJobList = $this->getCronJobUtil()->getPendingJobList($queue, $limit);
+
+        $useProcessPool = $this->useProcessPool();
+
+        if ($poolDisabled) {
+            $useProcessPool = false;
+        }
+
+        if ($useProcessPool) {
+            $pool = \Spatie\Async\Pool::create()
+                ->autoload(getcwd() . '/vendor/autoload.php')
+                ->concurrency($this->getConfig()->get('jobPoolConcurrencyNumber'))
+                ->timeout($this->getConfig()->get('jobPeriodForActiveProcess'));
+        }

        foreach ($pendingJobList as $job) {
-            $jobEntity = $this->getEntityManager()->getEntity('Job', $job['id']);
+            $skip = false;
+            if (!$noLock) $this->lockJobTable();
+            if ($noLock || $this->getCronJobUtil()->isJobPending($job->id)) {
+                if ($job->get('scheduledJobId')) {
+                    if ($this->getCronJobUtil()->isScheduledJobRunning($job->get('scheduledJobId'), $job->get('targetId'), $job->get('targetType'))) {
+                        $skip = true;
+                    }
+                }
+            } else {
+                $skip = true;
+            }

-            if (!isset($jobEntity)) {
-                $GLOBALS['log']->error('CronManager: empty Job entity ['.$job['id'].'].');
+            if ($skip) {
+                if (!$noLock) $this->unlockTables();
                continue;
            }

-            $jobEntity->set('status', self::RUNNING);
-            $this->getEntityManager()->saveEntity($jobEntity);
+            $job->set('startedAt', date('Y-m-d H:i:s'));

-            $isSuccess = true;
-
-            try {
-                if (!empty($job['scheduled_job_id'])) {
-                    $this->runScheduledJob($job);
-                } else {
-                    $this->runService($job);
-                }
-            } catch (\Exception $e) {
-                $isSuccess = false;
-                $GLOBALS['log']->error('CronManager: Failed job running, job ['.$job['id'].']. Error Details: '.$e->getMessage());
+            if ($useProcessPool) {
+                $job->set('status', self::READY);
+            } else {
+                $job->set('status', self::RUNNING);
+                $job->set('pid', \Espo\Core\Utils\System::getPid());
            }

-            $status = $isSuccess ? self::SUCCESS : self::FAILED;
+            $this->getEntityManager()->saveEntity($job);
+            if (!$noLock) $this->unlockTables();

-            $jobEntity->set('status', $status);
-            $this->getEntityManager()->saveEntity($jobEntity);
-
-            if (!empty($job['scheduled_job_id'])) {
-                $this->getCronScheduledJob()->addLogRecord($job['scheduled_job_id'], $status, null, $job['target_id'], $job['target_type']);
+            if ($useProcessPool) {
+                $task = new \Espo\Core\Utils\Cron\JobTask($job->id);
+                $pool->add($task);
+            } else {
+                $this->runJob($job);
            }
        }
+
+        if ($useProcessPool) {
+            $pool->wait();
+        }
    }

-    /**
-     * Run Scheduled Job
-     *
-     * @param  array  $job
-     *
-     * @return void
-     */
-    protected function runScheduledJob(array $job)
+    protected function lockJobTable()
    {
-        $jobName = $job['method'];
+        $this->getEntityManager()->getPdo()->query('LOCK TABLES `job` WRITE');
+    }
+
+    protected function unlockTables()
+    {
+        $this->getEntityManager()->getPdo()->query('UNLOCK TABLES');
+    }
+
+    public function runJobById($id)
+    {
+        if (empty($id)) throw new Error();
+
+        $job = $this->getEntityManager()->getEntity('Job', $id);
+
+        if (!$job) throw new Error("Job {$id} not found.");
+
+        if ($job->get('status') !== self::READY) {
+            throw new Error("Can't run job {$id} with no status Ready.");
+        }
+
+        if (!$job->get('startedAt')) {
+            $job->set('startedAt', date('Y-m-d H:i:s'));
+        }
+
+        $job->set('status', self::RUNNING);
+        $job->set('pid', \Espo\Core\Utils\System::getPid());
+        $this->getEntityManager()->saveEntity($job);
+
+        $this->runJob($job);
+    }
+
+    public function runJob(\Espo\Entities\Job $job)
+    {
+        $isSuccess = true;
+        $skipLog = false;
+
+        try {
+            if ($job->get('scheduledJobId')) {
+                $this->runScheduledJob($job);
+            } else if ($job->get('job')) {
+                $this->runJobByName($job);
+            } else {
+                $this->runService($job);
+            }
+        } catch (\Throwable $e) {
+            $isSuccess = false;
+            if ($e->getCode() === -1) {
+                $job->set('attempts', 0);
+                $skipLog = true;
+            } else {
+                $GLOBALS['log']->error('CronManager: Failed job running, job ['.$job->id.']. Error Details: '.$e->getMessage());
+            }
+        }
+
+        $status = $isSuccess ? self::SUCCESS : self::FAILED;
+
+        $job->set('status', $status);
+
+        if ($isSuccess) {
+            $job->set('executedAt', date('Y-m-d H:i:s'));
+        }
+
+        $this->getEntityManager()->saveEntity($job);
+
+        if ($job->get('scheduledJobId') && !$skipLog) {
+            $this->getCronScheduledJobUtil()->addLogRecord($job->get('scheduledJobId'), $status, null, $job->get('targetId'), $job->get('targetType'));
+        }
+
+        if ($isSuccess) return true;
+        return false;
+    }
+
+    protected function runScheduledJob($job)
+    {
+        $jobName = $job->get('scheduledJobJob');

        $className = $this->getScheduledJobUtil()->get($jobName);
-        if ($className === false) {
-            throw new NotFound();
-        }
+
+        if ($className === false) throw new Error("No class name for job {$jobName}.");

        $jobClass = new $className($this->container);
        $method = 'run';
-        if (!method_exists($jobClass, $method)) {
-            throw new NotFound();
-        }
+        if (!method_exists($jobClass, $method)) throw new Error();

        $data = null;
-        if (!empty($job['data'])) {
-            $data = $job['data'];
-            if (Json::isJSON($data)) {
-                $data = Json::decode($data, true);
-            }
+        if ($job->get('data')) {
+            $data = $job->get('data');
        }

-        $jobClass->$method($data, $job['target_id'], $job['target_type']);
+        $jobClass->$method($data, $job->get('targetId'), $job->get('targetType'));
    }

-    /**
-     * Run Service
-     *
-     * @param  array  $job
-     *
-     * @return void
-     */
-    protected function runService(array $job)
+    protected function runService($job)
    {
-        $serviceName = $job['service_name'];
+        $serviceName = $job->get('serviceName');

-        if (!$this->getServiceFactory()->checkExists($serviceName)) {
-            throw new NotFound();
+        if (!$serviceName) {
+            throw new Error("Job with empty serviceName.");
        }

+        if (!$this->getServiceFactory()->checkExists($serviceName)) throw new Error();
+
        $service = $this->getServiceFactory()->create($serviceName);
-        $serviceMethod = $job['method'];

-        if (!method_exists($service, $serviceMethod)) {
-            throw new NotFound();
-        }
+        $methodNameDeprecated = $job->get('method');
+        $methodName = $job->get('methodName');

-        $data = $job['data'];
-        if (Json::isJSON($data)) {
-            $data = Json::decode($data, true);
-        }
+        if (!$methodName) throw new Error('Job with empty methodName.');

-        $service->$serviceMethod($data, $job['target_id'], $job['target_type']);
+        if (!method_exists($service, $methodName)) throw new Error();
+
+        $data = $job->get('data');
+
+        $service->$methodName($data, $job->get('targetId'), $job->get('targetType'));
+    }
+
+    protected function runJobByName($job)
+    {
+        $jobName = $job->get('job');
+
+        $className = $this->getScheduledJobUtil()->get($jobName);
+
+        if ($className === false) throw new Error("No class name for job {$jobName}.");
+
+        $jobClass = new $className($this->container);
+        $method = 'run';
+        if (!method_exists($jobClass, $method)) throw new Error();
+
+        $data = $job->get('data') ?: null;
+
+        $jobClass->$method($data, $job->get('targetId'), $job->get('targetType'));
    }

-    /**
-     * Check scheduled jobs and create related jobs
-     *
-     * @return array  List of created Jobs
-     */
    protected function createJobsFromScheduledJobs()
    {
-        $activeScheduledJobList = $this->getCronScheduledJob()->getActiveScheduledJobList();
+        $activeScheduledJobList = $this->getCronScheduledJobUtil()->getActiveScheduledJobList();
+        $runningScheduledJobIdList = $this->getCronJobUtil()->getRunningScheduledJobIdList();

-        $runningScheduledJobIdList = $this->getCronJob()->getRunningScheduledJobIdList();
-
-        $createdJobIdList = array();
+        $createdJobIdList = [];
        foreach ($activeScheduledJobList as $scheduledJob) {
-            $scheduling = $scheduledJob['scheduling'];
+            $scheduling = $scheduledJob->get('scheduling');
+            $asSoonAsPossible = in_array($scheduling, $this->asSoonAsPossibleSchedulingList);

-            try {
-                $cronExpression = \Cron\CronExpression::factory($scheduling);
-            } catch (\Exception $e) {
-                $GLOBALS['log']->error('CronManager (ScheduledJob ['.$scheduledJob['id'].']): Scheduling string error - '. $e->getMessage() . '.');
-                continue;
+            if ($asSoonAsPossible) {
+                $nextDate = date('Y-m-d H:i:s');
+            } else {
+                try {
+                    $cronExpression = \Cron\CronExpression::factory($scheduling);
+                } catch (\Exception $e) {
+                    $GLOBALS['log']->error('CronManager (ScheduledJob ['.$scheduledJob->id.']): Scheduling string error - '. $e->getMessage() . '.');
+                    continue;
+                }
+
+                try {
+                    $nextDate = $cronExpression->getNextRunDate()->format('Y-m-d H:i:s');
+                } catch (\Exception $e) {
+                    $GLOBALS['log']->error('CronManager (ScheduledJob ['.$scheduledJob->id.']): Unsupported CRON expression ['.$scheduling.']');
+                    continue;
+                }
+
+                $existingJob = $this->getCronJobUtil()->getJobByScheduledJobIdOnMinute($scheduledJob->id, $nextDate);
+                if ($existingJob) continue;
            }

-            try {
-                $nextDate = $cronExpression->getNextRunDate()->format('Y-m-d H:i:s');
-            } catch (\Exception $e) {
-                $GLOBALS['log']->error('CronManager (ScheduledJob ['.$scheduledJob['id'].']): Unsupported CRON expression ['.$scheduling.']');
-                continue;
-            }
-
-            $existingJob = $this->getCronJob()->getJobByScheduledJob($scheduledJob['id'], $nextDate);
-            if ($existingJob) continue;
-
-            $className = $this->getScheduledJobUtil()->get($scheduledJob['job']);
+            $className = $this->getScheduledJobUtil()->get($scheduledJob->get('job'));
            if ($className) {
                if (method_exists($className, 'prepare')) {
                    $implementation = new $className($this->container);
@@ -301,24 +439,30 @@ class CronManager
                }
            }

-            if (in_array($scheduledJob['id'], $runningScheduledJobIdList)) {
+            if (in_array($scheduledJob->id, $runningScheduledJobIdList)) {
                continue;
            }

+            $pendingCount = $this->getCronJobUtil()->getPendingCountByScheduledJobId($scheduledJob->id);
+
+            if ($asSoonAsPossible) {
+                if ($pendingCount > 0) {
+                    continue;
+                }
+            } else {
+                if ($pendingCount > 1) {
+                    continue;
+                }
+            }
+
            $jobEntity = $this->getEntityManager()->getEntity('Job');
-            $jobEntity->set(array(
-                'name' => $scheduledJob['name'],
+            $jobEntity->set([
+                'name' => $scheduledJob->get('name'),
                'status' => self::PENDING,
-                'scheduledJobId' => $scheduledJob['id'],
-                'executeTime' => $nextDate,
-                'method' => $scheduledJob['job']
-            ));
+                'scheduledJobId' => $scheduledJob->id,
+                'executeTime' => $nextDate
+            ]);
            $this->getEntityManager()->saveEntity($jobEntity);
-
-            $createdJobIdList[] = $jobEntity->id;
        }
-
-        return $createdJobIdList;
    }
 }
-
--- a/application/Espo/Core/DataManager.php
+++ b/application/Espo/Core/DataManager.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
@@ -53,6 +53,8 @@ class DataManager
     */
    public function rebuild($entityList = null)
    {
+        $this->populateConfigParameters();
+
        $result = $this->clearCache();

        $result &= $this->rebuildMetadata();
@@ -89,8 +91,10 @@ class DataManager
     */
    public function rebuildDatabase($entityList = null)
    {
+        $schema = $this->getContainer()->get('schema');
+
        try {
-            $result = $this->getContainer()->get('schema')->rebuild($entityList);
+            $result = $schema->rebuild($entityList);
        } catch (\Exception $e) {
            $result = false;
            $GLOBALS['log']->error('Fault to rebuild database schema'.'. Details: '.$e->getMessage());
@@ -100,6 +104,18 @@ class DataManager
            throw new Exceptions\Error("Error while rebuilding database. See log file for details.");
        }

+        $config = $this->getContainer()->get('config');
+
+        $databaseType = strtolower($schema->getDatabaseHelper()->getDatabaseType());
+        if (!$config->get('actualDatabaseType') || $config->get('actualDatabaseType') != $databaseType) {
+            $config->set('actualDatabaseType', $databaseType);
+        }
+
+        $databaseVersion = $schema->getDatabaseHelper()->getDatabaseVersion();
+        if (!$config->get('actualDatabaseVersion') || $config->get('actualDatabaseVersion') != $databaseVersion) {
+            $config->set('actualDatabaseVersion', $databaseVersion);
+        }
+
        $this->updateCacheTimestamp();

        return $result;
@@ -117,6 +133,7 @@ class DataManager
        $metadata->init(true);

        $ormData = $this->getContainer()->get('ormMetadata')->getData(true);
+        $this->getContainer()->get('entityManager')->setMetadata($ormData);

        $this->updateCacheTimestamp();

@@ -128,45 +145,84 @@ class DataManager
        $metadata = $this->getContainer()->get('metadata');
        $entityManager = $this->getContainer()->get('entityManager');

-        $jobs = $metadata->get(['entityDefs', 'ScheduledJob', 'jobs'], array());
+        $jobs = $metadata->get(['entityDefs', 'ScheduledJob', 'jobs'], []);
+
+        $systemJobNameList = [];

        foreach ($jobs as $jobName => $defs) {
            if ($jobName && !empty($defs['isSystem']) && !empty($defs['scheduling'])) {
+                $systemJobNameList[] = $jobName;
                if (!$entityManager->getRepository('ScheduledJob')->where(array(
                    'job' => $jobName,
                    'status' => 'Active',
                    'scheduling' => $defs['scheduling']
                ))->findOne()) {
-                    $job = $entityManager->getRepository('ScheduledJob')->where(array(
+                    $job = $entityManager->getRepository('ScheduledJob')->where([
                        'job' => $jobName
-                    ))->findOne();
+                    ])->findOne();
                    if ($job) {
                        $entityManager->removeEntity($job);
                    }
+                    $name = $jobName;
+                    if (!empty($defs['name'])) {
+                        $name = $defs['name'];
+                    }
                    $job = $entityManager->getEntity('ScheduledJob');
-                    $job->set(array(
+                    $job->set([
                        'job' => $jobName,
                        'status' => 'Active',
                        'scheduling' => $defs['scheduling'],
                        'isInternal' => true,
-                        'name' => $jobName
-                    ));
+                        'name' => $name
+                    ]);
                    $entityManager->saveEntity($job);
                }
            }
        }
+
+        $internalScheduledJobList = $entityManager->getRepository('ScheduledJob')->where([
+            'isInternal' => true
+        ])->find();
+        foreach ($internalScheduledJobList as $scheduledJob) {
+            $jobName = $scheduledJob->get('job');
+            if (!in_array($jobName, $systemJobNameList)) {
+                $entityManager->getRepository('ScheduledJob')->deleteFromDb($scheduledJob->id);
+            }
+        }
    }

-    /**
-     * Update cache timestamp
-     *
-     * @return bool
-     */
    public function updateCacheTimestamp()
    {
        $this->getContainer()->get('config')->updateCacheTimestamp();
-        $this->getContainer()->get('config')->save();
+        $this->getContainer()->get('config')->save(); /* correct rebuildDatabase() method when remove this line */
+
        return true;
    }
-}

+    protected function populateConfigParameters()
+    {
+        $config = $this->getContainer()->get('config');
+
+        $pdo = $this->getContainer()->get('entityManager')->getPDO();
+        $query = "SHOW VARIABLES LIKE 'ft_min_word_len'";
+        $sth = $pdo->prepare($query);
+        $sth->execute();
+
+        $fullTextSearchMinLength = null;
+        if ($row = $sth->fetch(\PDO::FETCH_ASSOC)) {
+            if (isset($row['Value'])) {
+                $fullTextSearchMinLength = intval($row['Value']);
+            }
+        }
+
+        $config->set('fullTextSearchMinLength', $fullTextSearchMinLength);
+
+        $cryptKey = $config->get('cryptKey');
+        if (!$cryptKey) {
+            $cryptKey = \Espo\Core\Utils\Util::generateKey();
+            $config->set('cryptKey', $cryptKey);
+        }
+
+        $config->save();
+    }
+}
--- a/application/Espo/Core/Entities/CategoryTreeItem.php
+++ b/application/Espo/Core/Entities/CategoryTreeItem.php
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 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
--- a/Show More
+++ b/Show More