comment out auth token secret

v
notifications lower case first
2019-08-10 19:11:03 +03:00 · 2019-08-10 19:08:57 +03:00 · 2019-08-09 15:17:16 +03:00 · 2019-08-09 12:55:54 +03:00 · 2019-08-09 12:29:00 +03:00 · 2019-08-09 12:22:10 +03:00
3425 changed files with 92167 additions and 27549 deletions
@@ -6,6 +6,7 @@
 /data/config.php
 /build
 /node_modules
+npm-debug.log
 /test.php
 /main.html

@@ -9,7 +9,7 @@ DirectoryIndex index.php index.html

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

  RewriteRule ^/?data/config\.php$ - [F]
  RewriteRule ^/?data/logs/ - [F]
@@ -19,6 +19,7 @@ DirectoryIndex index.php index.html
  RewriteRule ^/?application/ - [F]
  RewriteRule ^/?custom/ - [F]
  RewriteRule ^/?vendor/ - [F]
+  RewriteRule ^/?client/?$ - [F]
  #END PROTECTED DIRECTORIES

  RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
@@ -2,8 +2,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,14 +28,17 @@ 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',
@@ -86,12 +89,16 @@ module.exports = function (grunt) {
        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,
@@ -116,13 +123,22 @@ module.exports = function (grunt) {
            }
        },
        clean: {
-            start: ['build/*'],
+            start: ['build/EspoCRM-*'],
            final: ['build/tmp'],
+            beforeFinal: {
+                src: ['build/tmp/custom/Espo/Custom/*', '!build/tmp/custom/Espo/Custom/.htaccess']
+            }
        },
        less: lessData,
+        cssmin: {
+            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) {
@@ -167,10 +183,13 @@ module.exports = function (grunt) {
                    'html/**',
                    'bootstrap.php',
                    'cron.php',
+                    'daemon.php',
                    'rebuild.php',
                    'clear_cache.php',
                    'upgrade.php',
                    'extension.php',
+                    'websocket.php',
+                    'command.php',
                    'index.php',
                    'LICENSE.txt',
                    '.htaccess',
@@ -221,26 +240,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: [
@@ -285,14 +284,15 @@ module.exports = function (grunt) {
        'clean:start',
        'mkdir:tmp',
        'less',
+        'cssmin',
        'uglify',
        'copy:frontendFolders',
        'copy:frontendLib',
        'copy:backend',
        'replace',
+        'clean:beforeFinal',
        'copy:final',
        'chmod',
-        'clean:final',
+        'clean:final'
    ]);
-
 };
@@ -8,8 +8,8 @@ Download the latest release from our [website](http://www.espocrm.com).

 ### Requirements

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

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

@@ -17,10 +17,14 @@ For more information about server configuration see [this article](https://www.e

 Documentation for administrators, users and developers is available [here](https://www.espocrm.com/documentation/).

-### How to report bug
+### 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.
@@ -34,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.

@@ -48,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:
@@ -66,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).
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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;
    }
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -48,7 +48,9 @@ class EmailAddress extends \Espo\Core\Acl\Base
                if (!$this->getAclManager()->check($user, $e, 'edit')) {
                    $isFobidden = true;
                    if (
-                        $e->get('isPortalUser') && $excludeEntity->getEntityType() === 'Contact' &&
+                        $e->getEntityType() === 'User' &&
+                        $e->isPortal() &&
+                        $excludeEntity->getEntityType() === 'Contact' &&
                        $e->get('contactId') === $excludeEntity->id
                    ) {
                        $isFobidden = false;
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -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;
+    }
+}
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,10 @@ 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')) {
@@ -41,5 +45,75 @@ class Note extends \Espo\Core\Acl\Base
        }
        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;
+    }
+}
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -48,7 +48,9 @@ class PhoneNumber extends \Espo\Core\Acl\Base
                if (!$this->getAclManager()->check($user, $e, 'edit')) {
                    $isFobidden = true;
                    if (
-                        $e->get('isPortalUser') && $excludeEntity->getEntityType() === 'Contact' &&
+                        $e->getEntityType() === 'User' &&
+                        $e->isPortal() &&
+                        $excludeEntity->getEntityType() === 'Contact' &&
                        $e->get('contactId') === $excludeEntity->id
                    ) {
                        $isFobidden = false;
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,9 @@ class User extends \Espo\Core\Acl\Base
        if (!$user->isAdmin()) {
            return false;
        }
+        if ($entity->isSuperAdmin() && !$user->isSuperAdmin()) {
+            return false;
+        }
        return $this->checkEntity($user, $entity, $data, 'create');
    }

@@ -55,6 +58,12 @@ class User extends \Espo\Core\Acl\Base
        if (!$user->isAdmin()) {
            return false;
        }
+        if ($entity->isSystem()) {
+            return false;
+        }
+        if ($entity->isSuperAdmin() && !$user->isSuperAdmin()) {
+            return false;
+        }
        return parent::checkEntityDelete($user, $entity, $data);
    }

