notifications lower case first

email reply fix
fix lead capture
2019-08-09 15:17:16 +03:00 · 2019-08-09 12:55:54 +03:00 · 2019-08-09 12:29:00 +03:00 · 2019-08-09 12:22:10 +03:00 · 2019-08-09 12:00:04 +03:00 · 2019-08-09 11:59:19 +03:00
2498 changed files with 42942 additions and 17500 deletions
@@ -6,6 +6,7 @@
 /data/config.php
 /build
 /node_modules
+npm-debug.log
 /test.php
 /main.html

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

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

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

  RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
@@ -2,8 +2,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -30,13 +30,15 @@ module.exports = function (grunt) {
        'client/lib/jquery-ui.min.js',
        'client/lib/jquery.ui.touch-punch.min.js',
        'client/lib/moment.min.js',
-        'client/lib/moment-timezone-with-data.min.js',
+        'client/lib/moment-timezone.min.js',
+        'client/lib/moment-timezone-data.js',
        'client/lib/jquery.timepicker.min.js',
        'client/lib/jquery.autocomplete.js',
        'client/lib/bootstrap.min.js',
        'client/lib/bootstrap-datepicker.js',
        'client/lib/bull.js',
        'client/lib/marked.min.js',
+        'client/lib/autobahn.js',

        'client/src/namespace.js',
        'client/src/exceptions.js',
@@ -87,12 +89,16 @@ module.exports = function (grunt) {
        themeList.push(file.substr(0, file.length - 5));
    });

