v

fix kanban order
v
2021-02-01 11:48:33 +02:00 · 2021-01-30 17:59:08 +02:00 · 2021-01-29 12:29:47 +02:00 · 2021-01-29 11:31:51 +02:00 · 2021-01-28 14:06:22 +02:00 · 2021-01-27 12:27:33 +02:00
2287 changed files with 85032 additions and 40586 deletions
@@ -0,0 +1,11 @@
+* text=auto
+*.php text eol=crlf
+*.js text eol=crlf
+*.json text eol=crlf
+*.md text eol=crlf
+*.less text eol=crlf
+*.css text eol=crlf
+*.tpl text eol=crlf
+*.html text eol=crlf
+
+*.png binary
@@ -7,7 +7,7 @@
 /data/tmp/*
 /build
 /node_modules
-npm-debug.log
+/npm-debug.log
 /test.php
 /main.html

@@ -15,7 +15,7 @@ npm-debug.log
 !/tests/unit/testData/cache/.data
 /tests/integration/config.php
 .phpunit.result.cache
-composer.phar
-vendor/
+/composer.phar
+/vendor/
 /custom/Espo/Custom/*
-/install/config.php
+/install/config.php
@@ -2,7 +2,7 @@

 Before we can merge your pull request you need to accept our CLA [here](https://github.com/espocrm/cla). It's very simple to do.

-[Code Style Guidelines](https://github.com/espocrm/espocrm/wiki/Code-Style-Guidelines).
+See [Code Style Guidelines](https://github.com/espocrm/espocrm/wiki/Code-Style-Guidelines).

 Branches:

@@ -12,4 +12,6 @@ Branches:

 ## Issues

-We don't provide developer help or any kind of support on github. Please use our [forum](https://forum.espocrm.com) for this.
+When reporting a possible bug please provide detail steps so that we will be able to reproduce the issue. Please try not to use phrases like "very big bug", "huge issue", etc. No need to use exclamation marks as well.
+
+Note that we don't provide developer help or any kind of support on Github. Please use our [forum](https://forum.espocrm.com) for this.
@@ -2,7 +2,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -49,6 +49,7 @@ module.exports = function (grunt) {
        'client/lib/bull.js',
        'client/lib/marked.min.js',
        'client/lib/autobahn.js',
+        'client/lib/gridstack.all.js',

        'client/src/namespace.js',
        'client/src/exceptions.js',
@@ -211,6 +212,7 @@ module.exports = function (grunt) {
                    'daemon.php',
                    'rebuild.php',
                    'clear_cache.php',
+                    'preload.php',
                    'upgrade.php',
                    'extension.php',
                    'websocket.php',
@@ -288,8 +290,8 @@ module.exports = function (grunt) {
                },
                files: [
                    {
-                        src: 'build/tmp/application/Espo/Core/defaults/config.php',
-                        dest: 'build/tmp/application/Espo/Core/defaults/config.php'
+                        src: 'build/tmp/application/Espo/Resources/defaults/config.php',
+                        dest: 'build/tmp/application/Espo/Resources/defaults/config.php'
                    }
                ]
            }
@@ -313,11 +315,11 @@ module.exports = function (grunt) {
    });

    grunt.registerTask("unit-tests-run", function() {
-        cp.execSync("vendor/bin/phpunit --bootstrap=./vendor/autoload.php tests/unit", {stdio: 'inherit'});
+        cp.execSync("vendor/bin/phpunit ./tests/unit", {stdio: 'inherit'});
    });

    grunt.registerTask("integration-tests-run", function() {
-        cp.execSync("vendor/bin/phpunit --bootstrap=./vendor/autoload.php tests/integration", {stdio: 'inherit'});
+        cp.execSync("vendor/bin/phpunit ./tests/integration", {stdio: 'inherit'});
    });

    grunt.registerTask("zip", function() {
@@ -1,9 +1,9 @@
-<?php
+<?php
 /************************************************************************
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,5 +29,9 @@

 require_once('../../bootstrap.php');

-$app = new \Espo\Core\Application();
-$app->run();
+use Espo\Core\{
+    Application,
+    ApplicationRunners\Api,
+};
+
+(new Application())->run(Api::class);
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,11 +29,15 @@

 require_once('../../../bootstrap.php');

+use Espo\Core\{
+    Portal\Application,
+    Portal\ApplicationRunners\Api,
+};
+
 if (!empty($_GET['portalId'])) {
    $portalId = $_GET['portalId'];
 } else {
    $portalId = explode('/', $_SERVER['REQUEST_URI'])[count(explode('/', $_SERVER['SCRIPT_NAME'])) - 1];
 }

-$app = new \Espo\Core\Portal\Application($portalId);
-$app->run();
+(new Application($portalId))->run(Api::class);
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,14 +29,13 @@

 namespace Espo\Acl;

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

-class ActionHistoryRecord extends \Espo\Core\Acl\Base
+class ActionHistoryRecord extends \Espo\Core\Acl\Acl
 {
    public function checkIsOwner(EntityUser $user, Entity $entity)
    {
        return $entity->get('userId') === $user->id;
    }
 }
-
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,10 +29,10 @@

 namespace Espo\Acl;

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

-class Attachment extends \Espo\Core\Acl\Base
+class Attachment extends \Espo\Core\Acl\Acl
 {
    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
    {
@@ -90,4 +90,3 @@ class Attachment extends \Espo\Core\Acl\Base
        return false;
    }
 }
-
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,10 +29,10 @@

 namespace Espo\Acl;

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

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

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

 namespace Espo\Acl;

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

-class EmailAddress extends \Espo\Core\Acl\Base
+class EmailAddress extends \Espo\Core\Acl\Acl
 {
    public function checkEditInEntity(EntityUser $user, Entity $entity, Entity $excludeEntity)
    {
@@ -62,4 +62,3 @@ class EmailAddress extends \Espo\Core\Acl\Base
        return !$isFobidden;
    }
 }
-
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,10 +29,10 @@

 namespace Espo\Acl;

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

-class EmailFilter extends \Espo\Core\Acl\Base
+class EmailFilter extends \Espo\Core\Acl\Acl
 {
    public function checkIsOwner(EntityUser $user, Entity $entity)
    {
@@ -53,4 +53,3 @@ class EmailFilter extends \Espo\Core\Acl\Base
        return;
    }
 }
-
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,12 +29,11 @@

 namespace Espo\Acl;

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

-class Import extends \Espo\Core\Acl\Base
+class Import extends \Espo\Core\Acl\Acl
 {
-
    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
    {
        if ($user->isAdmin()) return true;
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,10 +29,10 @@

 namespace Espo\Acl;

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

-class Note extends \Espo\Core\Acl\Base
+class Note extends \Espo\Core\Acl\Acl
 {
    protected $deleteThresholdPeriod = '1 month';

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

 namespace Espo\Acl;

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

-class Notification extends \Espo\Core\Acl\Base
+class Notification extends \Espo\Core\Acl\Acl
 {
    public function checkIsOwner(EntityUser $user, Entity $entity)
    {
@@ -42,4 +42,3 @@ class Notification extends \Espo\Core\Acl\Base
        return false;
    }
 }
-
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,10 +29,10 @@

 namespace Espo\Acl;

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

-class PhoneNumber extends \Espo\Core\Acl\Base
+class PhoneNumber extends \Espo\Core\Acl\Acl
 {
    public function checkEditInEntity(EntityUser $user, Entity $entity, Entity $excludeEntity)
    {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,10 +29,10 @@

 namespace Espo\Acl;

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

-class ScheduledJob extends \Espo\Core\Acl\Base
+class ScheduledJob extends \Espo\Core\Acl\Acl
 {
    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
    {
@@ -58,4 +58,3 @@ class ScheduledJob extends \Espo\Core\Acl\Base
        return $this->checkEntity($user, $entity, $data, 'create');
    }
 }
-
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,13 +29,15 @@

 namespace Espo\Acl;

-use \Espo\ORM\Entity;
+use Espo\ORM\Entity;

-class Team extends \Espo\Core\Acl\Base
+use Espo\Entities\User as UserEntity;
+
+class Team extends \Espo\Core\Acl\Acl
 {
-    public function checkInTeam(\Espo\Entities\User $user, Entity $entity)
+    public function checkInTeam(UserEntity $user, Entity $entity)
    {
        $userTeamIdList = $user->getLinkMultipleIdList('teams');
        return in_array($entity->id, $userTeamIdList);
    }
-}
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,12 +29,12 @@

 namespace Espo\Acl;

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

-class User extends \Espo\Core\Acl\Base
+class User extends \Espo\Core\Acl\Acl
 {
-    public function checkIsOwner(\Espo\Entities\User $user, Entity $entity)
+    public function checkIsOwner(EntityUser $user, Entity $entity)
    {
        return $user->id === $entity->id;
    }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,10 +29,10 @@

 namespace Espo\Acl;

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

-class Webhook extends \Espo\Core\Acl\Base
+class Webhook extends \Espo\Core\Acl\Acl
 {
    public function checkIsOwner(EntityUser $user, Entity $entity)
    {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -0,0 +1,89 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\AddressFormatters;
+
+use Espo\Core\FieldUtils\Address\{
+    AddressFormatter,
+    AddressValue,
+};
+
+class Formatter1 implements AddressFormatter
+{
+    public function format(AddressValue $address) : string
+    {
+        $result = '';
+
+        $street = $address->getStreet();
+        $city = $address->getCity();
+        $country = $address->getCountry();
+        $state = $address->getState();
+        $postalCode = $address->getPostalCode();
+
+        if ($street) {
+            $result .= $street;
+        }
+
+        if ($city || $state || $postalCode) {
+            if ($result) {
+                $result .= "\n";
+            }
+
+            if ($city) {
+                $result .= $city;
+            }
+
+            if ($state && $city) {
+                $result .= ', ';
+            }
+
+            if ($state) {
+                $result .= $state;
+            }
+
+            if ($postalCode && ($state || $city)) {
+                $result .= ' ';
+            }
+
+            if ($postalCode) {
+                $result .= $postalCode;
+            }
+        }
+
+        if ($country) {
+            if ($result) {
+                $result .= "\n";
+            }
+
+            $result .= $country;
+        }
+
+        return $result;
+    }
+}
@@ -0,0 +1,91 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\AddressFormatters;
+
+use Espo\Core\FieldUtils\Address\{
+    AddressFormatter,
+    AddressValue,
+};
+
+class Formatter2 implements AddressFormatter
+{
+    public function format(AddressValue $address) : string
+    {
+        $result = '';
+
+        $street = $address->getStreet();
+        $city = $address->getCity();
+        $country = $address->getCountry();
+        $state = $address->getState();
+        $postalCode = $address->getPostalCode();
+
+        if ($street) {
+            $result .= $street;
+        }
+
+        if ($city || $postalCode) {
+            if ($result) {
+                $result .= "\n";
+            }
+
+            if ($postalCode) {
+                $result .= $postalCode;
+            }
+
+            if ($postalCode && $city) {
+                $result .= ' ';
+            }
+
+            if ($city) {
+                $result .= $city;
+            }
+        }
+
+        if ($state || $country) {
+            if ($result) {
+                $result .= "\n";
+            }
+
+            if ($state) {
+                $result .= $state;
+            }
+
+            if ($state && $country) {
+                $result .= ' ';
+            }
+
+            if ($country) {
+                $result .= $country;
+            }
+        }
+
+        return $result;
+    }
+}
@@ -0,0 +1,89 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\AddressFormatters;
+
+use Espo\Core\FieldUtils\Address\{
+    AddressFormatter,
+    AddressValue,
+};
+
+class Formatter3 implements AddressFormatter
+{
+    public function format(AddressValue $address) : string
+    {
+        $result = '';
+
+        $street = $address->getStreet();
+        $city = $address->getCity();
+        $country = $address->getCountry();
+        $state = $address->getState();
+        $postalCode = $address->getPostalCode();
+
+        if ($country) {
+            $result .= $country;
+        }
+
+        if ($city || $state || $postalCode) {
+            if ($result) {
+                $result .= "\n";
+            }
+
+            if ($state) {
+                $result .= $state;
+            }
+
+            if ($state && $postalCode) {
+                $result .= ' ';
+            }
+
+            if ($postalCode) {
+                $result .= $postalCode;
+            }
+
+            if ($city && ($state || $postalCode)) {
+                $result .= ' ';
+            }
+
+            if ($city) {
+                $result .= $city;
+            }
+        }
+
+        if ($street) {
+            if ($result) {
+                $result .= "\n";
+            }
+
+            $result .= $street;
+        }
+
+        return $result;
+    }
+}
@@ -0,0 +1,89 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\AddressFormatters;
+
+use Espo\Core\FieldUtils\Address\{
+    AddressFormatter,
+    AddressValue,
+};
+
+class Formatter4 implements AddressFormatter
+{
+    public function format(AddressValue $address) : string
+    {
+        $result = '';
+
+        $street = $address->getStreet();
+        $city = $address->getCity();
+        $country = $address->getCountry();
+        $state = $address->getState();
+        $postalCode = $address->getPostalCode();
+
+        if ($street) {
+            $result .= $street;
+        }
+
+        if ($city) {
+            if ($result) {
+                $result .= "\n";
+            }
+
+            $result .= $city;
+        }
+
+        if ($country || $state || $postalCode) {
+            if ($result) {
+                $result .= "\n";
+            }
+
+            if ($country) {
+                $result .= $country;
+            }
+
+            if ($state && $country) {
+                $result .= ' - ';
+            }
+
+            if ($state) {
+                $result .= $state;
+            }
+
+            if ($postalCode && ($state || $country)) {
+                $result .= ' ';
+            }
+
+            if ($postalCode) {
+                $result .= $postalCode;
+            }
+        }
+
+        return $result;
+    }
+}
@@ -0,0 +1,121 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\AppInfo;
+
+use Espo\Core\{
+    Utils\File\Manager as FileManager,
+    Utils\Module,
+    Binding\EspoBindingLoader,
+    Binding\Binding as BindingItem,
+};
+
+class Binding
+{
+    protected $fileManager;
+
+    public function __construct(FileManager $fileManager)
+    {
+        $this->fileManager = $fileManager;
+    }
+
+    public function process(array $options, array $flagList) : ?string
+    {
+        $result = '';
+
+        $bindingLoader = new EspoBindingLoader(
+            new Module($this->fileManager)
+        );
+
+        $data = $bindingLoader->load();
+
+        $keyList = $data->getGlobalKeyList();
+
+        $result .= "Global:\n\n";
+
+        foreach ($keyList as $key) {
+            $result .= $this->printItem($key, $data->getGlobal($key));
+        }
+
+        $contextList = $data->getContextList();
+
+        foreach ($contextList as $context) {
+            $result .= "Context: {$context}\n\n";
+
+            $keyList = $data->getContextKeyList($context);
+
+            foreach ($keyList as $key) {
+                $result .= $this->printItem($key, $data->getContext($context, $key), true);
+            }
+        }
+
+        return $result;
+    }
+
+    private function printItem(string $key, BindingItem $binding) : string
+    {
+        $result = '';
+
+        $tab = '  ';
+
+        $result .= $tab . "Key:   {$key}\n";
+
+        $type = $binding->getType();
+        $value = $binding->getValue();
+
+        $typeString = [
+            BindingItem::IMPLEMENTATION_CLASS_NAME => 'Implementation',
+            BindingItem::CONTAINER_SERVICE => 'Service',
+            BindingItem::VALUE => 'Value',
+            BindingItem::CALLBACK => 'Callback',
+        ][$type];
+
+        $result .= $tab . "Type:  {$typeString}\n";
+
+        if ($type == BindingItem::IMPLEMENTATION_CLASS_NAME || $type == BindingItem::CONTAINER_SERVICE) {
+            $result .= $tab . "Value: {$value}\n";
+        }
+
+        if ($type == BindingItem::VALUE) {
+            if (is_string($value) || is_int($value) || is_float($value)) {
+                $result .= $tab . "Value: {$value}\n";
+            }
+
+            if (is_bool($value)) {
+                $valueString = $value ? 'true' : 'false';
+
+                $result .= $tab . "Value: {$valueString}\n";
+            }
+        }
+
+        $result .= "\n";
+
+        return $result;
+    }
+}
@@ -0,0 +1,107 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\AppInfo;
+
+use Espo\Core\{
+    Container as ContainerService,
+    Utils\Metadata,
+};
+
+class Container
+{
+    protected $container;
+    protected $metadata;
+
+    public function __construct(ContainerService $container, Metadata $metadata)
+    {
+        $this->container = $container;
+        $this->metadata = $metadata;
+    }
+
+    public function process(array $options, array $flagList) : ?string
+    {
+        $nameOnly = in_array('nameOnly', $flagList);
+
+        $result = '';
+
+        $serviceList = [
+            'injectableFactory',
+            'config',
+            'log',
+            'fileManager',
+            'dataManager',
+            'metadata',
+            'user',
+        ];
+
+        $fileList = scandir('application/Espo/Core/Loaders');
+
+        if (file_exists('custom/Espo/Custom/Core/Loaders')) {
+            $fileList = array_merge($fileList, scandir('custom/Espo/Custom/Core/Loaders'));
+        }
+
+        foreach ($fileList as $file) {
+            if (substr($file, -4) === '.php') {
+                $name = lcfirst(substr($file, 0, -4));
+
+                if (!in_array($name, $serviceList) && $this->container->has($name)) {
+                    $serviceList[] = $name;
+                }
+            }
+        }
+
+        foreach ($this->metadata->get(['app', 'containerServices']) ?? [] as $name => $data) {
+            if (!in_array($name, $serviceList)) {
+                $serviceList[] = $name;
+            }
+        }
+
+        sort($serviceList);
+
+        if ($nameOnly) {
+            foreach ($serviceList as $name) {
+                $result .= $name . "\n";
+            }
+
+            return $result;
+        }
+
+        foreach ($serviceList as $name) {
+            $result .= $name . "\n";
+
+            $obj = $this->container->get($name);
+            $result .= get_class($obj) . "\n";
+
+            $result .= "\n";
+        }
+
+        return $result;
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,31 +27,44 @@
 * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

-namespace Espo\Core\AppParams;
+namespace Espo\Classes\AppParams;

-class TemplateEntityTypeList extends \Espo\Core\Injectable
+use Espo\Core\{
+    Acl,
+    Select\SelectManagerFactory,
+    ORM\EntityManager,
+};
+
+/**
+ * Returns a list of entity types for which a PDF template exists.
+ */
+class TemplateEntityTypeList
 {
-    protected function init()
+    protected $acl;
+    protected $selectManagerFactory;
+    protected $entityManager;
+
+    public function __construct(Acl $acl, SelectManagerFactory $selectManagerFactory, EntityManager $entityManager)
    {
-        $this->addDependency('acl');
-        $this->addDependency('selectManagerFactory');
-        $this->addDependency('entityManager');
+        $this->acl = $acl;
+        $this->selectManagerFactory = $selectManagerFactory;
+        $this->entityManager = $entityManager;
    }

    public function get()
    {
-        if (!$this->getInjection('acl')->checkScope('Template')) {
+        if (!$this->acl->checkScope('Template')) {
            return [];
        }

        $list = [];

-        $selectManager = $this->getInjection('selectManagerFactory')->create('Template');
+        $selectManager = $this->selectManagerFactory->create('Template');

        $selectParams = $selectManager->getEmptySelectParams();
        $selectManager->applyAccess($selectParams);

-        $templateList = $this->getInjection('entityManager')->getRepository('Template')
+        $templateList = $this->entityManager->getRepository('Template')
            ->select(['entityType'])
            ->groupBy(['entityType'])
            ->find($selectParams);
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,42 +27,44 @@
 * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

-namespace Espo\Core\Utils\Authentication;
+namespace Espo\Classes\Cleanup;

-use \Espo\Core\Utils\Config;
-use \Espo\Core\ORM\EntityManager;
-use \Espo\Core\Utils\Auth;
+use Espo\Core\{
+    Utils\Config,
+    ORM\EntityManager,
+};

-abstract class Base
+use DateTime;
+
+class Reminders
 {
    protected $config;
-
    protected $entityManager;

-    private $passwordHash;
-
    public function __construct(Config $config, EntityManager $entityManager)
    {
        $this->config = $config;
        $this->entityManager = $entityManager;
    }

-    protected function getConfig()
-    {
-        return $this->config;
-    }
+    protected $cleanupRemindersPeriod = '15 days';

-    protected function getEntityManager()
+    public function process()
    {
-        return $this->entityManager;
-    }
+        $period = '-' . $this->config->get('cleanupRemindersPeriod', $this->cleanupRemindersPeriod);

-    protected function getPasswordHash()
-    {
-        if (!isset($this->passwordHash)) {
-            $this->passwordHash = new \Espo\Core\Utils\PasswordHash($this->config);
-        }
+        $dt = new DateTime();

-        return $this->passwordHash;
+        $dt->modify($period);
+
+        $delete = $this->entityManager->getQueryBuilder()
+            ->delete()
+            ->from('Reminder')
+            ->where([
+                'remindAt<' => $dt->format('Y-m-d'),
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,33 +27,63 @@
 * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

-namespace Espo\Core\Cleanup;
+namespace Espo\Classes\Cleanup;

-class WebhookQueue extends Base
+use Espo\Core\{
+    Utils\Config,
+    ORM\EntityManager,
+};
+
+use DateTime;
+
+class WebhookQueue
 {
    protected $cleanupWebhookQueuePeriod = '10 days';

+    protected $config;
+    protected $entityManager;
+
+    public function __construct(Config $config, EntityManager $entityManager)
+    {
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+    }
+
    public function process()
    {
-        $pdo = $this->getEntityManager()->getPDO();
+        $period = '-' . $this->config->get('cleanupWebhookQueuePeriod', $this->cleanupWebhookQueuePeriod);
+
+        $datetime = new DateTime();

-        $period = '-' . $this->getConfig()->get('cleanupWebhookQueuePeriod', $this->cleanupWebhookQueuePeriod);
-        $datetime = new \DateTime();
        $datetime->modify($period);
        $from = $datetime->format('Y-m-d H:i:s');

-        $query = "
-            DELETE FROM `webhook_queue_item`
-            WHERE
-                DATE(created_at) < ".$pdo->quote($from)." AND
-                (status <> 'Pending' OR deleted = 1)
-        ";
-        $pdo->query($query);
+        $query = $this->entityManager->getQueryBuilder()
+            ->delete()
+            ->from('WebhookQueueItem')
+            ->where([
+                'DATE:(createdAt)<' => $from,
+                'OR' => [
+                    'status!=' => 'Pending',
+                    'deleted' => true,
+                ],
+            ])
+            ->build();

-        $query = "
-            DELETE FROM `webhook_event_queue_item`
-            WHERE DATE(created_at) < ".$pdo->quote($from)." AND (is_processed = 1 OR deleted = 1)
-        ";
-        $pdo->query($query);
+        $this->entityManager->getQueryExecutor()->execute($query);
+
+        $query = $this->entityManager->getQueryBuilder()
+            ->delete()
+            ->from('WebhookEventQueueItem')
+            ->where([
+                'DATE:(createdAt)<' => $from,
+                'OR' => [
+                    'isProcessed' => true,
+                    'deleted' => true,
+                ],
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($query);
    }
 }
@@ -0,0 +1,138 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\ConsoleCommands;
+
+use Espo\Core\{
+    ServiceFactory,
+    Console\Commands\Command,
+};
+
+use Throwable;
+
+class Import implements Command
+{
+    protected $serviceFactory;
+
+    public function __construct(ServiceFactory $serviceFactory)
+    {
+        $this->serviceFactory = $serviceFactory;
+    }
+
+    public function run(array $options, array $flagList)
+    {
+        $id = $options['id'] ?? null;
+        $filePath = $options['file'] ?? null;
+        $paramsId = $options['paramsId'] ?? null;
+
+        $service = $this->serviceFactory->create('Import');
+
+        $forceResume = in_array('resume', $flagList);
+        $revert = in_array('revert', $flagList);
+
+        if (!$id && $filePath) {
+            if (!$paramsId) {
+                $this->out("You need to specify --params-id option.\n");
+
+                return;
+            }
+
+            if (!file_exists($filePath)) {
+                $this->out("File not found.\n");
+
+                return;
+            }
+
+            $contents = file_get_contents($filePath);
+
+            try {
+                $result = $service->importFileWithParamsId($contents, $paramsId);
+
+                $resultId = $result->id;
+                $countCreated = $result->countCreated;
+                $countUpdated = $result->countUpdated;
+            }
+            catch (Throwable $e) {
+                $this->out("Error occured: ".$e->getMessage()."\n");
+
+                return;
+            }
+
+            $this->out("Finished. Import ID: {$resultId}. Created: {$countCreated}. Updated: {$countUpdated}.\n");
+
+            return;
+        }
+
+        if ($id && $revert) {
+            $this->out("Reverting import...\n");
+
+            try {
+                $service->revert($id);
+            }
+            catch (Throwable $e) {
+                $this->out("Error occured: " . $e->getMessage() . "\n");
+
+                return;
+            }
+
+            $this->out("Finished.\n");
+
+            return;
+        }
+
+        if ($id) {
+            $this->out("Running import, this may take a while...\n");
+
+            try {
+                $result = $service->importById($id, true, $forceResume);
+            }
+            catch (Throwable $e) {
+                $this->out("Error occured: " . $e->getMessage() . "\n");
+
+                return;
+            }
+
+            $countCreated = $result->countCreated;
+            $countUpdated = $result->countUpdated;
+
+            $this->out("Finished. Created: {$countCreated}. Updated: {$countUpdated}.\n");
+
+            return;
+        }
+
+        $this->out("Not enough params passed.\n");
+
+        return;
+    }
+
+    protected function out($string)
+    {
+        fwrite(\STDOUT, $string);
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,13 +27,15 @@
 * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

-namespace Espo\Core\Utils\Layout\Defaults;
+namespace Espo\Classes\DefaultLayouts;
+
+use Espo\Core\Utils\Metadata;

 class DefaultSidePanelType
 {
    protected $metadata;

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;

 class ArrayType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
    {
        return $this->isNotEmpty($entity, $field);
    }

-    public function checkMaxCount(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMaxCount(Entity $entity, string $field, $validationValue, $data) : bool
    {
        if (!$this->isNotEmpty($entity, $field)) return true;
        $list = $entity->get($field);
@@ -44,7 +46,7 @@ class ArrayType extends BaseType
        return true;
    }

-    public function checkArray(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkArray(Entity $entity, string $field, $validationValue, $data) : bool
    {
        if (isset($data->$field) && $data->$field !== null && !is_array($data->$field)) {
            return false;
@@ -53,7 +55,7 @@ class ArrayType extends BaseType
        return true;
    }

-    protected function isNotEmpty(\Espo\ORM\Entity $entity, $field)
+    protected function isNotEmpty(Entity $entity, $field)
    {
        if (!$entity->has($field) || $entity->get($field) === null) return false;
        $list = $entity->get($field);
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,33 +27,33 @@
 * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;

-use \Espo\ORM\Entity;
+use Espo\ORM\Entity;
+
+use Espo\Core\{
+    Utils\Metadata,
+    Utils\FieldUtil,
+};

 class BaseType
 {
-    private $metadata;
-    private $fieldManagerUtil;
+    protected $metadata;
+    protected $fieldUtil;

-    public function __construct(\Espo\Core\Utils\Metadata $metadata, \Espo\Core\Utils\FieldManagerUtil $fieldManagerUtil)
+    public function __construct(Metadata $metadata, FieldUtil $fieldUtil)
    {
        $this->metadata = $metadata;
-        $this->fieldManagerUtil = $fieldManagerUtil;
+        $this->fieldUtil = $fieldUtil;
    }

    protected function getActualAttributeList(Entity $entity, string $field) : array
    {
-        return $this->getFieldManagerUtil()->getActualAttributeList($entity->getEntityType(), $field);
+        return $this->fieldUtil->getActualAttributeList($entity->getEntityType(), $field);
    }

-    protected function getMetadata() : \Espo\Core\Utils\Metadata
+    protected function getMetadata() : Metadata
    {
        return $this->metadata;
    }
-
-    protected function getFieldManagerUtil() : \Espo\Core\Utils\FieldManagerUtil
-    {
-        return $this->fieldManagerUtil;
-    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
 * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;

 class DateType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
    {
        return $this->isNotEmpty($entity, $field);
    }

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;

 class DatetimeOptionalType extends DatetimeType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
    {
        return $this->isNotEmpty($entity, $field);
    }

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;

 class EmailType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
    {
        if ($this->isNotEmpty($entity, $field)) return true;

@@ -45,7 +47,7 @@ class EmailType extends BaseType
        return false;
    }

-    public function checkEmailAddress(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkEmailAddress(Entity $entity, string $field, $validationValue, $data) : bool
    {
        if ($this->isNotEmpty($entity, $field)) {
            $address = $entity->get($field);
@@ -68,7 +70,7 @@ class EmailType extends BaseType
        return true;
    }

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;

 class EnumType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
    {
        return $this->isNotEmpty($entity, $field);
    }

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;

 class IntType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
    {
        return $this->isNotEmpty($entity, $field);
    }

-    public function checkMax(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMax(Entity $entity, string $field, $validationValue, $data) : bool
    {
        if (!$this->isNotEmpty($entity, $field)) return true;
        if ($entity->get($field) > $validationValue) return false;
        return true;
    }

-    public function checkMin(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMin(Entity $entity, string $field, $validationValue, $data) : bool
    {
        if (!$this->isNotEmpty($entity, $field)) return true;
        if ($entity->get($field) < $validationValue) return false;
        return true;
    }

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;

 class JsonArrayType extends BaseType
 {
-    public function checkArray(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkArray(Entity $entity, string $field, $validationValue, $data) : bool
    {
        if (!$entity->has($field) || $entity->get($field) === null) return true;

        return is_array($entity->get($field));
    }

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;

 class LinkType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
    {
        $idAttribute = $field . 'Id';

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;

 class PhoneType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
    {
        if ($this->isNotEmpty($entity, $field)) return true;

@@ -45,7 +47,7 @@ class PhoneType extends BaseType
        return false;
    }

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

-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
+
+use Espo\ORM\Entity;

 class VarcharType extends BaseType
 {
-    public function checkRequired(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkRequired(Entity $entity, string $field, $validationValue, $data) : bool
    {
        return $this->isNotEmpty($entity, $field);
    }

-    public function checkMaxLength(\Espo\ORM\Entity $entity, string $field, $validationValue, $data) : bool
+    public function checkMaxLength(Entity $entity, string $field, $validationValue, $data) : bool
    {
        if ($this->isNotEmpty($entity, $field)) {
            $value = $entity->get($field);
@@ -47,7 +49,7 @@ class VarcharType extends BaseType
        return true;
    }

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

-namespace Espo\Core\TemplateHelpers;
+namespace Espo\Classes\TemplateHelpers;

 class GoogleMaps
 {
@@ -148,14 +148,12 @@ class GoogleMaps

        $GLOBALS['log']->debug("Template helper _googleMapsImage: URL: {$url}.");

-        $image = \Espo\Core\TemplateHelpers\GoogleMaps::getImage($url);
+        $image = \Espo\Classes\TemplateHelpers\GoogleMaps::getImage($url);

        if (!$image) {
            return null;
        }

-
-
        $filePath = tempnam(sys_get_temp_dir(), 'google_maps_image');
        file_put_contents($filePath, $image);

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

 namespace Espo\Controllers;

-use \Espo\Core\Exceptions\NotFound;
-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;
+
+use Espo\Core\UpgradeManager;
+use Espo\Core\Utils\AdminNotificationManager;
+use Espo\Core\Utils\SystemRequirements;

 class Admin extends \Espo\Core\Controllers\Base
 {
@@ -48,15 +50,17 @@ class Admin extends \Espo\Core\Controllers\Base
        if (!$request->isPost()) {
            throw new BadRequest();
        }
-        $result = $this->getContainer()->get('dataManager')->rebuild();

-        return $result;
+        $this->getContainer()->get('dataManager')->rebuild();
+
+        return true;
    }

    public function postActionClearCache($params)
    {
-        $result = $this->getContainer()->get('dataManager')->clearCache();
-        return $result;
+        $this->getContainer()->get('dataManager')->clearCache();
+
+        return true;
    }

    public function actionJobs()
@@ -73,15 +77,16 @@ class Admin extends \Espo\Core\Controllers\Base
                throw new Forbidden();
            }
        }
-        $upgradeManager = new \Espo\Core\UpgradeManager($this->getContainer());
+
+        $upgradeManager = new UpgradeManager($this->getContainer());

        $upgradeId = $upgradeManager->upload($data);
        $manifest = $upgradeManager->getManifest();

-        return array(
+        return [
            'id' => $upgradeId,
            'version' => $manifest['version'],
-        );
+        ];
    }

    public function postActionRunUpgrade($params, $data)
@@ -92,7 +97,7 @@ class Admin extends \Espo\Core\Controllers\Base
            }
        }

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

        return true;
@@ -105,13 +110,15 @@ class Admin extends \Espo\Core\Controllers\Base

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

    public function actionSystemRequirementList($params)
    {
-        $systemRequirementManager = new \Espo\Core\Utils\SystemRequirements($this->getContainer());
+        $systemRequirementManager = new SystemRequirements($this->getContainer());
+
        return $systemRequirementManager->getAllRequiredList();
    }
 }
@@ -0,0 +1,38 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Controllers;
+
+class ApiIndex {
+
+    public function getActionIndex()
+    {
+        return "EspoCRM REST API";
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,22 +29,33 @@

 namespace Espo\Controllers;

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

-class App extends \Espo\Core\Controllers\Base
+use Espo\Core\Authentication\Authentication;
+use Espo\Core\Di;
+use Espo\Core\Api\Request;
+
+use StdClass;
+
+class App implements
+
+    Di\ServiceFactoryAware,
+    Di\InjectableFactoryAware
 {
+    use Di\ServiceFactorySetter;
+    use Di\InjectableFactorySetter;
+
    public function actionUser()
    {
-        return $this->getServiceFactory()->create('App')->getUserData();
+        return $this->serviceFactory->create('App')->getUserData();
    }

-    public function postActionDestroyAuthToken($params, $data)
+    public function postActionDestroyAuthToken(array $params, StdClass $data, Request $request)
    {
        if (empty($data->token)) {
            throw new BadRequest();
        }
-
-        $auth = new \Espo\Core\Utils\Auth($this->getContainer());
-        return $auth->destroyAuthToken($data->token);
+        $auth = $this->injectableFactory->create(Authentication::class);
+        return $auth->destroyAuthToken($data->token, $request);
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,8 +29,8 @@

 namespace Espo\Controllers;

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

 class Attachment extends \Espo\Core\Controllers\Record
 {
@@ -66,10 +66,10 @@ class Attachment extends \Espo\Core\Controllers\Record

        $fileData = $this->getRecordService()->getFileData($id);

-        $response->headers->set('Content-Type', $fileData->type);
-        $response->headers->set('Content-Disposition', 'Content-Disposition: attachment; filename="'.$fileData->name.'"');
+        $response->setHeader('Content-Type', $fileData->type);
+        $response->setHeader('Content-Disposition', 'Content-Disposition: attachment; filename="'.$fileData->name.'"');
        if ($fileData->size) {
-            $response->headers->set('Content-Length', $fileData->size);
+            $response->setHeader('Content-Length', $fileData->size);
        }

        return $fileData->contents;
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@

 namespace Espo\Controllers;

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

 class AuthLogRecord extends \Espo\Core\Controllers\Record
 {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@

 namespace Espo\Controllers;

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

 class AuthToken extends \Espo\Core\Controllers\Record
 {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,31 +29,34 @@

 namespace Espo\Controllers;

-use Espo\Core\Exceptions\Forbidden;
-use Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\{
+    Forbidden,
+    BadRequest,
+};

-class CurrencyRate extends \Espo\Core\Controllers\Base
+use Espo\Core\{
+    ServiceFactory,
+    Api\Request,
+};
+
+class CurrencyRate
 {
-    protected function checkControllerAccess()
+    protected $serviceFactory;
+
+    public function __construct(ServiceFactory $serviceFactory)
    {
-        if (!$this->getAcl()->check('Currency')) {
-            throw new Forbidden();
-        }
+        $this->serviceFactory = $serviceFactory;
    }

-    public function getActionIndex()
+    public function getActionIndex(Request $request)
    {
-        if ($this->getAcl()->getLevel('Currency', 'read') !== 'yes') throw new Forbidden();
-
-        return $this->getService('CurrencyRate')->get();
+        return $this->serviceFactory->create('CurrencyRate')->get();
    }

-    public function putActionUpdate($params, $data)
+    public function putActionUpdate(Request $request)
    {
-        if ($this->getAcl()->getLevel('Currency', 'edit') !== 'yes') throw new Forbidden();
+        $data = $request->getParsedBody();

-        if (empty($data) || !is_object($data)) throw new BadRequest();
-
-        return $this->getService('CurrencyRate')->set($data);
+        return $this->serviceFactory->create('CurrencyRate')->set($data);
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,8 +29,8 @@

 namespace Espo\Controllers;

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

 class DashboardTemplate extends \Espo\Core\Controllers\Record
 {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,27 +29,33 @@

 namespace Espo\Controllers;

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

-class DataPrivacy extends \Espo\Core\Controllers\Base
+use Espo\Core\ServiceFactory;
+use Espo\Core\Acl;
+
+class DataPrivacy
 {
-    protected function checkControllerAccess()
+    protected $serviceFactory;
+    protected $acl;
+
+    public function __construct(ServiceFactory $serviceFactory, Acl $acl)
    {
-        if ($this->getAcl()->get('dataPrivacyPermission') === 'no') {
+        $this->serviceFactory = $serviceFactory;
+        $this->acl = $acl;
+
+        if ($this->acl->get('dataPrivacyPermission') === 'no') {
            throw new Forbidden();
        }
    }

-    public function postActionErase($params, $data)
+    public function postActionErase($params, \StdClass $data)
    {
        if (empty($data->entityType) || empty($data->id) || empty($data->fieldList) || !is_array($data->fieldList)) {
            throw new BadRequest();
        }

-        return $this->getServiceFactory()->create('DataPrivacy')->erase($data->entityType, $data->id, $data->fieldList);
+        return $this->serviceFactory->create('DataPrivacy')->erase($data->entityType, $data->id, $data->fieldList);
    }
-
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,10 +29,9 @@

 namespace Espo\Controllers;

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

 class Email extends \Espo\Core\Controllers\Record
 {
@@ -230,4 +229,15 @@ class Email extends \Espo\Core\Controllers\Record
        }
        return $this->getRecordService()->moveToFolderByIdList($idList, $data->folderId);
    }
+
+    public function getActionGetInsertFieldData($params, $data, $request)
+    {
+        if (!$this->getAcl()->checkScope('Email', 'create')) throw new Forbidden();
+
+        return $this->getServiceFactory()->create('EmailTemplate')->getInsertFieldData([
+            'parentId' => $request->get('parentId'),
+            'parentType' => $request->get('parentType'),
+            'to' => $request->get('to'),
+        ]);
+    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,8 +29,7 @@

 namespace Espo\Controllers;

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

 class EmailAccount extends \Espo\Core\Controllers\Record
@@ -40,7 +39,7 @@ class EmailAccount extends \Espo\Core\Controllers\Record
        return $this->getRecordService()->getFolders([
            'host' => $data->host ?? null,
            'port' => $data->port ?? null,
-            'ssl' =>  $data->ssl ?? false,
+            'security' =>  $data->security ?? null,
            'username' => $data->username ?? null,
            'password' => $data->password ?? null,
            'id' => $data->id ?? null,
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@

 namespace Espo\Controllers;

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

 class EmailAddress extends \Espo\Core\Controllers\Record
 {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -33,4 +33,3 @@ class EmailFilter extends \Espo\Core\Controllers\Record
 {

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

 namespace Espo\Controllers;

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

 class EmailFolder extends \Espo\Core\Controllers\Record
 {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@

 namespace Espo\Controllers;

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

 class EmailTemplate extends \Espo\Core\Controllers\Record
 {
@@ -49,6 +49,4 @@ class EmailTemplate extends \Espo\Core\Controllers\Record
            'relatedId' => $request->get('relatedId')
        ), true);
    }
-
 }
-
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,26 +29,49 @@

 namespace Espo\Controllers;

-use \Espo\Core\Exceptions\BadRequest;
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\Error;
+use Espo\{
+    Entities\User,
+    Tools\EntityManager\EntityManager as EntityManagerTool,
+};

-class EntityManager extends \Espo\Core\Controllers\Base
+use Espo\Core\{
+    Exceptions\Error,
+    Exceptions\Forbidden,
+    Exceptions\BadRequest,
+    Api\Request,
+    DataManager,
+    Utils\Config,
+};
+
+class EntityManager
 {
+    protected $user;
+    protected $dataManager;
+    protected $config;
+    protected $entityManagerTool;
+
+    public function __construct(User $user, DataManager $dataManager, Config $config, EntityManagerTool $entityManagerTool)
+    {
+        $this->user = $user;
+        $this->dataManager = $dataManager;
+        $this->config = $config;
+        $this->entityManagerTool = $entityManagerTool;
+
+        $this->checkControllerAccess();
+    }
+
    protected function checkControllerAccess()
    {
-        if (!$this->getUser()->isAdmin()) {
+        if (!$this->user->isAdmin()) {
            throw new Forbidden();
        }
    }

-    public function actionCreateEntity($params, $data, $request)
+    public function postActionCreateEntity(Request $request)
    {
-        $data = get_object_vars($data);
+        $data = $request->getParsedBody();

-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
+        $data = get_object_vars($data);

        if (empty($data['name']) || empty($data['type'])) {
            throw new BadRequest();
@@ -101,18 +124,18 @@ class EntityManager extends \Espo\Core\Controllers\Base
            $params['kanbanStatusIgnoreList'] = $data['kanbanStatusIgnoreList'];
        }

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

        if ($result) {
-            $tabList = $this->getConfig()->get('tabList', []);
+            $tabList = $this->config->get('tabList', []);

            if (!in_array($name, $tabList)) {
                $tabList[] = $name;
-                $this->getConfig()->set('tabList', $tabList);
-                $this->getConfig()->save();
+                $this->config->set('tabList', $tabList);
+                $this->config->save();
            }

-            $this->getContainer()->get('dataManager')->rebuild();
+            $this->dataManager->rebuild();
        } else {
            throw new Error();
        }
@@ -120,23 +143,23 @@ class EntityManager extends \Espo\Core\Controllers\Base
        return true;
    }

-    public function actionUpdateEntity($params, $data, $request)
+    public function postActionUpdateEntity(Request $request)
    {
+        $data = $request->getParsedBody();
+
        $data = get_object_vars($data);

-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
        if (empty($data['name'])) {
            throw new BadRequest();
        }
+
        $name = $data['name'];
        $name = filter_var($name, \FILTER_SANITIZE_STRING);

-        $result = $this->getContainer()->get('entityManagerUtil')->update($name, $data);
+        $result = $this->entityManagerTool->update($name, $data);

        if ($result) {
-            $this->getContainer()->get('dataManager')->clearCache();
+            $this->dataManager->clearCache();
        } else {
            throw new Error();
        }
@@ -144,32 +167,31 @@ class EntityManager extends \Espo\Core\Controllers\Base
        return true;
    }

-    public function actionRemoveEntity($params, $data, $request)
+    public function postActionRemoveEntity(Request $request)
    {
-        $data = get_object_vars($data);
+        $data = $request->getParsedBody();

-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
+        $data = get_object_vars($data);

        if (empty($data['name'])) {
            throw new BadRequest();
        }
+
        $name = $data['name'];
        $name = filter_var($name, \FILTER_SANITIZE_STRING);

-        $result = $this->getContainer()->get('entityManagerUtil')->delete($name);
+        $result = $this->entityManagerTool->delete($name);

        if ($result) {
-            $tabList = $this->getConfig()->get('tabList', []);
+            $tabList = $this->config->get('tabList', []);
            if (($key = array_search($name, $tabList)) !== false) {
                unset($tabList[$key]);
                $tabList = array_values($tabList);
            }
-            $this->getConfig()->set('tabList', $tabList);
-            $this->getConfig()->save();
+            $this->config->set('tabList', $tabList);
+            $this->config->save();

-            $this->getContainer()->get('dataManager')->clearCache();
+            $this->dataManager->clearCache();
        } else {
            throw new Error();
        }
@@ -177,13 +199,11 @@ class EntityManager extends \Espo\Core\Controllers\Base
        return true;
    }

-    public function actionCreateLink($params, $data, $request)
+    public function postActionCreateLink(Request $request)
    {
-        $data = get_object_vars($data);
+        $data = $request->getParsedBody();

-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
+        $data = get_object_vars($data);

        $paramList = [
        	'entity',
@@ -234,10 +254,10 @@ class EntityManager extends \Espo\Core\Controllers\Base
            $params['foreignLinkEntityTypeList'] = $data['foreignLinkEntityTypeList'];
        }

-        $result = $this->getContainer()->get('entityManagerUtil')->createLink($params);
+        $result = $this->entityManagerTool->createLink($params);

        if ($result) {
-            $this->getContainer()->get('dataManager')->rebuild();
+            $this->dataManager->rebuild();
        } else {
            throw new Error();
        }
@@ -245,13 +265,11 @@ class EntityManager extends \Espo\Core\Controllers\Base
        return true;
    }

-    public function actionUpdateLink($params, $data, $request)
+    public function postActionUpdateLink(Request $request)
    {
-        $data = get_object_vars($data);
+        $data = $request->getParsedBody();

-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
+        $data = get_object_vars($data);

        $paramList = [
        	'entity',
@@ -295,10 +313,10 @@ class EntityManager extends \Espo\Core\Controllers\Base
            $params['foreignLinkEntityTypeList'] = $data['foreignLinkEntityTypeList'];
        }

-        $result = $this->getContainer()->get('entityManagerUtil')->updateLink($params);
+        $result = $this->entityManagerTool->updateLink($params);

        if ($result) {
-            $this->getContainer()->get('dataManager')->clearCache();
+            $this->dataManager->clearCache();
        } else {
            throw new Error();
        }
@@ -306,27 +324,27 @@ class EntityManager extends \Espo\Core\Controllers\Base
        return true;
    }

-    public function actionRemoveLink($params, $data, $request)
+    public function postActionRemoveLink(Request $request)
    {
-        $data = get_object_vars($data);
+        $data = $request->getParsedBody();

-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
+        $data = get_object_vars($data);

        $paramList = [
        	'entity',
        	'link',
        ];
-        $d = array();
+
+        $d = [];
+
        foreach ($paramList as $item) {
        	$d[$item] = filter_var($data[$item], \FILTER_SANITIZE_STRING);
        }

-        $result = $this->getContainer()->get('entityManagerUtil')->deleteLink($d);
+        $result = $this->entityManagerTool->deleteLink($d);

        if ($result) {
-            $this->getContainer()->get('dataManager')->clearCache();
+            $this->dataManager->clearCache();
        } else {
            throw new Error();
        }
@@ -334,32 +352,37 @@ class EntityManager extends \Espo\Core\Controllers\Base
        return true;
    }

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

        $formulaData = get_object_vars($data->data);

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

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

        return true;
    }

-    public function postActionResetToDefault($params, $data, $request)
+    public function postActionResetToDefault(Request $request)
    {
+        $data = $request->getParsedBody();
+
        if (empty($data->scope)) {
            throw new BadRequest();
        }

-        $this->getContainer()->get('entityManagerUtil')->resetToDefaults($data->scope);
-        $this->getContainer()->get('dataManager')->clearCache();
+        $this->entityManagerTool->resetToDefaults($data->scope);
+        $this->dataManager->clearCache();

        return true;
    }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,8 +29,7 @@

 namespace Espo\Controllers;

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

 class Extension extends \Espo\Core\Controllers\Record
 {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,9 +29,9 @@

 namespace Espo\Controllers;

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

 class ExternalAccount extends \Espo\Core\Controllers\Record
 {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,27 +29,52 @@

 namespace Espo\Controllers;

-use Espo\Core\Exceptions\Error;
-use Espo\Core\Exceptions\Forbidden;
-use Espo\Core\Exceptions\NotFound;
-use Espo\Core\Exceptions\BadRequest;
+use Espo\{
+    Entities\User,
+    Tools\FieldManager\FieldManager as FieldManagerTool,
+};

-class FieldManager extends \Espo\Core\Controllers\Base
+use Espo\Core\{
+    Exceptions\Error,
+    Exceptions\Forbidden,
+    Exceptions\NotFound,
+    Exceptions\BadRequest,
+    Api\Request,
+    DataManager,
+};
+
+class FieldManager
 {
+    protected $user;
+    protected $dataManager;
+    protected $fieldManagerTool;
+
+    public function __construct(User $user, DataManager $dataManager, FieldManagerTool $fieldManagerTool)
+    {
+        $this->user = $user;
+        $this->dataManager = $dataManager;
+        $this->fieldManagerTool = $fieldManagerTool;
+
+        $this->checkControllerAccess();
+    }
+
    protected function checkControllerAccess()
    {
-        if (!$this->getUser()->isAdmin()) {
+        if (!$this->user->isAdmin()) {
            throw new Forbidden();
        }
    }

-    public function actionRead($params, $data)
+    public function getActionRead(Request $request)
    {
-        if (empty($params['scope']) || empty($params['name'])) {
+        $scope = $request->getRouteParam('scope');
+        $name = $request->getRouteParam('name');
+
+        if (!$scope || !$name) {
            throw new BadRequest();
        }

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

        if (!isset($data)) {
            throw new BadRequest();
@@ -58,72 +83,91 @@ class FieldManager extends \Espo\Core\Controllers\Base
        return $data;
    }

-    public function postActionCreate($params, $data)
+    public function postActionCreate(Request $request)
    {
-        if (empty($params['scope']) || empty($data->name)) {
+        $data = $request->getParsedBody();
+
+        $scope = $request->getRouteParam('scope');
+        $name = $data->name ?? null;
+
+        if (!$scope || !$name) {
            throw new BadRequest();
        }

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

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

-        return $fieldManager->read($params['scope'], $data->name);
+        return $fieldManagerTool->read($scope, $data->name);
    }

-    public function patchActionUpdate($params, $data)
+    public function patchActionUpdate(Request $request)
    {
-        return $this->putActionUpdate($params, $data);
+        return $this->putActionUpdate($request);
    }

-    public function putActionUpdate($params, $data)
+    public function putActionUpdate(Request $request)
    {
-        if (empty($params['scope']) || empty($params['name'])) {
+        $data = $request->getParsedBody();
+
+        $scope = $request->getRouteParam('scope');
+        $name = $request->getRouteParam('name');
+
+        if (!$scope || !$name) {
            throw new BadRequest();
        }

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

-        if ($fieldManager->isChanged()) {
-            $this->getContainer()->get('dataManager')->rebuild($params['scope']);
+        $fieldManagerTool->update($scope, $name, get_object_vars($data));
+
+        if ($fieldManagerTool->isChanged()) {
+            $this->dataManager->rebuild([$scope]);
        } else {
-            $this->getContainer()->get('dataManager')->clearCache();
+            $this->dataManager->clearCache();
        }

-        return $fieldManager->read($params['scope'], $params['name']);
+        return $fieldManagerTool->read($scope, $name);
    }

-    public function deleteActionDelete($params, $data)
+    public function deleteActionDelete(Request $request)
    {
-        if (empty($params['scope']) || empty($params['name'])) {
+        $scope = $request->getRouteParam('scope');
+        $name = $request->getRouteParam('name');
+
+        if (!$scope || !$name) {
            throw new BadRequest();
        }

-        $result = $this->getContainer()->get('fieldManager')->delete($params['scope'], $params['name']);
+        $result = $this->fieldManagerTool->delete($scope, $name);

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

        return $result;
    }

-    public function postActionResetToDefault($params, $data)
+    public function postActionResetToDefault(Request $request)
    {
+        $data = $request->getParsedBody();
+
        if (empty($data->scope) || empty($data->name)) {
            throw new BadRequest();
        }

-        $this->getContainer()->get('fieldManager')->resetToDefault($data->scope, $data->name);
+        $this->fieldManagerTool->resetToDefault($data->scope, $data->name);

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

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

        return true;
    }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,11 +29,17 @@

 namespace Espo\Controllers;

-use \Espo\Core\Exceptions\Error,
-    \Espo\Core\Exceptions\Forbidden;
+use Espo\Core\ServiceFactory;

-class GlobalSearch extends \Espo\Core\Controllers\Base
+class GlobalSearch
 {
+    protected $serviceFactory;
+
+    public function __construct(ServiceFactory $serviceFactory)
+    {
+        $this->serviceFactory = $serviceFactory;
+    }
+
    public function actionSearch($params, $data, $request)
    {
        $query = $request->get('q');
@@ -41,7 +47,6 @@ class GlobalSearch extends \Espo\Core\Controllers\Base
        $offset = intval($request->get('offset'));
        $maxSize = intval($request->get('maxSize'));

-        return $this->getService('GlobalSearch')->find($query, $offset, $maxSize);
+        return $this->serviceFactory->create('GlobalSearch')->find($query, $offset, $maxSize);
    }
 }
-
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,17 +29,21 @@

 namespace Espo\Controllers;

-class I18n extends \Espo\Core\Controllers\Base
+use Espo\Core\ServiceFactory;
+
+class I18n
 {
+    protected $serviceFactory;
+
+    public function __construct(ServiceFactory $serviceFactory)
+    {
+        $this->serviceFactory = $serviceFactory;
+    }
+
    public function actionRead($params, $data, $request)
    {
        $default = $request->get('default') === 'true';

-        return $this->getServiceFactory()->create('Language')->getDataForFrontend($default);
-
-        /*if ($request->get('default')) {
-            return $this->getContainer()->get('defaultLanguage')->getAll();
-        }
-        return $this->getContainer()->get('language')->getAll();*/
+        return $this->serviceFactory->create('Language')->getDataForFrontend($default);
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -30,9 +30,9 @@
 namespace Espo\Controllers;

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

 class Import extends \Espo\Core\Controllers\Record
 {
@@ -78,24 +78,13 @@ class Import extends \Espo\Core\Controllers\Record
        return $this->getContainer()->get('entityManager');
    }

-    public function actionUploadFile($params, $data, $request)
+    public function postActionUploadFile($params, $data)
    {
        $contents = $data;

-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
+        $attachmentId = $this->getService('Import')->uploadFile($contents);

-        $attachment = $this->getEntityManager()->getEntity('Attachment');
-        $attachment->set('type', 'text/csv');
-        $attachment->set('role', 'Import File');
-        $attachment->set('name', 'import-file.csv');
-        $attachment->set('contents', $contents);
-        $this->getEntityManager()->saveEntity($attachment);
-
-        return [
-            'attachmentId' => $attachment->id
-        ];
+        return ['attachmentId' => $attachmentId];
    }

    public function actionRevert($params, $data, $request)
@@ -106,7 +95,9 @@ class Import extends \Espo\Core\Controllers\Record
        if (!$request->isPost()) {
            throw new BadRequest();
        }
-        return $this->getService('Import')->revert($data->id);
+        $this->getService('Import')->revert($data->id);
+
+        return true;
    }

    public function actionRemoveDuplicates($params, $data, $request)
@@ -117,7 +108,9 @@ class Import extends \Espo\Core\Controllers\Record
        if (!$request->isPost()) {
            throw new BadRequest();
        }
-        return $this->getService('Import')->removeDuplicates($data->id);
+        $this->getService('Import')->removeDuplicates($data->id);
+
+        return true;
    }

    public function actionCreate($params, $data, $request)
@@ -190,6 +183,8 @@ class Import extends \Espo\Core\Controllers\Record
            'skipDuplicateChecking' => !empty($data->skipDuplicateChecking),
            'idleMode' => !empty($data->idleMode),
            'silentMode' => !empty($data->silentMode),
+            'manualMode' => !empty($data->manualMode),
+            'defaultFieldList' => $data->defaultFieldList ?? [],
        ];

        if (property_exists($data, 'updateBy')) {
@@ -210,7 +205,9 @@ class Import extends \Espo\Core\Controllers\Record
        if (empty($data->id) || empty($data->entityType) || empty($data->entityId)) {
            throw new BadRequest();
        }
+
        $this->getService('Import')->unmarkAsDuplicate($data->id, $data->entityType, $data->entityId);
+
        return true;
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,8 +29,7 @@

 namespace Espo\Controllers;

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

 class InboundEmail extends \Espo\Core\Controllers\Record
 {
@@ -46,7 +45,7 @@ class InboundEmail extends \Espo\Core\Controllers\Record
        return $this->getRecordService()->getFolders([
            'host' => $data->host ?? null,
            'port' => $data->port ?? null,
-            'ssl' =>  $data->ssl ?? false,
+            'security' =>  $data->security ?? null,
            'username' => $data->username ?? null,
            'password' => $data->password ?? null,
            'id' => $data->id ?? null,
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,9 +29,8 @@

 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 Integration extends \Espo\Core\Controllers\Record
 {
@@ -82,4 +81,3 @@ class Integration extends \Espo\Core\Controllers\Record
        return $entity->toArray();
    }
 }
-
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,8 +29,7 @@

 namespace Espo\Controllers;

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

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

-namespace Espo\Core\Utils\Authentication;
+namespace Espo\Controllers;

-use Espo\Core\Exceptions\Error;
+use Espo\Core\{
+    Exceptions\BadRequest,
+    Api\Request,
+    ServiceFactory,
+};

-use Espo\Entities\AuthToken;
-
-class Espo extends Base
+class KanbanOrder
 {
-    public function login(string $username, $password, ?AuthToken $authToken = null, array $params = [], $request = null)
+    protected $serviceFactory;
+
+    public function __construct(ServiceFactory $serviceFactory)
    {
-        if (!$password) return;
+        $this->serviceFactory = $serviceFactory;
+    }

-        if ($authToken) {
-            $hash = $authToken->get('hash');
-        } else {
-            $hash = $this->getPasswordHash()->hash($password);
+    public function postActionStore(Request $request)
+    {
+        $data = $request->getParsedBody();
+
+        $entityType = $data->entityType;
+        $group = $data->group;
+        $ids = $data->ids;
+
+        if (empty($entityType) || !is_string($entityType)) {
+            throw new BadRequest();
        }

-        $user = $this->getEntityManager()->getRepository('User')->findOne([
-            'whereClause' => [
-                'userName' => $username,
-                'password' => $hash,
-                'type!=' => ['api', 'system'],
-            ]
-        ]);
-
-        if ($user && $authToken) {
-            if ($user->id !== $authToken->get('userId')) {
-                return null;
-            }
+        if (empty($group) || !is_string($group)) {
+            throw new BadRequest();
        }

-        return $user;
+        if (!is_array($ids)) {
+            throw new BadRequest();
+        }
+
+        $this->serviceFactory
+            ->create('KanbanOrder')
+            ->order($entityType, $group, $ids);
+
+        return true;
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,49 +29,69 @@

 namespace Espo\Controllers;

-use Espo\Core\Utils as Utils;
-use \Espo\Core\Exceptions\NotFound;
-use \Espo\Core\Exceptions\Error;
-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
+use Espo\Core\{
+    Exceptions\Forbidden,
+    Exceptions\BadRequest,
+    Api\Request,
+    DataManager,
+};

-class LabelManager extends \Espo\Core\Controllers\Base
+use Espo\{
+    Tools\LabelManager\LabelManager as LabelManagerTool,
+    Entities\User,
+};
+
+class LabelManager
 {
+    protected $user;
+    protected $dataManager;
+    protected $labelManagerTool;
+
+    public function __construct(User $user, DataManager $dataManager, LabelManagerTool $labelManagerTool)
+    {
+        $this->user = $user;
+        $this->dataManager = $dataManager;
+        $this->labelManagerTool = $labelManagerTool;
+
+        $this->checkControllerAccess();
+    }
+
    protected function checkControllerAccess()
    {
-        if (!$this->getUser()->isAdmin()) {
+        if (!$this->user->isAdmin()) {
            throw new Forbidden();
        }
    }

-    public function postActionGetScopeList($params)
+    public function postActionGetScopeList()
    {
-        $labelManager = $this->getContainer()->get('injectableFactory')->createByClassName('\\Espo\\Core\\Utils\\LabelManager');
-
-        return $labelManager->getScopeList();
+        return $this->labelManagerTool->getScopeList();
    }

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

-    public function postActionSaveLabels($params, $data)
+    public function postActionSaveLabels(Request $request)
    {
+        $data = $request->getParsedBody();
+
        if (empty($data->scope) || empty($data->language) || !isset($data->labels)) {
            throw new BadRequest();
        }

        $labels = get_object_vars($data->labels);

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

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

        return $returnData;
    }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@

 namespace Espo\Controllers;

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

 class LastViewed extends \Espo\Core\Controllers\Base
 {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -47,6 +47,8 @@ class Layout extends \Espo\Core\Controllers\Base

    public function putActionUpdate($params, $data, $request)
    {
+        $data = json_decode($request->getBodyContents());
+
        if (is_object($data)) $data = get_object_vars($data);

        if (!$this->getUser()->isAdmin()) throw new Forbidden();
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,26 +29,36 @@

 namespace Espo\Controllers;

-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
-use \Espo\Core\Exceptions\NotFound;
+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.');
+        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);
+        $response->setHeader('Access-Control-Allow-Origin', $allowOrigin);
+
+        $this->getRecordService()->leadCapture($params['apiKey'], $data);
+
+        return true;
    }

    public function optionsActionLeadCapture($params, $data, $request, $response)
    {
-        if (empty($params['apiKey'])) throw new BadRequest('No API key provided.');
+        if (empty($params['apiKey'])) {
+            throw new BadRequest('No API key provided.');
+        }

        if (!$this->getRecordService()->isApiKeyValid($params['apiKey'])) {
            throw new NotFound();
@@ -56,23 +66,27 @@ class LeadCapture extends \Espo\Core\Controllers\Record

        $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');
+        $response->setHeader('Access-Control-Allow-Headers', 'Content-Type, Accept');
+        $response->setHeader('Access-Control-Allow-Origin', $allowOrigin);
+        $response->setHeader('Access-Control-Allow-Methods', 'POST');

        return true;
    }

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

        return $this->getRecordService()->generateNewApiKeyForEntity($data->id)->getValueMap();
    }

    public function getActionSmtpAccountDataList()
    {
-        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }

        return $this->getServiceFactory()->create('LeadCapture')->getSmtpAccountDataList();
    }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,9 +29,6 @@

 namespace Espo\Controllers;

-use \Espo\Core\Exceptions\Forbidden;
-use \Espo\Core\Exceptions\BadRequest;
-
 class LeadCaptureLogRecord extends \Espo\Core\Controllers\Record
 {

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

 namespace Espo\Controllers;

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

 class Metadata extends \Espo\Core\Controllers\Base
 {
-
    public function actionRead($params, $data)
    {
        return $this->getServiceFactory()->create('Metadata')->getDataForFrontend();
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@

 namespace Espo\Controllers;

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

 class Notification extends \Espo\Core\Controllers\Record
 {
@@ -47,18 +47,18 @@ class Notification extends \Espo\Core\Controllers\Record
            $maxSize = self::MAX_SIZE_LIMIT;
        }

-        $params = array(
+        $params = [
            'offset' => $offset,
            'maxSize' => $maxSize,
-            'after' => $after
-        );
+            'after' => $after,
+        ];

-        $result = $this->getService('Notification')->getList($userId, $params);
+        $recordCollection = $this->getService('Notification')->getList($userId, $params);

-        return array(
-            'total' => $result['total'],
-            'list' => $result['collection']->toArray()
-        );
+        return (object) [
+            'total' => $recordCollection->getTotal(),
+            'list' => $recordCollection->getValueMapList(),
+        ];
    }

    public function actionNotReadCount()
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,9 +29,9 @@

 namespace Espo\Controllers;

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

 class Pdf extends \Espo\Core\Controllers\Base
 {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
 * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,8 +29,6 @@

 namespace Espo\Controllers;

-use \Espo\Core\Exceptions\Forbidden;
-
 class PhoneNumber extends \Espo\Core\Controllers\Record
 {

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