@@ -63,11 +72,17 @@ class User extends \Espo\Core\Acl\Base
        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');
    }
 }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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)
    {
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,5 +41,26 @@ class Note extends \Espo\Core\AclPortal\Base
        }
        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;
+    }
+}
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,38 @@ 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();
    }
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -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,7 +87,7 @@ 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();
            }
        }
@@ -108,4 +108,10 @@ class Admin extends \Espo\Core\Controllers\Base
        $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();
+    }
 }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,5 +34,27 @@ use \Espo\Core\Exceptions\BadRequest;

 class Attachment extends \Espo\Core\Controllers\Record
 {
+    public function actionList($params, $data, $request)
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+        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();
+    }
 }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,27 +40,27 @@ class AuthLogRecord extends \Espo\Core\Controllers\Record
        }
    }

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

-    public function actionMassUpdate($params, $data, $request)
+    public function beforeMassUpdate()
    {
        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();
    }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -80,17 +80,17 @@ 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();
    }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,12 +46,8 @@ class Email extends \Espo\Core\Controllers\Record
        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();
        }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,12 +55,8 @@ 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 || !$emailAccount->id) {
@@ -75,4 +73,3 @@ class EmailAccount extends \Espo\Core\Controllers\Record
        return $this->getRecordService()->testConnection(get_object_vars($data));
    }
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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);
    }
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -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
+{
+
+}
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -89,6 +89,9 @@ class EntityManager extends \Espo\Core\Controllers\Base
        if (!empty($data['iconClass'])) {
            $params['iconClass'] = $data['iconClass'];
        }
+        if (isset($data['fullTextSearch'])) {
+            $params['fullTextSearch'] = $data['fullTextSearch'];
+        }

        $params['kanbanViewMode'] = !empty($data['kanbanViewMode']);
        if (!empty($data['kanbanStatusIgnoreList'])) {
@@ -127,10 +130,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) {
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,7 +66,7 @@ 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();
            }
        }
@@ -84,7 +84,7 @@ 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();
            }
        }
@@ -94,25 +94,6 @@ class Extension extends \Espo\Core\Controllers\Record
        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,22 +110,42 @@ 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();
    }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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)
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,13 +90,12 @@ 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)
@@ -127,7 +126,7 @@ class Import extends \Espo\Core\Controllers\Record
            throw new BadRequest();
        }

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

@@ -167,7 +166,7 @@ class Import extends \Espo\Core\Controllers\Record
            throw new BadRequest();
        }

-        if (!isset($data->fields)) {
+        if (!isset($data->attributeList)) {
            throw new BadRequest();
        }

@@ -176,9 +175,9 @@ class Import extends \Espo\Core\Controllers\Record
           $timezone = $data->timezone;
        }