+    var cssminFilesData = {};
    var lessData = {};
    themeList.forEach(function (theme) {
        var name = camelCaseToHyphen(theme);
        var files = {};
        files['client/css/espo/'+name+'.css'] = 'frontend/less/'+name+'/main.less';
        files['client/css/espo/'+name+'-iframe.css'] = 'frontend/less/'+name+'/iframe/main.less';
+
+        cssminFilesData['client/css/espo/'+name+'.css'] = 'client/css/espo/'+name+'.css';
+        cssminFilesData['client/css/espo/'+name+'-iframe.css'] = 'client/css/espo/'+name+'-iframe.css';
        var o = {
            options: {
                yuicompress: true,
@@ -117,16 +123,22 @@ module.exports = function (grunt) {
            }
        },
        clean: {
-            start: ['build/*'],
+            start: ['build/EspoCRM-*'],
            final: ['build/tmp'],
            beforeFinal: {
                src: ['build/tmp/custom/Espo/Custom/*', '!build/tmp/custom/Espo/Custom/.htaccess']
            }
        },
        less: lessData,
+        cssmin: {
+            themes: {
+                files: cssminFilesData
+            }
+        },
        uglify: {
            options: {
                mangle: false,
+                sourceMap: true,
                banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
            },
            'build/tmp/client/espo.min.js': jsFilesToMinify.map(function (item) {
@@ -176,6 +188,8 @@ module.exports = function (grunt) {
                    'clear_cache.php',
                    'upgrade.php',
                    'extension.php',
+                    'websocket.php',
+                    'command.php',
                    'index.php',
                    'LICENSE.txt',
                    '.htaccess',
@@ -226,26 +240,6 @@ module.exports = function (grunt) {
            }
        },
        replace: {
-            timestamp: {
-                options: {
-                    patterns: [
-                        {
-                            match: 'timestamp',
-                            replacement: '<%= new Date().getTime() %>'
-                        }
-                    ]
-                },
-                files: [
-                    {
-                        src: 'build/tmp/html/main.html',
-                        dest: 'build/tmp/html/main.html'
-                    },
-                    {
-                        src: 'build/tmp/html/portal.html',
-                        dest: 'build/tmp/html/portal.html'
-                    }
-                ]
-            },
            version: {
                options: {
                    patterns: [
@@ -290,6 +284,7 @@ module.exports = function (grunt) {
        'clean:start',
        'mkdir:tmp',
        'less',
+        'cssmin',
        'uglify',
        'copy:frontendFolders',
        'copy:frontendLib',
@@ -300,5 +295,4 @@ module.exports = function (grunt) {
        'chmod',
        'clean:final'
    ]);
-
 };
@@ -8,8 +8,8 @@ Download the latest release from our [website](http://www.espocrm.com).

 ### Requirements

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

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

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

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

+Branches:
+
+* hotfix/* – upcoming maintenance release; fixes should be pushed to this branch;
+* master – develop branch; new features should be pushed to this branch;
+* stable – last stable release.
+
 ### How to make a translation

 Build po file with command:
@@ -70,4 +76,3 @@ Json files will be created in build directory grouped by folders.
 ### License

 EspoCRM is published under the GNU GPLv3 [license](https://raw.githubusercontent.com/espocrm/espocrm/master/LICENSE.txt).
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -46,6 +46,21 @@ class Note extends \Espo\Core\Acl\Base
        return false;
    }

+    public function checkEntityCreate(EntityUser $user, Entity $entity, $data)
+    {
+        if ($entity->get('parentId') && $entity->get('parentType')) {
+            $parent = $this->getEntityManager()->getEntity($entity->get('parentType'), $entity->get('parentId'));
+            if ($parent) {
+                if ($this->getAclManager()->checkEntity($user, $parent, 'stream')) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        return true;
+    }
+
    public function checkEntityEdit(EntityUser $user, Entity $entity, $data)
    {
        if ($user->isAdmin()) {
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -41,5 +41,26 @@ class Note extends \Espo\Core\AclPortal\Base
        }
        return false;
    }
-}

+    public function checkEntityCreate(EntityUser $user, Entity $entity, $data)
+    {
+        if ($entity->get('type') !== 'Post') return false;
+
+        if ($entity->get('type') === 'Post' && $entity->get('targetType')) {
+            return false;
+        }
+
+        if (!$entity->get('parentId') || !$entity->get('parentType')) {
+            return false;
+        }
+
+        $parent = $this->getEntityManager()->getEntity($entity->get('parentType'), $entity->get('parentId'));
+        if ($parent) {
+            if ($this->getAclManager()->checkEntity($user, $parent, 'stream')) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -33,39 +33,38 @@ use \Espo\Core\Exceptions\Forbidden;

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

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

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

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

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

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

-    public function actionMassDelete($params, $data, $request)
+    public function beforeMassDelete()
    {
        throw new Forbidden();
    }
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -40,27 +40,27 @@ class AuthLogRecord extends \Espo\Core\Controllers\Record
        }
    }

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

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

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

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

-    public function actionRemoveLink($params, $data, $request)
+    public function beforeRemoveLink()
    {
        throw new Forbidden();
    }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -80,17 +80,17 @@ class AuthToken extends \Espo\Core\Controllers\Record
        throw new Forbidden();
    }

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

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

-    public function actionRemoveLink($params, $data, $request)
+    public function beforeRemoveLink()
    {
        throw new Forbidden();
    }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -46,12 +46,8 @@ class Email extends \Espo\Core\Controllers\Record
        return $this->getRecordService()->getCopiedAttachments($id);
    }

-    public function actionSendTestEmail($params, $data, $request)
+    public function postActionSendTestEmail($params, $data, $request)
    {
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
-
        if (!$this->getAcl()->checkScope('Email')) {
            throw new Forbidden();
        }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -34,16 +34,18 @@ use \Espo\Core\Exceptions\BadRequest;

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

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

-    public function actionTestConnection($params, $data, $request)
+    public function postActionTestConnection($params, $data, $request)
    {
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
-
        if (is_null($data->password)) {
            $emailAccount = $this->getEntityManager()->getEntity('EmailAccount', $data->id);
            if (!$emailAccount || !$emailAccount->id) {
@@ -75,4 +73,3 @@ class EmailAccount extends \Espo\Core\Controllers\Record
        return $this->getRecordService()->testConnection(get_object_vars($data));
    }
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -42,11 +42,13 @@ class EmailAddress extends \Espo\Core\Controllers\Record
            throw new Forbidden();
        }
        $q = $request->get('q');
-        $limit = intval($request->get('limit'));
-        if (empty($limit) || $limit > 30) {
-            $limit = 5;
+        $maxSize = intval($request->get('maxSize'));
+        if (empty($maxSize) || $maxSize > 50) {
+            $maxSize = $this->getConfig()->get('recordsPerPage', 20);
        }
-        return $this->getRecordService()->searchInAddressBook($q, $limit);
+
+        $onlyActual = $request->get('onlyActual') === 'true';
+
+        return $this->getRecordService()->searchInAddressBook($q, $maxSize, $onlyActual);
    }
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -94,25 +94,6 @@ class Extension extends \Espo\Core\Controllers\Record
        return true;
    }

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

    public function actionDelete($params, $data, $request)
    {
@@ -129,22 +110,42 @@ class Extension extends \Espo\Core\Controllers\Record
        return true;
    }

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

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

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

-    public function actionRemoveLink($params, $data, $request)
+    public function beforeListLinked()
+    {
+        throw new Forbidden();
+    }
+
+    public function beforeMassUpdate()
+    {
+        throw new Forbidden();
+    }
+
+    public function beforeMassDelete()
+    {
+        throw new Forbidden();
+    }
+
+    public function beforeCreateLink()
+    {
+        throw new Forbidden();
+    }
+
+    public function beforeRemoveLink()
    {
        throw new Forbidden();
    }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -47,17 +47,27 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
    public function actionList($params, $data, $request)
    {
        $integrations = $this->getEntityManager()->getRepository('Integration')->find();
-        $arr = array();
+
+        $list = [];
        foreach ($integrations as $entity) {
            if ($entity->get('enabled') && $this->getMetadata()->get('integrations.' . $entity->id .'.allowUserAccounts')) {
-                $arr[] = array(
+
+                $userAccountAclScope = $this->getMetadata()->get(['integrations', $entity->id, 'userAccountAclScope']);
+
+                if ($userAccountAclScope) {
+                    if (!$this->getAcl()->checkScope($userAccountAclScope)) {
+                        continue;
+                    }
+                }
+
+                $list[] = [
                    'id' => $entity->id
-                );
+                ];
            }
        }
-        return array(
-            'list' => $arr
-        );
+        return [
+            'list' => $list
+        ];
    }

    public function actionGetOAuth2Info($params, $data, $request)
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -43,27 +43,27 @@ class Import extends \Espo\Core\Controllers\Record
        }
    }

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

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

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

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

-    public function actionRemoveLink($params, $data, $request)
+    public function beforeRemoveLink()
    {
        throw new BadRequest();
    }
@@ -93,9 +93,9 @@ class Import extends \Espo\Core\Controllers\Record
        $attachment->set('contents', $contents);
        $this->getEntityManager()->saveEntity($attachment);

-        return array(
+        return [
            'attachmentId' => $attachment->id
-        );
+        ];
    }

    public function actionRevert($params, $data, $request)
@@ -175,7 +175,7 @@ class Import extends \Espo\Core\Controllers\Record
           $timezone = $data->timezone;
        }

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

        if (property_exists($data, 'updateBy')) {
            $importParams['updateBy'] = $data->updateBy;
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -41,24 +41,20 @@ class InboundEmail extends \Espo\Core\Controllers\Record
        }
    }

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

-    public function actionTestConnection($params, $data, $request)
+    public function postActionTestConnection($params, $data, $request)
    {
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
-
        if (is_null($data->password)) {
            $inboundEmail = $this->getEntityManager()->getEntity('InboundEmail', $data->id);
            if (!$inboundEmail || !$inboundEmail->id) {
@@ -69,5 +65,4 @@ class InboundEmail extends \Espo\Core\Controllers\Record

        return $this->getRecordService()->testConnection(get_object_vars($data));
    }
-
 }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -41,37 +41,37 @@ class Job extends \Espo\Core\Controllers\Record
        }
    }

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

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

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

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

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

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

-    public function actionRemoveLink($params, $data, $request)
+    public function beforeRemoveLink()
    {
        throw new Forbidden();
    }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -78,15 +78,18 @@ class Layout extends \Espo\Core\Controllers\Base
        return $this->actionUpdate($params, $data, $request);
    }

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

+        $this->getContainer()->get('dataManager')->updateCacheTimestamp();
+
        return $this->getContainer()->get('layout')->resetToDefault($data->scope, $data->name);
    }
 }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -69,4 +69,11 @@ class LeadCapture extends \Espo\Core\Controllers\Record

        return $this->getRecordService()->generateNewApiKeyForEntity($data->id)->getValueMap();
    }
+
+    public function getActionSmtpAccountDataList()
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+
+        return $this->getServiceFactory()->create('LeadCapture')->getSmtpAccountDataList();
+    }
 }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ class Notification extends \Espo\Core\Controllers\Record
 {
    public static $defaultAction = 'list';

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

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

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

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

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

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

-    public function actionMerge($params, $data, $request)
+    public function beforeMerge()
    {
        throw new Error();
    }
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,10 +25,12 @@
 *
 * In accordance with Section 7(b) of the GNU General Public License version 3,
 * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Controllers;

+use Espo\Core\Exceptions\Forbidden;
+
 class ScheduledJob extends \Espo\Core\Controllers\Record
 {
    protected function checkControllerAccess()
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,10 +25,12 @@
 *
 * In accordance with Section 7(b) of the GNU General Public License version 3,
 * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Controllers;

+use Espo\Core\Exceptions\Forbidden;
+
 class ScheduledJobLogRecord extends \Espo\Core\Controllers\Record
 {
    protected function checkControllerAccess()
@@ -38,4 +40,3 @@ class ScheduledJobLogRecord extends \Espo\Core\Controllers\Record
        }
    }
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -29,30 +29,23 @@

 namespace Espo\Controllers;

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

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

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

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

-        $ignoreItemList = [];
-
-        $systemOnlyItemList = $this->getConfig()->getSystemOnlyItemList();
-        foreach ($systemOnlyItemList as $item) {
-            $ignoreItemList[] = $item;
-        }
-
-        if ($this->getConfig()->get('restrictedMode') && !$this->getUser()->isSuperAdmin()) {
-            $superAdminOnlyItemList = $this->getConfig()->getSuperAdminOnlyItemList();
-            foreach ($superAdminOnlyItemList as $item) {
-                $ignoreItemList[] = $item;
-            }
-        }
-
-        foreach ($ignoreItemList as $item) {
-            unset($data->$item);
-        }
-
-        if (
-            (isset($data->useCache) && $data->useCache !== $this->getConfig()->get('useCache'))
-            ||
-            (isset($data->aclStrictMode) && $data->aclStrictMode !== $this->getConfig()->get('aclStrictMode'))
-        ) {
-            $this->getContainer()->get('dataManager')->clearCache();
-        }
-
-        $this->getConfig()->setData($data, $this->getUser()->isAdmin());
-        $result = $this->getConfig()->save();
-        if ($result === false) {
-            throw new Error('Cannot save settings');
-        }
-
-        if (isset($data->defaultCurrency) || isset($data->baseCurrency) || isset($data->currencyRates)) {
-            $this->getContainer()->get('dataManager')->rebuildDatabase([]);
-        }
+        $this->getServiceFactory()->create('Settings')->setConfigData($data);

        return $this->getConfigData();
    }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -106,17 +106,20 @@ class User extends \Espo\Core\Controllers\Record
        return $this->getService('User')->passwordChangeRequest($userName, $emailAddress, $url);
    }

-    public function actionCreateLink($params, $data, $request)
+    public function postActionGenerateNewApiKey($params, $data, $request)
    {
+        if (empty($data->id)) throw new BadRequest();
        if (!$this->getUser()->isAdmin()) throw new Forbidden();
-
-        return parent::actionCreateLink($params, $data, $request);
+        return $this->getRecordService()->generateNewApiKeyForEntity($data->id)->getValueMap();
    }

-    public function actionRemoveLink($params, $data, $request)
+    public function beforeCreateLink()
    {
        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+    }

-        return parent::actionRemoveLink($params, $data, $request);
+    public function beforeRemoveLink($params, $data, $request)
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
    }
 }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -124,6 +124,11 @@ class Acl
        return $this->getAclManager()->getScopeForbiddenFieldList($this->getUser(), $scope, $action, $thresholdLevel);
    }

+    public function getScopeForbiddenLinkList($scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        return $this->getAclManager()->getScopeForbiddenLinkList($this->getUser(), $scope, $action, $thresholdLevel);
+    }
+
    public function checkUserPermission($target, $permissionType = 'userPermission')
    {
        return $this->getAclManager()->checkUserPermission($this->getUser(), $target, $permissionType);
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -36,15 +36,17 @@ use \Espo\ORM\Entity;

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

    protected $scope;

-    protected $injections = array();
+    protected $injections = [];

    protected $ownerUserIdAttribute = null;

@@ -79,12 +81,12 @@ class Base implements Injectable

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

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

    protected function getConfig()
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -60,21 +60,45 @@ class GlobalRestricton
    public function __construct(
        \Espo\Core\Utils\Metadata $metadata,
        \Espo\Core\Utils\File\Manager $fileManager,
-        \Espo\Core\Utils\FieldManagerUtil $fieldManagerUtil
+        \Espo\Core\Utils\FieldManagerUtil $fieldManagerUtil,
+        bool $useCache = true
    )
    {
        $this->metadata = $metadata;
        $this->fileManager = $fileManager;
        $this->fieldManagerUtil = $fieldManagerUtil;

-        if (!file_exists($this->cacheFilePath)) {
-            $this->buildCacheFile();
+        $isFromCache = false;
+
+        if ($useCache) {
+            if (file_exists($this->cacheFilePath)) {
+                $this->data = include($this->cacheFilePath);
+                $isFromCache = true;
+
+                if (!($this->data instanceof \StdClass)) {
+                    $GLOBALS['log']->error("ACL GlobalRestricton: Bad data fetched from cache.");
+                    $this->data = null;
+                }
+            }
        }

-        $this->data = include($this->cacheFilePath);
+        if (!$this->data) {
+            $this->buildData();
+        }
+
+        if ($useCache) {
+            if (!$isFromCache) {
+                $this->storeCacheFile();
+            }
+        }
    }

-    protected function buildCacheFile()
+    protected function storeCacheFile()
+    {
+        $this->getFileManager()->putPhpContents($this->cacheFilePath, $this->data, true);
+    }
+
+    protected function buildData()
    {
        $scopeList = array_keys($this->getMetadata()->get(['entityDefs'], []));

@@ -127,8 +151,6 @@ class GlobalRestricton
        }

        $this->data = $data;
-
-        $this->getFileManager()->putPhpContents($this->cacheFilePath, $data, true);
    }

    protected function getMetadata()
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -41,9 +41,9 @@ class AclManager

    private $metadata;

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

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

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

@@ -59,7 +59,8 @@ class AclManager
        $this->globalRestricton = new \Espo\Core\Acl\GlobalRestricton(
            $container->get('metadata'),
            $container->get('fileManager'),
-            $container->get('fieldManagerUtil')
+            $container->get('fieldManagerUtil'),
+            $container->get('config')->get('useCache')
        );
    }

@@ -93,8 +94,8 @@ class AclManager

            if (class_exists($className)) {
                $acl = new $className($scope);
-                $dependencies = $acl->getDependencyList();
-                foreach ($dependencies as $name) {
+                $dependencyList = $acl->getDependencyList();
+                foreach ($dependencyList as $name) {
                    $acl->inject($name, $this->getContainer()->get($name));
                }
                $this->implementationHashMap[$scope] = $acl;
@@ -309,6 +310,22 @@ class AclManager
        return $list;
    }

+
+    public function getScopeForbiddenLinkList(User $user, $scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        $list = [];
+
+        if ($thresholdLevel === 'no') {
+            $list = array_merge(
+                $list,
+                $this->getScopeRestrictedLinkList($scope, $this->getGlobalRestrictionTypeList($user, $action))
+            );
+            $list = array_values($list);
+        }
+
+        return $list;
+    }
+
    public function checkUserPermission(User $user, $target, $permissionType = 'userPermission')
    {
        $permission = $this->get($user, $permissionType);
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -99,7 +99,7 @@ class Application
        exit;
    }

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

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

@@ -157,6 +159,11 @@ class Application
        $interval = $this->getConfig()->get('daemonInterval');
        $timeout = $this->getConfig()->get('daemonProcessTimeout');

+        $phpExecutablePath = $this->getConfig()->get('phpExecutablePath');
+        if (!$phpExecutablePath) {
+            $phpExecutablePath = (new \Symfony\Component\Process\PhpExecutableFinder)->find();
+        }
+
        if (!$maxProcessNumber || !$interval) {
            $GLOBALS['log']->error("Daemon config params are not set.");
            return;
@@ -169,7 +176,7 @@ class Application
            foreach ($processList as $i => $process) {
                if ($process->isRunning()) {
                    $runningCount++;
-                } else if ($process->isRunning()) {
+                } else {
                    unset($processList[$i]);
                }
            }
@@ -178,9 +185,10 @@ class Application
                $toSkip = true;
            }
            if (!$toSkip) {
-                $process = new \Symfony\Component\Process\Process(['php', 'cron.php']);
+                $process = new \Symfony\Component\Process\Process([$phpExecutablePath, 'cron.php']);
                $process->setTimeout($timeout);
                $process->run();
+                $processList[] = $process;
            }
            sleep($interval);
        }
@@ -207,6 +215,15 @@ class Application
        $dataManager->clearCache();
    }

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

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

            if (!in_array('controller', $routeKeys, true)) {
                return $container->get('output')->render($routeOptions);
@@ -299,8 +316,6 @@ class Application
    protected function getRouteList()
    {
        $routes = new \Espo\Core\Utils\Route($this->getConfig(), $this->getMetadata(), $this->getContainer()->get('fileManager'));
-
-
        return $routes->getAll();
    }

@@ -315,7 +330,7 @@ class Application
                continue;
            }

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

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

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

            if ($token && $token->get('portalId')) {
                return $token->get('portalId');
@@ -0,0 +1,78 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Console;
+
+class CommandManager
+{
+    private $container;
+
+    public function __construct(\Espo\Core\Container $container)
+    {
+        $this->container = $container;
+    }
+
+    public function run(string $command)
+    {
+        $command = ucfirst(\Espo\Core\Utils\Util::hyphenToCamelCase($command));
+
+        $argumentList = [];
+        $options = [];
+        $flagList = [];
+
+        $skipIndex = 1;
+        if (isset($_SERVER['argv'][0]) && $_SERVER['argv'][0] === 'command.php') {
+            $skipIndex = 2;
+        }
+
+        foreach ($_SERVER['argv'] as $i => $item) {
+            if ($i < $skipIndex) continue;
+
+            if (strpos($item, '--') === 0 && strpos($item, '=') > 2) {
+                list($name, $value) = explode('=', substr($item, 2));
+                $name = \Espo\Core\Utils\Util::hyphenToCamelCase($name);
+                $options[$name] = $value;
+            } else if (strpos($item, '-') === 0) {
+                $flagList[] = substr($item, 1);
+            } else {
+                $argumentList[] = $item;
+            }
+        }
+
+        $className = '\\Espo\\Core\\Console\\Commands\\' . $command;
+        $className = $this->container->get('metadata')->get(['app', 'consoleCommands', $command, 'className'], $className);
+        if (!class_exists($className)) {
+            $msg = "Command '{$command}' does not exist.";
+            echo $msg . "\n";
+            throw new \Espo\Core\Exceptions\Error($msg);
+        }
+        $impl = new $className($this->container);
+        return $impl->run($options, $flagList, $argumentList);
+    }
+}
@@ -0,0 +1,87 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Console\Commands;
+
+class AclCheck extends Base
+{
+    public function run($options)
+    {
+        $userId = $options['userId'] ?? null;
+        $scope = $options['scope'] ?? null;
+        $id = $options['id'] ?? null;
+        $action = $options['action'] ?? null;
+
+        if (empty($userId)) return;
+        if (empty($scope)) return;
+        if (empty($id)) return;
+
+        $container = $this->getContainer();
+        $entityManager = $container->get('entityManager');
+
+        $user = $entityManager->getEntity('User', $userId);
+        if (!$user) return;
+
+        if ($user->isPortal()) {
+            $portalIdList = $user->getLinkMultipleIdList('portals');
+            foreach ($portalIdList as $portalId) {
+                $application = new \Espo\Core\Portal\Application($portalId);
+                $containerPortal = $application->getContainer();
+                $entityManager = $containerPortal->get('entityManager');
+
+                $user = $entityManager->getEntity('User', $userId);
+                if (!$user) return;
+
+                $result = $this->check($user, $scope, $id, $action, $containerPortal);
+                if ($result) {
+                    return 'true';
+                }
+            }
+            return;
+        }
+
+        if ($this->check($user, $scope, $id, $action, $container)) {
+            return 'true';
+        }
+    }
+
+    protected function check($user, $scope, $id, $action, $container)
+    {
+        $entityManager = $container->get('entityManager');
+
+        $entity = $entityManager->getEntity($scope, $id);
+        if (!$entity) return;
+
+        $aclManager = $container->get('aclManager');
+
+        if ($aclManager->check($user, $entity, $action)) {
+            return true;
+        }
+    }
+}
@@ -0,0 +1,56 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Console\Commands;
+
+class AuthTokenCheck extends Base
+{
+    public function run($options, $flagList, $argumentList)
+    {
+        $token = $argumentList[0] ?? null;
+        if (empty($token)) return;
+
+        $entityManager = $this->getContainer()->get('entityManager');
+
+        $authToken = $entityManager->getRepository('AuthToken')->where([
+            'token' => $token,
+            'isActive' => true,
+        ])->findOne();
+
+        if (!$authToken) return;
+        if (!$authToken->get('userId')) return;
+
+        $userId = $authToken->get('userId');
+
+        $user = $entityManager->getEntity('User', $userId);
+        if (!$user) return;
+
+        return $user->id;
+    }
+}
@@ -0,0 +1,45 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Console\Commands;
+
+abstract class Base
+{
+    private $container;
+
+    public function __construct(\Espo\Core\Container $container)
+    {
+        $this->container = $container;
+    }
+
+    protected function getContainer()
+    {
+        return $this->container;
+    }
+}
@@ -0,0 +1,39 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Console\Commands;
+
+class ClearCache extends Base
+{
+    public function run()
+    {
+        $this->getContainer()->get('dataManager')->clearCache();
+        echo "Cache has been cleared.\n";
+    }
+}
@@ -0,0 +1,39 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Console\Commands;
+
+class Rebuild extends Base
+{
+    public function run()
+    {
+        $this->getContainer()->get('dataManager')->rebuild();
+        echo "Rebuild has been done.\n";
+    }
+}
@@ -0,0 +1,68 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Console\Commands;
+
+class RunJob extends Base
+{
+    public function run($options, $flags, $argumentList)
+    {
+        $jobName = $options['job'] ?? null;
+        $targetId = $options['targetId'] ?? null;
+        $targetType = $options['targetType'] ?? null;
+
+        if (!$jobName && count($argumentList)) {
+            $jobName = $argumentList[0];
+        }
+
+        if (!$jobName) echo "No job specified.\n";
+
+        $jobName = ucfirst(\Espo\Core\Utils\Util::hyphenToCamelCase($jobName));
+
+        $container = $this->getContainer();
+        $entityManager = $container->get('entityManager');
+
+        $job = $entityManager->createEntity('Job', [
+            'name' => $jobName,
+            'job' => $jobName,
+            'targetType' => $targetType,
+            'targetId' => $targetId,
+        ]);
+
+        $cronManager = new \Espo\Core\CronManager($container);
+
+        $result = $cronManager->runJob($job);
+
+        if ($result) {
+            echo "Job '{$jobName}' has been executed.\n";
+        } else {
+            echo "Job '{$jobName}' failed to execute.\n";
+        }
+    }
+}
@@ -0,0 +1,186 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Console\Commands;
+
+class Upgrade extends Base
+{
+    public function run()
+    {
+        $infoData = $this->getVersionInfo();
+        if (!$infoData) return;
+
+        $nextVersion = $infoData->nextVersion ?? null;
+        $lastVersion = $infoData->lastVersion ?? null;
+
+        $fromVersion = $this->getConfig()->get('version');
+
+        fwrite(\STDOUT, "Current version is {$fromVersion}.\n");
+
+        if (!$nextVersion) {
+            echo "There are no available upgrades.\n";
+            return;
+        }
+
+        fwrite(\STDOUT, "EspoCRM will be upgraded to version {$nextVersion} now. Enter [Y] to continue.\n");
+
+        if (!$this->confirm()) {
+            echo "Upgrade canceled.\n";
+            return;
+        }
+
+        fwrite(\STDOUT, "Downloading...");
+
+        $upgradePackageFilePath = $this->downloadFile($infoData->nextPackage);
+        if (!$upgradePackageFilePath) return;
+
+        fwrite(\STDOUT, "\n");
+
+        fwrite(\STDOUT, "Upgrading... This may take a while...");
+
+        $this->upgrade($upgradePackageFilePath);
+
+        fwrite(\STDOUT, "\n");
+
+        fwrite(\STDOUT, $resultText);
+
+        $this->getFileManager()->unlink($upgradePackageFilePath);
+
+        $app = new \Espo\Core\Application();
+        $currentVerison = $app->getContainer()->get('config')->get('version');
+
+        fwrite(\STDOUT, "Upgrade is complete. Current version is {$currentVerison}.\n");
+
+        if ($lastVersion && $lastVersion !== $currentVerison && $fromVersion !== $currentVerison) {
+            fwrite(\STDOUT, "Newer version is available. Run command again to upgrade.\n");
+            return;
+        }
+
+        if ($lastVersion && $lastVersion === $currentVerison) {
+            fwrite(\STDOUT, "You have the latest version.\n");
+            return;
+        }
+    }
+
+    protected function upgrade($filePath)
+    {
+        $app = new \Espo\Core\Application();
+        $app->setupSystemUser();
+
+        $upgradeManager = new \Espo\Core\UpgradeManager($app->getContainer());
+
+        try {
+            $fileData = file_get_contents($filePath);
+            $fileData = 'data:application/zip;base64,' . base64_encode($fileData);
+
+            $upgradeId = $upgradeManager->upload($fileData);
+            $upgradeManager->install(['id' => $upgradeId]);
+        } catch (\Exception $e) {
+            die("Error: " . $e->getMessage() . "\n");
+        }
+    }
+
+    protected function confirm()
+    {
+        $fh = fopen('php://stdin', 'r');
+        $inputLine = trim(fgets($fh));
+        fclose($fh);
+        if (strtolower($inputLine) !== 'y'){
+            return false;
+        }
+        return true;
+    }
+
+    protected function getConfig()
+    {
+        return $this->getContainer()->get('config');
+    }
+
+    protected function getFileManager()
+    {
+        return $this->getContainer()->get('fileManager');
+    }
+
+    protected function getVersionInfo()
+    {
+        $url = 'https://s.espocrm.com/upgrade/next/';
+        $url = $this->getConfig()->get('upgradeNextVersionUrl', $url);
+        $url .= '?fromVersion=' . $this->getConfig()->get('version');
+
+        $ch = curl_init();
+        curl_setopt($ch, \CURLOPT_SSL_VERIFYPEER, true);
+        curl_setopt($ch, \CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, \CURLOPT_URL, $url);
+        $result = curl_exec($ch);
+        curl_close($ch);
+
+        try {
+            $data = json_decode($result);
+        } catch (\Exception $e) {
+            echo "Could not parse info about next version.\n";
+            return;
+        }
+
+        if (!$data) {
+            echo "Could not get info about next version.\n";
+            return;
+        }
+
+        return $data;
+    }
+
+    protected function downloadFile($url)
+    {
+        $localFilePath = 'data/upload/upgrades/' . \Espo\Core\Utils\Util::generateId() . '.zip';
+        $this->getFileManager()->putContents($localFilePath, '');
+
+        if (is_file($url)) {
+            copy($url, $localFilePath);
+        } else {
+            $options = [
+                CURLOPT_FILE  => fopen($localFilePath, 'w'),
+                CURLOPT_TIMEOUT => 3600,
+                CURLOPT_URL => $url
+            ];
+
+            $ch = curl_init();
+            curl_setopt_array($ch, $options);
+            curl_exec($ch);
+            curl_close($ch);
+        }
+
+        if (!$this->getFileManager()->isFile($localFilePath)) {
+            echo "\nCould not download upgrade file.\n";
+            $this->getFileManager()->unlink($localFilePath);
+            return;
+        }
+
+        return realpath($localFilePath);
+    }
+}
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -34,15 +34,11 @@ class Container

    private $data = [];

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

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

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

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

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

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

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

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

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

        return $log;
    }
@@ -176,15 +172,6 @@ class Container
        );
    }

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

-    protected function loadSelectManagerFactory()
-    {
-        return new \Espo\Core\SelectManagerFactory(
-            $this->get('entityManager'),
-            $this->get('user'),
-            $this->get('acl'),
-            $this->get('aclManager'),
-            $this->get('metadata'),
-            $this->get('config'),
-            $this->get('injectableFactory')
-        );
-    }
-
    protected function loadNotificatorFactory()
    {
        return new \Espo\Core\NotificatorFactory(
@@ -317,7 +291,7 @@ class Container
            'en_US',
            $this->get('fileManager'),
            $this->get('metadata'),
-            $this->get('useCache')
+            $this->get('config')->get('useCache')
        );
    }

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

@@ -374,14 +348,6 @@ class Container
        );
    }

-    protected function loadClientManager()
-    {
-        return new \Espo\Core\Utils\ClientManager(
-            $this->get('config'),
-            $this->get('themeManager')
-        );
-    }
-
    protected function loadInjectableFactory()
    {
        return new \Espo\Core\InjectableFactory(
@@ -394,4 +360,3 @@ class Container
        $this->set('user', $user);
    }
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -67,11 +67,9 @@ class Record extends Base
    public function actionRead($params, $data, $request)
    {
        $id = $params['id'];
-        $entity = $this->getRecordService()->readEntity($id);
+        $entity = $this->getRecordService()->read($id);

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

        return $entity->getValueMap();
    }
@@ -95,7 +93,7 @@ class Record extends Base

        $service = $this->getRecordService();

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

@@ -116,7 +114,7 @@ class Record extends Base

        $id = $params['id'];

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

@@ -140,12 +138,19 @@ class Record extends Base
            throw new Forbidden("Max size should should not exceed " . $maxSizeLimit . ". Use offset and limit.");
        }

-        $result = $this->getRecordService()->findEntities($params);
+        $result = $this->getRecordService()->find($params);

-        return array(
-            'total' => $result['total'],
-            'list' => isset($result['collection']) ? $result['collection']->getValueMapList() : $result['list']
-        );
+        if (is_array($result)) {
+            return [
+                'total' => $result['total'],
+                'list' => isset($result['collection']) ? $result['collection']->getValueMapList() : $result['list']
+            ];
+        }
+
+        return [
+            'total' => $result->total,
+            'list' => isset($result->collection) ? $result->collection->getValueMapList() : $result->list
+        ];
    }

    public function getActionListKanban($params, $data, $request)
@@ -195,12 +200,19 @@ class Record extends Base
            throw new Forbidden("Max size should should not exceed " . $maxSizeLimit . ". Use offset and limit.");
        }

-        $result = $this->getRecordService()->findLinkedEntities($id, $link, $params);
+        $result = $this->getRecordService()->findLinked($id, $link, $params);

-        return array(
-            'total' => $result['total'],
-            'list' => isset($result['collection']) ? $result['collection']->getValueMapList() : $result['list']
-        );
+        if (is_array($result)) {
+            return [
+                'total' => $result['total'],
+                'list' => isset($result['collection']) ? $result['collection']->getValueMapList() : $result['list']
+            ];
+        }
+
+        return (object) [
+            'total' => $result->total,
+            'list' => isset($result->collection) ? $result->collection->getValueMapList() : $result->list
+        ];
    }

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

        $id = $params['id'];

-        if ($this->getRecordService()->deleteEntity($id)) {
+        if ($this->getRecordService()->delete($id)) {
            return true;
        }
        throw new Error();
@@ -262,9 +274,9 @@ class Record extends Base
            $params['format'] = $data->format;
        }

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

    public function actionMassUpdate($params, $data, $request)
@@ -296,33 +308,26 @@ class Record extends Base

        $attributes = $data->attributes;

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

        return $idsUpdated;
    }

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

-        $params = array();
-        if (property_exists($data, 'where') && !empty($data->byWhere)) {
-            $where = json_decode(json_encode($data->where), true);
-            $params['where'] = $where;
-            if (property_exists($data, 'selectData')) {
-                $params['selectData'] = json_decode(json_encode($data->selectData), true);
+        $actionParams = $this->getMassActionParamsFromData($data);
+
+        if (array_key_exists('where', $actionParams)) {
+            if ($this->getAcl()->get('massUpdatePermission') !== 'yes') {
+                throw new Forbidden();
            }
        }
-        if (property_exists($data, 'ids')) {
-            $params['ids'] = $data->ids;
-        }

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

    public function actionCreateLink($params, $data, $request)
@@ -349,7 +354,7 @@ class Record extends Base
                $selectData = json_decode(json_encode($data->selectData), true);
            }

-            return $this->getRecordService()->linkEntityMass($id, $link, $where, $selectData);
+            return $this->getRecordService()->massLink($id, $link, $where, $selectData);
        } else {
            $foreignIdList = array();
            if (isset($data->id)) {
@@ -363,7 +368,7 @@ class Record extends Base

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

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

        return $this->getRecordService()->massUnfollow($params);
    }
+
+    protected function getMassActionParamsFromData($data)
+    {
+        $params = [];
+        if (property_exists($data, 'where') && !empty($data->byWhere)) {
+            $where = json_decode(json_encode($data->where), true);
+            $params['where'] = $where;
+            if (property_exists($data, 'selectData')) {
+                $params['selectData'] = json_decode(json_encode($data->selectData), true);
+            }
+        }
+        if (property_exists($data, 'ids')) {
+            $params['ids'] = $data->ids;
+        }
+
+        return $params;
+    }
+
+    public function postActionMassRecalculateFormula($params, $data, $request)
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+        if (!$this->getAcl()->check($this->name, 'edit')) throw new Forbidden();
+
+        return $this->getRecordService()->massRecalculateFormula($this->getMassActionParamsFromData($data));
+    }
+
+    public function postActionRestoreDeleted($params, $data, $request)
+    {
+        if (!$this->getUser()->isAdmin()) throw new Forbidden();
+
+        $id = $data->id ?? null;
+        if (!$id) throw new Forbidden();
+
+        return $this->getRecordService()->restoreDeleted($id);
+    }
 }
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -53,6 +53,15 @@ class CronManager

    private $useProcessPool = false;

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

    const READY = 'Ready';
@@ -173,8 +182,6 @@ class CronManager

    /**
     * Run Cron
-     *
-     * @return void
     */
    public function run()
    {
@@ -185,7 +192,7 @@ class CronManager

        $this->setLastRunTime(time());

-        $this->getCronJobUtil()->markFailedJobs();
+        $this->getCronJobUtil()->markJobsFailed();
        $this->getCronJobUtil()->updateFailedJobAttempts();
        $this->createJobsFromScheduledJobs();
        $this->getCronJobUtil()->removePendingJobDuplicates();
@@ -231,6 +238,9 @@ class CronManager
                if (!$noLock) $this->unlockTables();
                continue;
            }
+
+            $job->set('startedAt', date('Y-m-d H:i:s'));
+
            if ($useProcessPool) {
                $job->set('status', self::READY);
            } else {
@@ -276,6 +286,10 @@ class CronManager
            throw new Error("Can't run job {$id} with no status Ready.");
        }

+        if (!$job->get('startedAt')) {
+            $job->set('startedAt', date('Y-m-d H:i:s'));
+        }
+
        $job->set('status', self::RUNNING);
        $job->set('pid', \Espo\Core\Utils\System::getPid());
        $this->getEntityManager()->saveEntity($job);
@@ -283,7 +297,7 @@ class CronManager
        $this->runJob($job);
    }

-    public function runJob($job)
+    public function runJob(\Espo\Entities\Job $job)
    {
        $isSuccess = true;
        $skipLog = false;
@@ -291,10 +305,12 @@ class CronManager
        try {
            if ($job->get('scheduledJobId')) {
                $this->runScheduledJob($job);
+            } else if ($job->get('job')) {
+                $this->runJobByName($job);
            } else {
                $this->runService($job);
            }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
            $isSuccess = false;
            if ($e->getCode() === -1) {
                $job->set('attempts', 0);
@@ -317,6 +333,9 @@ class CronManager
        if ($job->get('scheduledJobId') && !$skipLog) {
            $this->getCronScheduledJobUtil()->addLogRecord($job->get('scheduledJobId'), $status, null, $job->get('targetId'), $job->get('targetType'));
        }
+
+        if ($isSuccess) return true;
+        return false;
    }

    protected function runScheduledJob($job)
@@ -324,18 +343,14 @@ class CronManager
        $jobName = $job->get('scheduledJobJob');

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

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

        $data = null;
-
        if ($job->get('data')) {
            $data = $job->get('data');
        }
@@ -343,43 +358,47 @@ class CronManager
        $jobClass->$method($data, $job->get('targetId'), $job->get('targetType'));
    }

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

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

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

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

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

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

-        if (!method_exists($service, $methodName)) {
-            throw new NotFound();
-        }
+        if (!method_exists($service, $methodName)) throw new Error();

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

        $service->$methodName($data, $job->get('targetId'), $job->get('targetType'));
    }

+    protected function runJobByName($job)
+    {
+        $jobName = $job->get('job');
+
+        $className = $this->getScheduledJobUtil()->get($jobName);
+
+        if ($className === false) throw new Error("No class name for job {$jobName}.");
+
+        $jobClass = new $className($this->container);
+        $method = 'run';
+        if (!method_exists($jobClass, $method)) throw new Error();
+
+        $data = $job->get('data') ?: null;
+
+        $jobClass->$method($data, $job->get('targetId'), $job->get('targetType'));
+    }
+
    protected function createJobsFromScheduledJobs()
    {
        $activeScheduledJobList = $this->getCronScheduledJobUtil()->getActiveScheduledJobList();
@@ -388,7 +407,7 @@ class CronManager
        $createdJobIdList = [];
        foreach ($activeScheduledJobList as $scheduledJob) {
            $scheduling = $scheduledJob->get('scheduling');
-            $asSoonAsPossible = $scheduling === '* * * * *';
+            $asSoonAsPossible = in_array($scheduling, $this->asSoonAsPossibleSchedulingList);

            if ($asSoonAsPossible) {
                $nextDate = date('Y-m-d H:i:s');
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -119,6 +119,7 @@ class DataManager
        $metadata->init(true);

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

        $this->updateCacheTimestamp();

@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,14 +25,11 @@
 *
 * In accordance with Section 7(b) of the GNU General Public License version 3,
 * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Core\Exceptions;

 class BadRequest extends \Exception
 {
    protected $code = 400;
-
 }
-
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,13 +25,11 @@
 *
 * In accordance with Section 7(b) of the GNU General Public License version 3,
 * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Core\Exceptions;

 class Conflict extends \Exception
 {
    protected $code = 409;
-
 }
-
@@ -3,8 +3,8 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
- * Website: http://www.espocrm.com
+ * Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 *
 * In accordance with Section 7(b) of the GNU General Public License version 3,
 * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Core\Exceptions;

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

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