-        $importParams = array(
+        $importParams = [
            'headerRow' => !empty($data->headerRow),
-            'fieldDelimiter' => $data->fieldDelimiter,
+            'delimiter' => $data->delimiter,
            'textQualifier' => $data->textQualifier,
            'dateFormat' => $data->dateFormat,
            'timeFormat' => $data->timeFormat,
@@ -189,8 +188,9 @@ class Import extends \Espo\Core\Controllers\Record
            'defaultValues' => $data->defaultValues,
            'action' => $data->action,
            'skipDuplicateChecking' => !empty($data->skipDuplicateChecking),
-            'idleMode' => !empty($data->idleMode)
-        );
+            'idleMode' => !empty($data->idleMode),
+            'silentMode' => !empty($data->silentMode),
+        ];

        if (property_exists($data, 'updateBy')) {
            $importParams['updateBy'] = $data->updateBy;
@@ -202,7 +202,7 @@ class Import extends \Espo\Core\Controllers\Record
            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)
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,24 +41,20 @@ 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 || !$inboundEmail->id) {
@@ -69,5 +65,4 @@ class InboundEmail extends \Espo\Core\Controllers\Record

        return $this->getRecordService()->testConnection(get_object_vars($data));
    }
-
 }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,37 +41,37 @@ 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();
    }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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()
        ];
    }
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -78,15 +78,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)) {
            throw new BadRequest();
        }

+        $this->getContainer()->get('dataManager')->updateCacheTimestamp();
+
        return $this->getContainer()->get('layout')->resetToDefault($data->scope, $data->name);
    }
 }
@@ -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();
+    }
+}
@@ -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
+{
+
+}
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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();
    }
 }
-
@@ -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)
+        ];
+    }
+}
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,7 +88,7 @@ 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();
        }

@@ -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');

@@ -142,5 +142,45 @@ class Preferences extends \Espo\Core\Controllers\Base

        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')
+        ];
+    }
+}
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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()
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
        }
    }
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,23 +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');
-        }
-
-        if (isset($data->defaultCurrency) || isset($data->baseCurrency) || isset($data->currencyRates)) {
-            $this->getContainer()->get('dataManager')->rebuildDatabase([]);
-        }
+        $this->getServiceFactory()->create('Settings')->setConfigData($data);

        return $this->getConfigData();
    }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -49,24 +49,59 @@ class Stream extends \Espo\Core\Controllers\Base

        $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
-        ));
+        ]);

-        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()
+        ];
    }
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -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;
+    }
+}
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -105,5 +105,21 @@ class User extends \Espo\Core\Controllers\Record

        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 beforeCreateLink()
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+    }
+
+    public function beforeRemoveLink($params, $data, $request)
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+    }
+}
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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);
+    }
+}
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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()
@@ -265,15 +271,26 @@ class Base implements Injectable
                    &&
                    $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;
                    }
                }
            }
@@ -281,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';
+        }
+    }
+}
@@ -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;
+    }
+}
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -182,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)[];
@@ -554,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);
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,18 +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()
@@ -85,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;
@@ -125,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);
    }
@@ -182,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);
@@ -235,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')
@@ -288,4 +367,46 @@ class AclManager
        $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);
+    }
 }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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();
@@ -94,7 +99,7 @@ class Application
        exit;
    }

-    public function runEntryPoint($entryPoint, $data = array(), $final = false)
+    public function runEntryPoint($entryPoint, $data = [], $final = false)
    {
        if (empty($entryPoint)) {
            throw new \Error();
@@ -128,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();

@@ -141,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 (count($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');
@@ -153,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;
@@ -177,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);
@@ -193,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);
@@ -224,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);
            }
        });

@@ -244,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'];
            });

@@ -273,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)
@@ -316,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');
@@ -328,9 +376,9 @@ class Application
    public function setupSystemUser()
    {
        $user = $this->getContainer()->get('entityManager')->getEntity('User', 'system');
-        $user->set('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);
    }
 }
-
@@ -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);
+    }
+}
@@ -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;
+        }
+    }
+}
@@ -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;
+    }
+}
@@ -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;
+    }
+}
@@ -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";
+    }
+}
@@ -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";
+    }
+}
@@ -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";
+        }
+    }
+}
@@ -0,0 +1,186 @@
+<?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 Upgrade extends Base
+{
+    public function run()
+    {
+        $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;
+        }
+
+        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...");
+
+        $this->upgrade($upgradePackageFilePath);
+
+        fwrite(\STDOUT, "\n");
+
+        fwrite(\STDOUT, $resultText);
+
+        $this->getFileManager()->unlink($upgradePackageFilePath);
+
+        $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 upgrade($filePath)
+    {
+        $app = new \Espo\Core\Application();
+        $app->setupSystemUser();
+
+        $upgradeManager = new \Espo\Core\UpgradeManager($app->getContainer());
+
+        try {
+            $fileData = file_get_contents($filePath);
+            $fileData = 'data:application/zip;base64,' . base64_encode($fileData);
+
+            $upgradeId = $upgradeManager->upload($fileData);
+            $upgradeManager->install(['id' => $upgradeId]);
+        } catch (\Exception $e) {
+            die("Error: " . $e->getMessage() . "\n");
+        }
+    }
+
+    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 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);
+    }
+}
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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;
    }

@@ -119,7 +115,7 @@ class Container
        $rotation = $config->get('logger.rotation', true);

        $log = new \Espo\Core\Utils\Log('Espo');
-        $levelCode = $log->getLevelCode($config->get('logger.level', 'WARNING'));
+        $levelCode = $log::toMonologLevel($config->get('logger.level', 'WARNING'));

        if ($rotation) {
            $maxFileNumber = $config->get('logger.maxFileNumber', 30);
@@ -131,7 +127,7 @@ class Container

        $errorHandler = new \Monolog\ErrorHandler($log);
        $errorHandler->registerExceptionHandler(null, false);
-        $errorHandler->registerErrorHandler(array(), false);
+        $errorHandler->registerErrorHandler([], false);

        return $log;
    }
@@ -176,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(
@@ -209,16 +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'),
-            $this->get('injectableFactory')
+        return new \Espo\Core\NotificatorFactory(
+            $this
        );
    }

@@ -247,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');
@@ -273,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')
        );
    }

@@ -302,7 +291,7 @@ class Container
            'en_US',
            $this->get('fileManager'),
            $this->get('metadata'),
-            $this->get('useCache')
+            $this->get('config')->get('useCache')
        );
    }

@@ -312,7 +301,7 @@ class Container
            \Espo\Core\Utils\Language::detectLanguage($this->get('config')),
            $this->get('fileManager'),
            $this->get('metadata'),
-            $this->get('useCache')
+            $this->get('config')->get('useCache')
        );
    }

@@ -359,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(
@@ -379,4 +360,3 @@ class Container
        $this->set('user', $user);
    }
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,27 +76,48 @@ class ControllerManager
            }
        }

-        if ($data && stristr($request->getContentType(), 'application/json')) {
-            $data = json_decode($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;
@@ -101,24 +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', $controllerName, $primaryActionMethodName])) {
+            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) {
@@ -127,4 +152,10 @@ 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);
+    }
 }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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');
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,11 +67,9 @@ 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->getValueMap();
    }
@@ -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,7 +93,7 @@ class Record extends Base

        $service = $this->getRecordService();

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

@@ -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,7 +114,7 @@ class Record extends Base

        $id = $params['id'];

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

@@ -125,39 +127,30 @@ 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']->getValueMapList() : $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)
@@ -166,33 +159,17 @@ 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);

+        $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) [
@@ -204,15 +181,7 @@ class Record extends Base

    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)
@@ -220,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']->getValueMapList() : $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)
@@ -263,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();
@@ -271,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();
        }
@@ -312,9 +274,9 @@ class Record extends Base
            $params['format'] = $data->format;
        }

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

    public function actionMassUpdate($params, $data, $request)
@@ -330,6 +292,10 @@ class Record extends Base
            throw new BadRequest();
        }

+        if ($this->getAcl()->get('massUpdatePermission') !== 'yes') {
+            throw new Forbidden();
+        }
+
        $params = array();
        if (property_exists($data, 'where') && !empty($data->byWhere)) {
            $params['where'] = json_decode(json_encode($data->where), true);
@@ -342,33 +308,26 @@ class Record extends Base

        $attributes = $data->attributes;

-        $idsUpdated = $this->getRecordService()->massUpdate($attributes, $params);
+        $idsUpdated = $this->getRecordService()->massUpdate($params, $attributes);

        return $idsUpdated;
    }

-    public function actionMassDelete($params, $data, $request)
+    public function postActionMassDelete($params, $data, $request)
    {
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
        if (!$this->getAcl()->check($this->name, 'delete')) {
            throw new Forbidden();
        }

-        $params = array();
-        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);
+        $actionParams = $this->getMassActionParamsFromData($data);
+
+        if (array_key_exists('where', $actionParams)) {
+            if ($this->getAcl()->get('massUpdatePermission') !== 'yes') {
+                throw new Forbidden();
            }
        }
-        if (property_exists($data, 'ids')) {
-            $params['ids'] = $data->ids;
-        }

-        return $this->getRecordService()->massRemove($params);
+        return $this->getRecordService()->massDelete($actionParams);
    }

    public function actionCreateLink($params, $data, $request)
@@ -395,7 +354,7 @@ class Record extends Base
                $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)) {
@@ -409,7 +368,7 @@ class Record extends Base

            $result = false;
            foreach ($foreignIdList as $foreignId) {
-                if ($this->getRecordService()->linkEntity($id, $link, $foreignId)) {
+                if ($this->getRecordService()->link($id, $link, $foreignId)) {
                    $result = true;
                }
            }
@@ -446,7 +405,7 @@ class Record extends Base

        $result = false;
        foreach ($foreignIdList as $foreignId) {
-            if ($this->getRecordService()->unlinkEntity($id, $link, $foreignId)) {
+            if ($this->getRecordService()->unlink($id, $link, $foreignId)) {
                $result = $result || true;
            }
        }
@@ -542,4 +501,39 @@ class Record extends Base

        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);
+    }
 }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
 {
@@ -48,8 +51,21 @@ class CronManager

    private $cronScheduledJobUtil;

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

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

    const SUCCESS = 'Success';
@@ -70,6 +86,14 @@ class CronManager
        $this->scheduledJobUtil = $this->container->get('scheduledJob');
        $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()
@@ -146,10 +170,18 @@ class CronManager
        return false;
    }

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

        $this->setLastRunTime(time());

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

-        $pendingJobList = $this->getCronJobUtil()->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) {
            $skip = false;
-            $this->getEntityManager()->getPdo()->query('LOCK TABLES `job` WRITE');
-            if ($this->getCronJobUtil()->isJobPending($job->id)) {
+            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;
@@ -181,43 +235,107 @@ class CronManager
            }

            if ($skip) {
-                $this->getEntityManager()->getPdo()->query('UNLOCK TABLES');
+                if (!$noLock) $this->unlockTables();
                continue;
            }

-            $job->set('status', self::RUNNING);
-            $job->set('pid', $this->getCronJobUtil()->getPid());
-            $this->getEntityManager()->saveEntity($job);
-            $this->getEntityManager()->getPdo()->query('UNLOCK TABLES');
+            $job->set('startedAt', date('Y-m-d H:i:s'));

-            $isSuccess = true;
-            $skipLog = false;
-
-            try {
-                if ($job->get('scheduledJobId')) {
-                    $this->runScheduledJob($job);
-                } else {
-                    $this->runService($job);
-                }
-            } catch (\Exception $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());
-                }
+            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;
-
-            $job->set('status', $status);
            $this->getEntityManager()->saveEntity($job);
+            if (!$noLock) $this->unlockTables();

-            if ($job->get('scheduledJobId') && !$skipLog) {
-                $this->getCronScheduledJobUtil()->addLogRecord($job->get('scheduledJobId'), $status, null, $job->get('targetId'), $job->get('targetType'));
+            if ($useProcessPool) {
+                $task = new \Espo\Core\Utils\Cron\JobTask($job->id);
+                $pool->add($task);
+            } else {
+                $this->runJob($job);
            }
        }
+
+        if ($useProcessPool) {
+            $pool->wait();
+        }
+    }
+
+    protected function lockJobTable()
+    {
+        $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)
@@ -225,18 +343,14 @@ class CronManager
        $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 ($job->get('data')) {
            $data = $job->get('data');
        }
@@ -244,80 +358,78 @@ class CronManager
        $jobClass->$method($data, $job->get('targetId'), $job->get('targetType'));
    }

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

        if (!$serviceName) {
-            throw new Error('Job with empty serviceName.');
+            throw new Error("Job with empty serviceName.");
        }

-        if (!$this->getServiceFactory()->checkExists($serviceName)) {
-            throw new NotFound();
-        }
+        if (!$this->getServiceFactory()->checkExists($serviceName)) throw new Error();

        $service = $this->getServiceFactory()->create($serviceName);

        $methodNameDeprecated = $job->get('method');
        $methodName = $job->get('methodName');

-        $isDeprecated = false;
-        if (!$methodName) {
-            $isDeprecated = true;
-            $methodName = $methodNameDeprecated;
-        }
+        if (!$methodName) throw new Error('Job with empty methodName.');

-        if (!$methodName) {
-            throw new Error('Job with empty methodName.');
-        }
-
-        if (!method_exists($service, $methodName)) {
-            throw new NotFound();
-        }
+        if (!method_exists($service, $methodName)) throw new Error();

        $data = $job->get('data');

-        if ($isDeprecated) {
-            $data = Json::decode(Json::encode($data), true);
-        }
-
        $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'));
+    }
+
    protected function createJobsFromScheduledJobs()
    {
        $activeScheduledJobList = $this->getCronScheduledJobUtil()->getActiveScheduledJobList();
-
        $runningScheduledJobIdList = $this->getCronJobUtil()->getRunningScheduledJobIdList();

-        $createdJobIdList = array();
+        $createdJobIdList = [];
        foreach ($activeScheduledJobList as $scheduledJob) {
            $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->getCronJobUtil()->getJobByScheduledJob($scheduledJob->id, $nextDate);
-            if ($existingJob) continue;
-
            $className = $this->getScheduledJobUtil()->get($scheduledJob->get('job'));
            if ($className) {
                if (method_exists($className, 'prepare')) {
@@ -331,13 +443,25 @@ class CronManager
                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(
+            $jobEntity->set([
                'name' => $scheduledJob->get('name'),
                'status' => self::PENDING,
                'scheduledJobId' => $scheduledJob->id,
                'executeTime' => $nextDate
-            ));
+            ]);
            $this->getEntityManager()->saveEntity($jobEntity);
        }
    }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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();
@@ -117,6 +119,7 @@ class DataManager
        $metadata->init(true);

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

        $this->updateCacheTimestamp();

@@ -128,18 +131,21 @@ 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);
                    }
@@ -148,29 +154,61 @@ class DataManager
                        $name = $defs['name'];
                    }
                    $job = $entityManager->getEntity('ScheduledJob');
-                    $job->set(array(
+                    $job->set([
                        'job' => $jobName,
                        'status' => 'Active',
                        'scheduling' => $defs['scheduling'],
                        'isInternal' => true,
                        '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();
+
        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();
+    }
+}
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,14 +25,11 @@
 *
 * 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\Exceptions;

 class BadRequest extends \Exception
 {
    protected $code = 400;
-
 }
-
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,13 +25,11 @@
 *
 * 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\Exceptions;

 class Conflict extends \Exception
 {
    protected $code = 409;
-
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 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,7 +25,7 @@
 *
 * 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\Exceptions;

@@ -33,5 +33,3 @@ class Error extends InternalServerError
 {

 }
-
-
--- a/Show More
+++ b/Show More