v

defaultSidePanelFieldList
css
2016-12-08 11:41:55 +02:00 · 2016-12-07 17:32:43 +02:00 · 2016-12-07 15:48:35 +02:00 · 2016-12-07 13:21:47 +02:00 · 2016-12-07 11:32:22 +02:00 · 2016-12-07 10:56:32 +02:00
2315 changed files with 81240 additions and 20760 deletions
@@ -6,14 +6,17 @@
 /data/config.php
 /build
 /node_modules
-/client
 /test.php
 /main.html
-/frontend/client/css/espo.css
-/frontend/client/css/espo-vertical.css
-/frontend/client/css/sakura.css
-/frontend/client/css/sakura-vertical.css
-/tests/testData/cache/*
+/client/css/espo.css
+/client/css/espo-vertical.css
+/client/css/sakura.css
+/client/css/sakura-vertical.css
+/client/css/violet.css
+/client/css/violet-vertical.css
+/tests/unit/testData/cache/*
+!/tests/unit/testData/cache/.data
+/tests/integration/config.php
 composer.phar
 vendor/
 /custom/Espo/Custom/*
@@ -0,0 +1,3 @@
+Before we can merge your pull request you need to accept our CLA [here](https://github.com/espocrm/cla). It's very simple to do.
+
+[Code Style Guidelines](https://github.com/espocrm/espocrm/wiki/Code-Style-Guidelines).
@@ -23,6 +23,7 @@ module.exports = function (grunt) {
    var jsFilesToMinify = [
        'client/lib/jquery-2.1.4.min.js',
        'client/lib/underscore-min.js',
+        'client/lib/es6-promise.min.js',
        'client/lib/backbone-min.js',
        'client/lib/handlebars.js',
        'client/lib/base64.js',
@@ -33,7 +34,7 @@ module.exports = function (grunt) {
        'client/lib/jquery.autocomplete.js',
        'client/lib/bootstrap.min.js',
        'client/lib/bootstrap-datepicker.js',
-        'client/lib/bull.min.js',
+        'client/lib/bull.js',
        'client/src/namespace.js',
        'client/src/exceptions.js',
        'client/src/loader.js',
@@ -64,39 +65,55 @@ module.exports = function (grunt) {
                    yuicompress: true,
                },
                files: {
-                    'frontend/client/css/espo.css': 'frontend/less/espo/main.less',
-                },
-            },
-            sakura: {
-                options: {
-                    yuicompress: true,
-                },
-                files: {
-                    'frontend/client/css/sakura.css': 'frontend/less/sakura/main.less',
-                },
+                    'client/css/espo.css': 'frontend/less/espo/main.less',
+                }
            },
            espoVertical: {
                options: {
                    yuicompress: true,
                },
                files: {
-                    'frontend/client/css/espo-vertical.css': 'frontend/less/espo-vertical/main.less',
+                    'client/css/espo-vertical.css': 'frontend/less/espo-vertical/main.less',
+                }
+            },
+            sakura: {
+                options: {
+                    yuicompress: true,
                },
+                files: {
+                    'client/css/sakura.css': 'frontend/less/sakura/main.less',
+                }
            },
            sakuraVertical: {
                options: {
                    yuicompress: true,
                },
                files: {
-                    'frontend/client/css/sakura-vertical.css': 'frontend/less/sakura-vertical/main.less',
+                    'client/css/sakura-vertical.css': 'frontend/less/sakura-vertical/main.less',
+                }
+            },
+            violet: {
+                options: {
+                    yuicompress: true,
                },
+                files: {
+                    'client/css/violet.css': 'frontend/less/violet/main.less',
+                }
+            },
+            violetVertical: {
+                options: {
+                    yuicompress: true,
+                },
+                files: {
+                    'client/css/violet-vertical.css': 'frontend/less/violet-vertical/main.less',
+                }
            }
        },
        cssmin: {
            minify: {
                files: {
                    'build/tmp/client/css/espo.css': [
-                        'frontend/client/css/espo.css',
+                        'client/css/espo.css',
                    ]
                }
            },
@@ -107,13 +124,13 @@ module.exports = function (grunt) {
                banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
            },
            'build/tmp/client/espo.min.js': jsFilesToMinify.map(function (item) {
-                return 'frontend/' + item;
+                return '' + item;
            })
        },
        copy: {
            frontendFolders: {
                expand: true,
-                cwd: 'frontend/client',
+                cwd: 'client',
                src: [
                    'src/**',
                    'res/**',
@@ -128,13 +145,13 @@ module.exports = function (grunt) {
                dest: 'build/tmp/client',
            },
            frontendHtml: {
-                src: 'frontend/html/reset.html',
+                src: 'frontend/reset.html',
                dest: 'build/tmp/reset.html'
            },
            frontendLib: {
                expand: true,
                dot: true,
-                cwd: 'frontend/client/lib',
+                cwd: 'client/lib',
                src: '**',
                dest: 'build/tmp/client/lib/',
            },
@@ -147,7 +164,9 @@ module.exports = function (grunt) {
                    'custom/**',
                    'data/.data',
                    'install/**',
+                    'portal/**',
                    'vendor/**',
+                    'html/**',
                    'bootstrap.php',
                    'cron.php',
                    'rebuild.php',
@@ -195,8 +214,11 @@ module.exports = function (grunt) {
                },
                src: [
                    'build/EspoCRM-<%= pkg.version %>/install',
+                    'build/EspoCRM-<%= pkg.version %>/portal',
                    'build/EspoCRM-<%= pkg.version %>/api',
                    'build/EspoCRM-<%= pkg.version %>/api/v1',
+                    'build/EspoCRM-<%= pkg.version %>/api/v1/portal-access',
+                    'build/EspoCRM-<%= pkg.version %>',
                ]
            }
        },
@@ -212,8 +234,12 @@ module.exports = function (grunt) {
                },
                files: [
                    {
-                        src: 'frontend/html/main.html',
-                        dest: 'build/tmp/main.html'
+                        src: 'build/tmp/html/main.html',
+                        dest: 'build/tmp/html/main.html'
+                    },
+                    {
+                        src: 'build/tmp/html/portal.html',
+                        dest: 'build/tmp/html/portal.html'
                    }
                ]
            },
@@ -8,14 +8,14 @@ Download the latest release from our [website](http://www.espocrm.com).

 ### Requirements

-* PHP 5.4 or above (with pdo, json, gd, mcrypt extensions);
+* PHP 5.5 or above (with pdo, json, gd, mcrypt extensions);
 * MySQL 5.1 or above.

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

 ### How to report bug

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

 ### How to get started (for developers)

@@ -26,9 +26,9 @@ Create an issue [here](https://github.com/espocrm/espocrm/issues) or post on our

 Never update composer dependencies if you are going to contribute code back.

-Now you can build.
+Now you can build. Build will create compiled css files.

-If your repository is accessible via a web server then you can run EspoCRM by url `http://PROJECT_URL/frontend`. To compose a proper config.php and populate database you can run install by opening `http(s)://{YOUR_CRM_URL}/install` location in a browser. Also you need to run build before to have compiled css.
+To compose a proper config.php and populate database you can run install by opening `http(s)://{YOUR_CRM_URL}/install` location in a browser. Then open `data/config.php` file and add `isDeveloperMode => true`.

 ### How to build

@@ -0,0 +1,12 @@
+RewriteEngine On
+
+# Some hosts may require you to use the `RewriteBase` directive.
+# If you need to use the `RewriteBase` directive, it should be the
+# absolute physical path to the directory that contains this htaccess file.
+#
+# RewriteBase /
+
+RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
+
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^ index.php [QSA,L]
@@ -0,0 +1,39 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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.
+ ************************************************************************/
+
+require_once('../../../bootstrap.php');
+
+if (!empty($_GET['portalId'])) {
+    $portalId = $_GET['portalId'];
+} else {
+    $portalId = explode('/', $_SERVER['REQUEST_URI'])[count(explode('/', $_SERVER['SCRIPT_NAME'])) - 1];
+}
+
+$app = new \Espo\Core\Portal\Application($portalId);
+$app->run();
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <system.webServer>
+        <rewrite>
+            <rules>
+                <rule name="rule 1G" stopProcessing="true">
+                    <match url="^"  />
+                    <action type="Rewrite" url="index.php"  appendQueryString="true" />
+				</rule>
+            </rules>
+        </rewrite>
+    </system.webServer>
+
+</configuration>
@@ -0,0 +1,93 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Acl;
+
+use \Espo\Entities\User as EntityUser;
+use \Espo\ORM\Entity;
+
+class Attachment extends \Espo\Core\Acl\Base
+{
+    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if ($entity->get('parentType') === 'Settings') {
+            return true;
+        }
+
+        $parent = null;
+        $hasParent = false;
+        if ($entity->get('parentId') && $entity->get('parentType')) {
+            $hasParent = true;
+            $parent = $this->getEntityManager()->getEntity($entity->get('parentType'), $entity->get('parentId'));
+        } else if ($entity->get('relatedId') && $entity->get('relatedType')) {
+            $hasParent = true;
+            $parent = $this->getEntityManager()->getEntity($entity->get('relatedType'), $entity->get('relatedId'));
+        }
+
+        if ($hasParent) {
+            if ($parent) {
+                if ($parent->getEntityType() === 'Note') {
+                    if ($parent->get('parentId') && $parent->get('parentType')) {
+                        $parentOfParent = $this->getEntityManager()->getEntity($parent->get('parentType'), $parent->get('parentId'));
+                        if ($parentOfParent && $this->getAclManager()->checkEntity($user, $parentOfParent)) {
+                            return true;
+                        }
+                    } else {
+                        return true;
+                    }
+                } else {
+                    if ($this->getAclManager()->checkEntity($user, $parent)) {
+                        return true;
+                    }
+                }
+            }
+        } else {
+            return true;
+        }
+
+        if ($this->checkEntity($user, $entity, $data, 'read')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function checkIsOwner(EntityUser $user, Entity $entity)
+    {
+        if ($user->id === $entity->get('createdById')) {
+            return true;
+        }
+        return false;
+    }
+}
+
@@ -29,13 +29,13 @@

 namespace Espo\Acl;

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

 class Email extends \Espo\Core\Acl\Base
 {

-    public function checkEntityRead(User $user, Entity $entity, $data)
+    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
    {
        if ($this->checkEntity($user, $entity, $data, 'read')) {
            return true;
@@ -44,8 +44,8 @@ class Email extends \Espo\Core\Acl\Base
        if ($data === false) {
            return false;
        }
-        if (is_array($data)) {
-            if (empty($data['read']) || $data['read'] == 'no') {
+        if (is_object($data)) {
+            if ($data->read === false || $data->read === 'no') {
                return false;
            }
        }
@@ -60,20 +60,62 @@ class Email extends \Espo\Core\Acl\Base
        return false;
    }

-    public function checkIsOwner(User $user, Entity $entity)
+    public function checkIsOwner(EntityUser $user, Entity $entity)
    {
-        if ($entity->has('assignedUserId')) {
-            if ($user->id === $entity->get('assignedUserId')) {
-                return true;
-            }
+        if ($user->id === $entity->get('assignedUserId')) {
+            return true;
        }

        if ($user->id === $entity->get('createdById')) {
            return true;
        }

+        if ($entity->hasLinkMultipleId('assignedUsers', $user->id)) {
+            return true;
+        }
+
        return false;
    }

+    public function checkEntityDelete(EntityUser $user, Entity $entity, $data)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if ($data === false) {
+            return false;
+        }
+
+        if ($data->delete === 'own') {
+            if ($user->id === $entity->get('assignedUserId')) {
+                return true;
+            }
+
+            if ($user->id === $entity->get('createdById')) {
+                return true;
+            }
+
+            $assignedUserIdList = $entity->getLinkMultipleIdList('assignedUsers');
+            if (count($assignedUserIdList) === 1 && $entity->hasLinkMultipleId('assignedUsers', $user->id)) {
+                return true;
+            }
+            return false;
+        }
+
+        if ($this->checkEntity($user, $entity, $data, 'delete')) {
+            return true;
+        }
+
+        if ($data->edit !== 'no' || $data->create !== 'no') {
+            if ($entity->get('createdById') === $user->id) {
+                if ($entity->get('status') !== 'Sent' && $entity->get('status') !== 'Archived') {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
 }

@@ -29,12 +29,12 @@

 namespace Espo\Acl;

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

 class EmailFilter extends \Espo\Core\Acl\Base
 {
-    public function checkIsOwner(User $user, Entity $entity)
+    public function checkIsOwner(EntityUser $user, Entity $entity)
    {
        if ($entity->has('parentId') && $entity->has('parentType')) {
            $parentType = $entity->get('parentType');
@@ -42,11 +42,14 @@ class EmailFilter extends \Espo\Core\Acl\Base
            if (!$parentType || !$parentId) return;

            $parent = $this->getEntityManager()->getEntity($parentType, $parentId);
+
+            if ($parent->getEntityType() === 'User') {
+                return $parent->id === $user->id;
+            }
            if ($parent && $parent->has('assignedUserId') && $parent->get('assignedUserId') === $user->id) {
                return true;
            }
        }
-
        return;
    }
 }
@@ -0,0 +1,45 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Acl;
+
+use \Espo\Entities\User as EntityUser;
+use \Espo\ORM\Entity;
+
+class Notification extends \Espo\Core\Acl\Base
+{
+    public function checkIsOwner(EntityUser $user, Entity $entity)
+    {
+        if ($user->id === $entity->get('userId')) {
+            return true;
+        }
+        return false;
+    }
+}
+
@@ -0,0 +1,41 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Acl;
+
+use \Espo\ORM\Entity;
+
+class Team extends \Espo\Core\Acl\Base
+{
+    public function checkInTeam(\Espo\Entities\User $user, Entity $entity)
+    {
+        $userTeamIdList = $user->getLinkMultipleIdList('teams');
+        return in_array($entity->id, $userTeamIdList);
+    }
+}
@@ -0,0 +1,41 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Acl;
+
+use \Espo\ORM\Entity;
+
+class User extends \Espo\Core\Acl\Base
+{
+    public function checkIsOwner(\Espo\Entities\User $user, Entity $entity)
+    {
+        return $user->id === $entity->id;
+    }
+}
+
@@ -0,0 +1,93 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\AclPortal;
+
+use \Espo\Entities\User as EntityUser;
+use \Espo\ORM\Entity;
+
+class Attachment extends \Espo\Core\AclPortal\Base
+{
+    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if ($entity->get('parentType') === 'Settings') {
+            return true;
+        }
+
+        $parent = null;
+        $hasParent = false;
+        if ($entity->get('parentId') && $entity->get('parentType')) {
+            $hasParent = true;
+            $parent = $this->getEntityManager()->getEntity($entity->get('parentType'), $entity->get('parentId'));
+        } else if ($entity->get('relatedId') && $entity->get('relatedType')) {
+            $hasParent = true;
+            $parent = $this->getEntityManager()->getEntity($entity->get('relatedType'), $entity->get('relatedId'));
+        }
+
+        if ($hasParent) {
+            if ($parent) {
+                if ($parent->getEntityType() === 'Note') {
+                    if ($parent->get('parentId') && $parent->get('parentType')) {
+                        $parentOfParent = $this->getEntityManager()->getEntity($parent->get('parentType'), $parent->get('parentId'));
+                        if ($parentOfParent && $this->getAclManager()->checkEntity($user, $parentOfParent)) {
+                            return true;
+                        }
+                    } else {
+                        return true;
+                    }
+                } else {
+                    if ($this->getAclManager()->checkEntity($user, $parent)) {
+                        return true;
+                    }
+                }
+            }
+        } else {
+            return true;
+        }
+
+        if ($this->checkEntity($user, $entity, $data, 'read')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function checkIsOwner(EntityUser $user, Entity $entity)
+    {
+        if ($user->id === $entity->get('createdById')) {
+            return true;
+        }
+        return false;
+    }
+}
+
@@ -0,0 +1,71 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\AclPortal;
+
+use \Espo\Entities\User as EntityUser;
+use \Espo\ORM\Entity;
+
+class Email extends \Espo\Core\AclPortal\Base
+{
+
+    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
+    {
+        if ($this->checkEntity($user, $entity, $data, 'read')) {
+            return true;
+        }
+
+        if ($data === false) {
+            return false;
+        }
+        if (is_object($data)) {
+            if ($data->read === false || $data->read === 'no') {
+                return false;
+            }
+        }
+
+        if (!$entity->has('usersIds')) {
+            $entity->loadLinkMultipleField('users');
+        }
+        $userIdList = $entity->get('usersIds');
+        if (is_array($userIdList) && in_array($user->id, $userIdList)) {
+            return true;
+        }
+        return false;
+    }
+
+    public function checkIsOwner(EntityUser $user, Entity $entity)
+    {
+        if ($user->id === $entity->get('createdById')) {
+            return true;
+        }
+        return false;
+    }
+}
+
@@ -0,0 +1,45 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\AclPortal;
+
+use \Espo\Entities\User as EntityUser;
+use \Espo\ORM\Entity;
+
+class Notification extends \Espo\Core\AclPortal\Base
+{
+    public function checkIsOwner(EntityUser $user, Entity $entity)
+    {
+        if ($user->id === $entity->get('userId')) {
+            return true;
+        }
+        return false;
+    }
+}
+
@@ -0,0 +1,41 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\AclPortal;
+
+use \Espo\ORM\Entity;
+
+class User extends \Espo\Core\AclPortal\Base
+{
+    public function checkIsOwner(\Espo\Entities\User $user, Entity $entity)
+    {
+        return $user->id === $entity->id;
+    }
+}
+
@@ -35,19 +35,42 @@ class App extends \Espo\Core\Controllers\Base
 {
    public function actionUser()
    {
-        $preferences = $this->getPreferences()->toArray();
+        $preferences = $this->getPreferences()->getValues();
        unset($preferences['smtpPassword']);

        $user = $this->getUser();
        if (!$user->has('teamsIds')) {
            $user->loadLinkMultipleField('teams');
        }
+        if ($user->get('isPortalUser')) {
+            $user->loadAccountField();
+            $user->loadLinkMultipleField('accounts');
+        }
+
+        $userData = $user->getValues();
+
+        $emailAddressList = [];
+        foreach ($user->get('emailAddresses') as $emailAddress) {
+            if ($emailAddress->get('invalid')) continue;
+            if ($user->get('emailAddrses') === $emailAddress->get('name')) continue;
+            $emailAddressList[] = $emailAddress->get('name');
+        }
+        if ($user->get('emailAddrses')) {
+            array_unshift($emailAddressList, $user->get('emailAddrses'));
+        }
+        $userData['emailAddressList'] = $emailAddressList;
+
+        $settings = (object)[];
+        foreach ($this->getConfig()->get('userItems') as $item) {
+            $settings->$item = $this->getConfig()->get($item);
+        }

        return array(
-            'user' => $user->toArray(),
+            'user' => $userData,
            'acl' => $this->getAcl()->getMap(),
            'preferences' => $preferences,
-            'token' => $this->getUser()->get('token')
+            'token' => $this->getUser()->get('token'),
+            'settings' => $settings
        );
    }

@@ -34,15 +34,23 @@ use \Espo\Core\Exceptions\BadRequest;

 class Attachment extends \Espo\Core\Controllers\Record
 {
-
    public function actionUpload($params, $data, $request)
    {
        if (!$request->isPost()) {
            throw new BadRequest();
        }

-        list($prefix, $contents) = explode(',', $data);
-        $contents = base64_decode($contents);
+        if (!$this->getAcl()->checkScope('Attachment', 'create')) {
+            throw new Forbidden();
+        }
+
+        $arr = explode(',', $data);
+        if (count($arr) > 1) {
+            list($prefix, $contents) = $arr;
+            $contents = base64_decode($contents);
+        } else {
+            $contents = '';
+        }

        $attachment = $this->getEntityManager()->getEntity('Attachment');
        $this->getEntityManager()->saveEntity($attachment);
@@ -40,32 +40,32 @@ class AuthToken extends \Espo\Core\Controllers\Record
        }
    }

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

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

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

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

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

-    public function actionRemoveLink($params, $data)
+    public function actionRemoveLink($params, $data, $request)
    {
        throw new Forbidden();
    }
@@ -32,12 +32,16 @@ namespace Espo\Controllers;
 use \Espo\Core\Exceptions\BadRequest;
 use \Espo\Core\Exceptions\Forbidden;
 use \Espo\Core\Exceptions\Error;
+use \Espo\Core\Exceptions\NotFound;

 class Email extends \Espo\Core\Controllers\Record
 {
-    public function actionGetCopiedAttachments($params, $data, $request)
+    public function postActionGetCopiedAttachments($params, $data, $request)
    {
-        $id = $request->get('id');
+        if (empty($data['id'])) {
+            throw new BadRequest();
+        }
+        $id = $data['id'];

        return $this->getRecordService()->getCopiedAttachments($id);
    }
@@ -48,22 +52,48 @@ class Email extends \Espo\Core\Controllers\Record
            throw new BadRequest();
        }

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

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

@@ -158,5 +188,38 @@ class Email extends \Espo\Core\Controllers\Record
        }
        return $this->getRecordService()->retrieveFromTrashByIdList($ids);
    }
+
+    public function getActionGetFoldersNotReadCounts(&$params, $request, $data)
+    {
+        return $this->getRecordService()->getFoldersNotReadCounts();
+    }
+
+    protected function fetchListParamsFromRequest(&$params, $request, $data)
+    {
+        parent::fetchListParamsFromRequest($params, $request, $data);
+
+        $folderId = $request->get('folderId');
+        if ($folderId) {
+            $params['folderId'] = $request->get('folderId');
+        }
+    }
+
+    public function postActionMoveToFolder($params, $data)
+    {
+        if (!empty($data['ids'])) {
+            $ids = $data['ids'];
+        } else {
+            if (!empty($data['id'])) {
+                $ids = [$data['id']];
+            } else {
+                throw new BadRequest();
+            }
+        }
+
+        if (empty($data['folderId'])) {
+            throw new BadRequest();
+        }
+        return $this->getRecordService()->moveToFolderByIdList($ids, $data['folderId']);
+    }
 }

@@ -25,14 +25,22 @@
 *
 * 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 EmailAddress extends \Espo\Core\Controllers\Record
 {
    public function actionSearchInAddressBook($params, $data, $request)
    {
+        if (!$this->getAcl()->checkScope('Email')) {
+            throw new Forbidden();
+        }
+        if (!$this->getAcl()->checkScope('Email', 'create')) {
+            throw new Forbidden();
+        }
        $q = $request->get('q');
        $limit = intval($request->get('limit'));
        if (empty($limit) || $limit > 30) {
@@ -0,0 +1,63 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Controllers;
+
+use \Espo\Core\Exceptions\BadRequest;
+
+class EmailFolder extends \Espo\Core\Controllers\Record
+{
+    public function postActionMoveUp($params, $data, $request)
+    {
+        if (empty($data['id'])) {
+            throw new BadRequest();
+        }
+
+        $this->getRecordService()->moveUp($data['id']);
+
+        return true;
+    }
+
+    public function postActionMoveDown($params, $data, $request)
+    {
+        if (empty($data['id'])) {
+            throw new BadRequest();
+        }
+
+        $this->getRecordService()->moveDown($data['id']);
+
+        return true;
+    }
+
+    public function getActionListAll()
+    {
+        return $this->getRecordService()->listAll();
+    }
+}
+
@@ -69,20 +69,29 @@ class EntityManager extends \Espo\Core\Controllers\Base
        if (!empty($data['stream'])) {
            $params['stream'] = $data['stream'];
        }
+        if (!empty($data['disabled'])) {
+            $params['disabled'] = $data['disabled'];
+        }
        if (!empty($data['sortBy'])) {
            $params['sortBy'] = $data['sortBy'];
        }
        if (!empty($data['sortDirection'])) {
            $params['asc'] = $data['sortDirection'] === 'asc';
        }
+        if (isset($data['textFilterFields']) && is_array($data['textFilterFields'])) {
+            $params['textFilterFields'] = $data['textFilterFields'];
+        }

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

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

            $this->getContainer()->get('dataManager')->rebuild();
        } else {
@@ -189,6 +198,13 @@ class EntityManager extends \Espo\Core\Controllers\Base
            $params['linkMultipleFieldForeign'] = $data['linkMultipleFieldForeign'];
        }

+        if (array_key_exists('audited', $data)) {
+            $params['audited'] = $data['audited'];
+        }
+        if (array_key_exists('auditedForeign', $data)) {
+            $params['auditedForeign'] = $data['auditedForeign'];
+        }
+
        $result = $this->getContainer()->get('entityManagerUtil')->createLink($params);

        if ($result) {
@@ -233,6 +249,13 @@ class EntityManager extends \Espo\Core\Controllers\Base
            $params['linkMultipleFieldForeign'] = $data['linkMultipleFieldForeign'];
        }

+        if (array_key_exists('audited', $data)) {
+            $params['audited'] = $data['audited'];
+        }
+        if (array_key_exists('auditedForeign', $data)) {
+            $params['auditedForeign'] = $data['auditedForeign'];
+        }
+
        $result = $this->getContainer()->get('entityManagerUtil')->updateLink($params);

        if ($result) {
@@ -94,17 +94,17 @@ class Extension extends \Espo\Core\Controllers\Record
        return true;
    }

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

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

-    public function actionPatch($params, $data)
+    public function actionPatch($params, $data, $request)
    {
        throw new Forbidden();
    }
@@ -139,12 +139,12 @@ class Extension extends \Espo\Core\Controllers\Record
        throw new Forbidden();
    }

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

-    public function actionRemoveLink($params, $data)
+    public function actionRemoveLink($params, $data, $request)
    {
        throw new Forbidden();
    }
@@ -37,6 +37,13 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
 {
    public static $defaultAction = 'list';

+    protected function checkControllerAccess()
+    {
+        if (!$this->getAcl()->checkScope('ExternalAccount')) {
+            throw new Forbidden();
+        }
+    }
+
    public function actionList($params, $data, $request)
    {
        $integrations = $this->getEntityManager()->getRepository('Integration')->find();
@@ -31,7 +31,8 @@ namespace Espo\Controllers;

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

 class FieldManager extends \Espo\Core\Controllers\Base
 {
@@ -44,19 +45,23 @@ class FieldManager extends \Espo\Core\Controllers\Base

    public function actionRead($params, $data)
    {
+        if (empty($params['scope']) || empty($params['name'])) {
+            throw new BadRequest();
+        }
+
        $data = $this->getContainer()->get('fieldManager')->read($params['name'], $params['scope']);

        if (!isset($data)) {
-            throw new NotFound();
+            throw new BadRequest();
        }

        return $data;
    }

-    public function actionCreate($params, $data)
+    public function postActionCreate($params, $data)
    {
-        if (empty($data['name'])) {
-            throw new Error("Field 'name' cannnot be empty");
+        if (empty($params['scope']) || empty($data['name'])) {
+            throw new BadRequest();
        }

        $fieldManager = $this->getContainer()->get('fieldManager');
@@ -72,8 +77,12 @@ class FieldManager extends \Espo\Core\Controllers\Base
        return $fieldManager->read($data['name'], $params['scope']);
    }

-    public function actionUpdate($params, $data)
+    public function putActionUpdate($params, $data)
    {
+        if (empty($params['scope']) || empty($params['name'])) {
+            throw new BadRequest();
+        }
+
        $fieldManager = $this->getContainer()->get('fieldManager');
        $fieldManager->update($params['name'], $data, $params['scope']);

@@ -86,8 +95,12 @@ class FieldManager extends \Espo\Core\Controllers\Base
        return $fieldManager->read($params['name'], $params['scope']);
    }

-    public function actionDelete($params, $data)
+    public function deleteActionDelete($params, $data)
    {
+        if (empty($params['scope']) || empty($params['name'])) {
+            throw new BadRequest();
+        }
+
        $res = $this->getContainer()->get('fieldManager')->delete($params['name'], $params['scope']);

        $this->getContainer()->get('dataManager')->rebuildMetadata();
@@ -95,5 +108,17 @@ class FieldManager extends \Espo\Core\Controllers\Base
        return $res;
    }

+    public function postActionResetToDefault($params, $data)
+    {
+        if (empty($data['scope']) || empty($data['name'])) {
+            throw new BadRequest();
+        }
+
+        $this->getContainer()->get('fieldManager')->resetToDefault($data['name'], $data['scope']);
+
+        $this->getContainer()->get('dataManager')->rebuildMetadata();
+
+        return true;
+    }
 }

@@ -31,7 +31,6 @@ namespace Espo\Controllers;

 class I18n extends \Espo\Core\Controllers\Base
 {
-
    public function actionRead($params, $data)
    {
        return $this->getContainer()->get('language')->getAll();
@@ -43,12 +43,12 @@ class Import extends \Espo\Core\Controllers\Record
        }
    }

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

-    public function actionUpdate($params, $data)
+    public function actionUpdate($params, $data, $request)
    {
        throw new BadRequest();
    }
@@ -58,12 +58,12 @@ class Import extends \Espo\Core\Controllers\Record
        throw new BadRequest();
    }

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

-    public function actionRemoveLink($params, $data)
+    public function actionRemoveLink($params, $data, $request)
    {
        throw new BadRequest();
    }
@@ -127,8 +127,48 @@ class Import extends \Espo\Core\Controllers\Record
            throw new BadRequest();
        }

+        if (!isset($data['fieldDelimiter'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['textQualifier'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['dateFormat'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['timeFormat'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['personNameFormat'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['decimalMark'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['defaultValues'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['action'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['attachmentId'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['entityType'])) {
+            throw new BadRequest();
+        }
+
        $importParams = array(
-            'headerRow' => $data['headerRow'],
+            'headerRow' => !empty($data['headerRow']),
            'fieldDelimiter' => $data['fieldDelimiter'],
            'textQualifier' => $data['textQualifier'],
            'dateFormat' => $data['dateFormat'],
@@ -138,6 +178,8 @@ class Import extends \Espo\Core\Controllers\Record
            'currency' => $data['currency'],
            'defaultValues' => $data['defaultValues'],
            'action' => $data['action'],
+            'skipDuplicateChecking' => !empty($data['skipDuplicateChecking']),
+            'idleMode' => !empty($data['idleMode'])
        );

        if (array_key_exists('updateBy', $data)) {
@@ -67,6 +67,19 @@ class Integration extends \Espo\Core\Controllers\Record
        $entity->set($data);
        $this->getEntityManager()->saveEntity($entity);

+        $integrationsConfigData = $this->getConfig()->get('integrations');
+
+        if (!$integrationsConfigData || !($integrationsConfigData instanceof \StdClass)) {
+            $integrationsConfigData = (object)[];
+        }
+        $integrationName = $params['id'];
+
+        $integrationsConfigData->$integrationName = $entity->get('enabled');
+        $this->getConfig()->set('integrations', $integrationsConfigData);
+
+        $this->getConfig()->save();
+
+
        return $entity->toArray();
    }
 }
@@ -41,17 +41,17 @@ class Job extends \Espo\Core\Controllers\Record
        }
    }

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

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

-    public function actionPatch($params, $data)
+    public function actionPatch($params, $data, $request)
    {
        throw new Forbidden();
    }
@@ -66,12 +66,12 @@ class Job extends \Espo\Core\Controllers\Record
        throw new Forbidden();
    }

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

-    public function actionRemoveLink($params, $data)
+    public function actionRemoveLink($params, $data, $request)
    {
        throw new Forbidden();
    }
@@ -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\Controllers;

@@ -31,23 +31,22 @@ namespace Espo\Controllers;

 use \Espo\Core\Exceptions\Error;

-class Notification extends \Espo\Core\Controllers\Base
+class Notification extends \Espo\Core\Controllers\Record
 {
    public static $defaultAction = 'list';

    public function actionList($params, $data, $request)
    {
-        $scope = $params['scope'];
-        $id = $params['id'];
-
        $userId = $this->getUser()->id;

        $offset = intval($request->get('offset'));
        $maxSize = intval($request->get('maxSize'));
+        $after = $request->get('after');

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

        $result = $this->getService('Notification')->getList($userId, $params);
@@ -69,5 +68,30 @@ class Notification extends \Espo\Core\Controllers\Base
        $userId = $this->getUser()->id;
        return $this->getService('Notification')->markAllRead($userId);
    }
+
+    public function actionExport($params, $data, $request)
+    {
+        throw new Error();
+    }
+
+    public function actionMassUpdate($params, $data, $request)
+    {
+        throw new Error();
+    }
+
+    public function actionCreateLink($params, $data, $request)
+    {
+        throw new Error();
+    }
+
+    public function actionRemoveLink($params, $data, $request)
+    {
+        throw new Error();
+    }
+
+    public function actionMerge($params, $data, $request)
+    {
+        throw new Error();
+    }
 }

@@ -0,0 +1,43 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Controllers;
+
+use \Espo\Core\Exceptions\Forbidden;
+
+class Portal extends \Espo\Core\Controllers\Record
+{
+    protected function checkControllerAccess()
+    {
+        $portalPermission = $this->getAcl()->get('portalPermission');
+        if (!$portalPermission || $portalPermission === 'no') {
+            throw new Forbidden();
+        }
+    }
+}
@@ -0,0 +1,34 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Controllers;
+
+class PortalRole extends \Espo\Core\Controllers\Record
+{
+}
@@ -88,6 +88,14 @@ class Preferences extends \Espo\Core\Controllers\Base
            throw new BadRequest();
        }

+        if ($this->getAcl()->getLevel('Preferences', 'read') === 'no') {
+            throw new Forbidden();
+        }
+
+        foreach ($this->getAcl()->getScopeForbiddenAttributeList('Preferences', 'edit') as $attribute) {
+            unset($data[$attribute]);
+        }
+
        if (array_key_exists('smtpPassword', $data)) {
            $data['smtpPassword'] = $this->getCrypt()->encrypt($data['smtpPassword']);
        }
@@ -124,9 +132,14 @@ class Preferences extends \Espo\Core\Controllers\Base

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

        $entity->clear('smtpPassword');

+        foreach ($this->getAcl()->getScopeForbiddenAttributeList('Preferences', 'read') as $attribute) {
+            $entity->clear($attribute);
+        }
+
        return $entity->toArray();
    }
 }
@@ -28,6 +28,7 @@
 ************************************************************************/

 namespace Espo\Controllers;
+
 use \Espo\Core\Exceptions\Error;
 use \Espo\Core\Exceptions\Forbidden;
 use \Espo\Core\Exceptions\BadRequest;
@@ -36,7 +37,11 @@ class Settings extends \Espo\Core\Controllers\Base
 {
    protected function getConfigData()
    {
-        $data = $this->getConfig()->getData($this->getUser()->isAdmin());
+        if ($this->getUser()->id == 'system') {
+            $data = $this->getConfig()->getData();
+        } else {
+            $data = $this->getConfig()->getData($this->getUser()->isAdmin());
+        }

        $fieldDefs = $this->getMetadata()->get('entityDefs.Settings.fields');

@@ -45,6 +50,9 @@ class Settings extends \Espo\Core\Controllers\Base
                unset($data[$field]);
            }
        }
+
+        $data['jsLibs'] = $this->getMetadata()->get('app.jsLibs');
+
        return $data;
    }

@@ -86,4 +94,23 @@ class Settings extends \Espo\Core\Controllers\Base

        return $this->getConfigData();
    }
+
+    public function postActionTestLdapConnection($params, $data)
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+
+        if (!isset($data['password'])) {
+            $data['password'] = $this->getConfig()->get('ldapPassword');
+        }
+
+        $ldapUtils = new \Espo\Core\Utils\Authentication\LDAP\Utils();
+        $options = $ldapUtils->normalizeOptions($data);
+
+        $ldapClient = new \Espo\Core\Utils\Authentication\LDAP\Client($options);
+        $ldapClient->bind(); //an exception if no connection
+
+        return true;
+    }
 }
@@ -55,22 +55,16 @@ class User extends \Espo\Core\Controllers\Record
        return $this->getAclManager()->getMap($user);
    }

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

-    public function actionChangePasswordByRequest($params, $data, $request)
+    public function postActionChangePasswordByRequest($params, $data, $request)
    {
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
        if (empty($data['requestId']) || empty($data['password'])) {
            throw new BadRequest();
        }
@@ -89,23 +83,27 @@ class User extends \Espo\Core\Controllers\Record

        $this->getEntityManager()->removeEntity($p);

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

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

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

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

@@ -79,19 +79,54 @@ class Acl
        return $this->getAclManager()->checkReadOnlyOwn($this->getUser(), $scope);
    }

-    public function check($subject, $action = null, $isOwner = null, $inTeam = null)
+    public function check($subject, $action = null)
    {
-        return $this->getAclManager()->check($this->getUser(), $subject, $action, $isOwner, $inTeam) ;
+        return $this->getAclManager()->check($this->getUser(), $subject, $action);
    }

-    public function checkScope($scope, $action = null, $isOwner = null, $inTeam = null, $entity = null)
+    public function checkScope($scope, $action = null)
    {
-        return $this->getAclManager()->checkScope($this->getUser(), $scope, $action, $isOwner, $inTeam, $entity) ;
+        return $this->getAclManager()->checkScope($this->getUser(), $scope, $action);
+    }
+
+    public function checkEntity(Entity $entity, $action = 'read')
+    {
+        return $this->getAclManager()->checkEntity($this->getUser(), $entity, $action);
    }

    public function checkUser($permission, User $entity)
    {
        return $this->getAclManager()->checkUser($this->getUser(), $permission, $entity);
    }
+
+    public function checkIsOwner(Entity $entity)
+    {
+        return $this->getAclManager()->checkIsOwner($this->getUser(), $entity);
+    }
+
+    public function checkInTeam(Entity $entity)
+    {
+        return $this->getAclManager()->checkInTeam($this->getUser(), $entity);
+    }
+
+    public function getScopeForbiddenAttributeList($scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        return $this->getAclManager()->getScopeForbiddenAttributeList($this->getUser(), $scope, $action, $thresholdLevel);
+    }
+
+    public function getScopeForbiddenFieldList($scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        return $this->getAclManager()->getScopeForbiddenFieldList($this->getUser(), $scope, $action, $thresholdLevel);
+    }
+
+    public function checkUserPermission($target, $permissionType = 'userPermission')
+    {
+        return $this->getAclManager()->checkUserPermission($this->getUser(), $target, $permissionType);
+    }
+
+    public function checkAssignmentPermission($target)
+    {
+        return $this->getAclManager()->checkAssignmentPermission($this->getUser(), $target);
+    }
 }

@@ -42,6 +42,8 @@ class Base implements Injectable
        'aclManager'
    );

+    protected $scope;
+
    protected $injections = array();

    public function inject($name, $object)
@@ -49,9 +51,10 @@ class Base implements Injectable
        $this->injections[$name] = $object;
    }

-    public function __construct()
+    public function __construct($scope)
    {
        $this->init();
+        $this->scope = $scope;
    }

    protected function init()
@@ -63,6 +66,13 @@ class Base implements Injectable
        return $this->injections[$name];
    }

+    protected function addDependencyList(array $list)
+    {
+        foreach ($list as $item) {
+            $this->addDependency($item);
+        }
+    }
+
    protected function addDependency($name)
    {
        $this->dependencies[] = $name;
@@ -90,27 +100,34 @@ class Base implements Injectable

    public function checkReadOnlyTeam(User $user, $data)
    {
-        if (empty($data) || !is_array($data) || !isset($data['read'])) {
+        if (empty($data) || !is_object($data) || !isset($data->read)) {
            return false;
        }
-        return $data['read'] === 'team';
+        return $data->read === 'team';
    }

    public function checkReadOnlyOwn(User $user, $data)
    {
-        if (empty($data) || !is_array($data) || !isset($data['read'])) {
+        if (empty($data) || !is_object($data) || !isset($data->read)) {
            return false;
        }
-        return $data['read'] === 'own';
+        return $data->read === 'own';
    }

    public function checkEntity(User $user, Entity $entity, $data, $action)
    {
-        return $this->checkScope($user, $data, $entity->getEntityType(), $action, null, null, $entity);
+        if ($user->isAdmin()) {
+            return true;
+        }
+        return $this->checkScope($user, $data, $action, $entity);
    }

-    public function checkScope(User $user, $data, $scope, $action = null, $isOwner = null, $inTeam = null, Entity $entity = null)
+    public function checkScope(User $user, $data, $action = null, Entity $entity = null, $entityAccessData = array())
    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
        if (is_null($data)) {
            return false;
        }
@@ -120,83 +137,103 @@ class Base implements Injectable
        if ($data === true) {
            return true;
        }
+        if (is_string($data)) {
+            return true;
+        }

-        if (!is_null($action)) {
-            if (array_key_exists($action, $data)) {
-                $value = $data[$action];
+        $isOwner = null;
+        if (isset($entityAccessData['isOwner'])) {
+            $isOwner = $entityAccessData['isOwner'];
+        }
+        $inTeam = null;
+        if (isset($entityAccessData['inTeam'])) {
+            $inTeam = $entityAccessData['inTeam'];
+        }

-                if ($value === 'all' || $value === true) {
-                    return true;
-                }
+        if (is_null($action)) {
+            return true;
+        }

-                if (!$value || $value === 'no') {
-                    return false;
-                }
+        if (!isset($data->$action)) {
+            return false;
+        }

-                if (is_null($isOwner)) {
-                    if ($entity) {
-                        $isOwner = $this->checkIsOwner($user, $entity);
-                    } else {
-                        return true;
-                    }
-                }
+        $value = $data->$action;

-                if ($isOwner) {
-                    if ($value === 'own' || $value === 'team') {
-                        return true;
-                    }
-                }
-                if (is_null($inTeam) && $entity) {
-                    $inTeam = $this->checkInTeam($user, $entity);
-                }
+        if ($value === 'all' || $value === 'yes' || $value === true) {
+            return true;
+        }

-                if ($inTeam) {
-                    if ($value === 'team') {
-                        return true;
-                    }
-                }
-                return false;
+        if (!$value || $value === 'no') {
+            return false;
+        }
+
+        if (is_null($isOwner)) {
+            if ($entity) {
+                $isOwner = $this->checkIsOwner($user, $entity);
+            } else {
+                return true;
            }
        }
-        return true;
+
+        if ($isOwner) {
+            if ($value === 'own' || $value === 'team') {
+                return true;
+            }
+        }
+        if (is_null($inTeam) && $entity) {
+            $inTeam = $this->checkInTeam($user, $entity);
+        }
+
+        if ($inTeam) {
+            if ($value === 'team') {
+                return true;
+            }
+        }
+        return false;
    }

    public function checkIsOwner(User $user, Entity $entity)
    {
-        if ($entity->has('assignedUserId')) {
-            if ($user->id === $entity->get('assignedUserId')) {
-                return true;
+        if ($entity->hasAttribute('assignedUserId')) {
+            if ($entity->has('assignedUserId')) {
+                if ($user->id === $entity->get('assignedUserId')) {
+                    return true;
+                }
            }
-        } else {
+        } else if ($entity->hasAttribute('createdById')) {
            if ($entity->has('createdById')) {
                if ($user->id === $entity->get('createdById')) {
                    return true;
                }
            }
        }
+
+        if ($entity->hasAttribute('assignedUsersIds') && $entity->hasRelation('assignedUsers')) {
+            if ($entity->hasLinkMultipleId('assignedUsers', $user->id)) {
+                return true;
+            }
+        }
+
        return false;
    }

    public function checkInTeam(User $user, Entity $entity)
    {
-        $userTeamIds = $user->get('teamsIds');
+        $userTeamIdList = $user->getLinkMultipleIdList('teams');

-        if (!$entity->hasRelation('teams') || !$entity->hasField('teamsIds')) {
+        if (!$entity->hasRelation('teams') || !$entity->hasAttribute('teamsIds')) {
            return false;
        }

-        if (!$entity->has('teamsIds')) {
-            $entity->loadLinkMultipleField('teams');
-        }
+        $entityTeamIdList = $entity->getLinkMultipleIdList('teams');

-        $teamIds = $entity->get('teamsIds');
-
-        if (empty($teamIds)) {
+        if (empty($entityTeamIdList)) {
            return false;
        }

-        foreach ($userTeamIds as $id) {
-            if (in_array($id, $teamIds)) {
+        foreach ($userTeamIdList as $id) {
+            if (in_array($id, $entityTeamIdList)) {
                return true;
            }
        }
@@ -205,27 +242,32 @@ class Base implements Injectable

    public function checkEntityDelete(User $user, Entity $entity, $data)
    {
-        $result = $this->checkEntity($user, $entity, $data, 'delete');
-        if (!$result) {
-            if (is_array($data)) {
-                if ($data['edit'] != 'no') {
-                    if ($entity->has('createdById') && $entity->get('createdById') == $user->id) {
-                        if (!$entity->has('assignedUserId')) {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if ($this->checkEntity($user, $entity, $data, 'delete')) {
+            return true;
+        }
+
+        if (is_object($data)) {
+            if ($data->edit !== 'no' || $data->create !== 'no') {
+                if ($entity->has('createdById') && $entity->get('createdById') == $user->id) {
+                    if (!$entity->has('assignedUserId')) {
+                        return true;
+                    } else {
+                        if (!$entity->get('assignedUserId')) {
+                            return true;
+                        }
+                        if ($entity->get('assignedUserId') == $entity->get('createdById')) {
                            return true;
-                        } else {
-                            if (!$entity->get('assignedUserId')) {
-                                return true;
-                            }
-                            if ($entity->get('assignedUserId') == $entity->get('createdById')) {
-                                return true;
-                            }
                        }
                    }
                }
            }
        }

-        return $result;
+        return false;
    }
 }

@@ -32,54 +32,114 @@ namespace Espo\Core\Acl;
 use \Espo\Core\Exceptions\Error;

 use \Espo\ORM\Entity;
+use \Espo\Entities\User;
+
+use \Espo\Core\Utils\Config;
+use \Espo\Core\Utils\Metadata;
+use \Espo\Core\Utils\FieldManager;
+use \Espo\Core\Utils\File\Manager as FileManager;

 class Table
 {
-    private $data = array(
-        'table' => array()
+    protected $type = 'acl';
+
+    protected $defaultAclType = 'recordAllTeamOwnNo';
+
+    private $data = null;
+
+    protected $cacheFilePath;
+
+    protected $actionList = ['read', 'stream', 'edit', 'delete', 'create'];
+
+    protected $booleanActionList = ['create'];
+
+    protected $levelList = ['yes', 'all', 'team', 'own', 'no'];
+
+    protected $fieldActionList = ['read', 'edit'];
+
+    protected $fieldLevelList = ['yes', 'no'];
+
+    protected $valuePermissionList = ['assignmentPermission', 'userPermission', 'portalPermission'];
+
+    protected $valuePrtmissionHighestLevels = array(
+        'assignmentPermission' => 'all',
+        'userPermission' => 'all',
+        'portalPermission' => 'yes'
    );

-    private $cacheFile;
+    private $fileManager;

-    private $actionList = ['read', 'edit', 'delete'];
+    private $metadata;

-    private $levelList = ['all', 'team', 'own', 'no'];
+    private $fieldManager;

-    protected $fileManager;
+    protected $forbiddenAttributesCache = array();

-    protected $metadata;
+    protected $forbiddenFieldsCache = array();

-    public function __construct(\Espo\Entities\User $user, $config = null, $fileManager = null, $metadata = null)
+    public function __construct(User $user, Config $config = null, FileManager $fileManager = null, Metadata $metadata = null, FieldManager $fieldManager = null)
    {
+        $this->data = (object) [
+            'table' => (object) [],
+            'fieldTable' => (object) [],
+            'fieldTableQuickAccess' => (object) [],
+        ];
+
        $this->user = $user;

        $this->metadata = $metadata;

-        if (!$this->user->isFetched()) {
-            throw new Error();
+        if ($fieldManager) {
+            $this->fieldManager = $fieldManager;
        }

-        $this->user->loadLinkMultipleField('teams');
+        if (!$this->user->isFetched()) {
+            throw new Error('User must be fetched before ACL check.');
+        }

        if ($fileManager) {
            $this->fileManager = $fileManager;
        }
+        $this->valuePermissionList = $this->metadata->get('app.' . $this->type . '.defs.valuePermissionList', $this->valuePermissionList);

-        $this->cacheFile = 'data/cache/application/acl/' . $user->id . '.php';
+        $this->initCacheFilePath();

-        if ($config && $config->get('useCache') && file_exists($this->cacheFile)) {
-            $cached = include $this->cacheFile;
+        if ($config && $config->get('useCache') && file_exists($this->cacheFilePath)) {
+            $cached = include $this->cacheFilePath;
            $this->data = $cached;
-            $this->initSolid();
        } else {
            $this->load();
-            $this->initSolid();
            if ($config && $fileManager && $config->get('useCache')) {
                $this->buildCache();
            }
        }
    }

+    protected function initCacheFilePath()
+    {
+        $this->cacheFilePath = 'data/cache/application/acl/' . $this->getUser()->id . '.php';
+    }
+
+    protected function getUser()
+    {
+        return $this->user;
+    }
+
+    protected function getMetadata()
+    {
+        return $this->metadata;
+    }
+
+    protected function getFieldManager()
+    {
+        return $this->fieldManager;
+    }
+
+    protected function getConfig()
+    {
+        return $this->config;
+    }
+
    public function getMap()
    {
        return $this->data;
@@ -87,8 +147,8 @@ class Table

    public function getScopeData($scope)
    {
-        if (array_key_exists($scope, $this->data['table'])) {
-            $data = $this->data['table'][$scope];
+        if (isset($this->data->table->$scope)) {
+            $data = $this->data->table->$scope;
            if (is_string($data)) {
                $data = $this->getScopeData($data);
                return $data;
@@ -104,66 +164,392 @@ class Table
            return null;
        }

-        if (array_key_exists($permission, $this->data)) {
-            return $this->data[$permission];
+        if (isset($this->data->$permission)) {
+            return $this->data->$permission;
        }
        return null;
    }

    public function getLevel($scope, $action)
    {
-        if (array_key_exists($scope, $this->data['table'])) {
-            if (array_key_exists($action, $this->data['table'][$scope])) {
-                return $this->data['table'][$scope][$action];
+        if (isset($this->data->table->$scope)) {
+            if (isset($this->data->table->$scope->$action)) {
+                return $this->data->table->$scope->$action;
            }
        }
-        return false;
+        return 'no';
    }

    private function load()
    {
-        $aclTables = [];
-        $assignmentPermissionList = [];
-        $userPermissionList = [];
-
-        $userRoles = $this->user->get('roles');
-
-        foreach ($userRoles as $role) {
-            $aclTables[] = $role->get('data');
-            $assignmentPermissionList[] = $role->get('assignmentPermission');
-            $userPermissionList[] = $role->get('userPermission');
+        $valuePermissionLists = (object)[];
+        foreach ($this->valuePermissionList as $permission) {
+            $valuePermissionLists->$permission = [];
        }

-        $teams = $this->user->get('teams');
-        foreach ($teams as $team) {
-            $teamRoles = $team->get('roles');
-            foreach ($teamRoles as $role) {
-                $aclTables[] = $role->get('data');
-                $assignmentPermissionList[] = $role->get('assignmentPermission');
-                $userPermissionList[] = $role->get('userPermission');
+        $aclTableList = [];
+        $fieldTableList = [];
+
+        if (!$this->getUser()->isAdmin()) {
+            $roleList = $this->getRoleList();
+
+            foreach ($roleList as $role) {
+                $aclTableList[] = $role->get('data');
+                $fieldTableList[] = $role->get('fieldData');
+                foreach ($this->valuePermissionList as $permission) {
+                    $valuePermissionLists->{$permission}[] = $role->get($permission);
+                }
+            }
+
+            $aclTable = $this->mergeTableList($aclTableList);
+            $fieldTable = $this->mergeFieldTableList($fieldTableList);
+
+            $this->applyDefault($aclTable, $fieldTable);
+            $this->applyDisabled($aclTable, $fieldTable);
+            $this->applyMandatory($aclTable, $fieldTable);
+            $this->applyAdditional($aclTable, $fieldTable, $valuePermissionLists);
+        } else {
+            $aclTable = (object) [];
+            foreach ($this->getScopeList() as $scope) {
+                if ($this->metadata->get("scopes.{$scope}.{$this->type}") === 'boolean') {
+                    $aclTable->$scope = true;
+                } else {
+                    if ($this->metadata->get("scopes.{$scope}.entity")) {
+                        $aclTable->$scope = (object) [];
+                        foreach ($this->actionList as $action) {
+                            $aclTable->$scope->$action = 'all';
+                            if (in_array($action, $this->booleanActionList)) {
+                                $aclTable->$scope->$action = 'yes';
+                            }
+                        }
+                    }
+                }
+            }
+            $fieldTable = (object) [];
+        }
+
+        foreach ($aclTable as $scope => $data) {
+            if (is_string($data)) {
+                if (isset($aclTable->$data)) {
+                    $aclTable->$scope = $aclTable->$data;
+                }
            }
        }

-        $this->data['table'] = $this->merge($aclTables);
+        $this->data->table = $aclTable;
+        $this->data->fieldTable = $fieldTable;

-        $this->data['assignmentPermission'] = $this->mergeValues($assignmentPermissionList, $this->metadata->get('app.acl.valueDefaults.assignmentPermission', 'all'));
-        $this->data['userPermission'] = $this->mergeValues($userPermissionList, $this->metadata->get('app.acl.valueDefaults.userPermission', 'no'));
+        $this->fillFieldTableQuickAccess();
+
+        if (!$this->getUser()->isAdmin()) {
+            foreach ($this->valuePermissionList as $permission) {
+                $this->data->$permission = $this->mergeValueList($valuePermissionLists->$permission, $this->metadata->get('app.'.$this->type.'.default.' . $permission, 'yes'));
+                if ($this->metadata->get('app.'.$this->type.'.mandatory.' . $permission)) {
+                    $this->data->$permission = $this->metadata->get('app.'.$this->type.'.mandatory.' . $permission);
+                }
+            }
+
+        } else {
+            foreach ($this->valuePermissionList as $permission) {
+                if (isset($this->valuePrtmissionHighestLevels[$permission])) {
+                    $this->data->$permission = $this->valuePrtmissionHighestLevels[$permission];
+                    continue;
+                }
+                $this->data->$permission = 'all';
+            }
+        }
    }

-    private function initSolid()
+    protected function getRoleList()
    {
-        if (!$this->metadata) {
+        $roleList = [];
+
+        $userRoleList = $this->getUser()->get('roles');
+        if (!(is_array($userRoleList) || $userRoleList instanceof \Traversable)) {
+            throw new Error();
+        }
+        foreach ($userRoleList as $role) {
+            $roleList[] = $role;
+        }
+
+        $teamList = $this->getUser()->get('teams');
+        if (!(is_array($teamList) || $teamList instanceof \Traversable)) {
+            throw new Error();
+        }
+        foreach ($teamList as $team) {
+            $teamRoleList = $team->get('roles');
+            foreach ($teamRoleList as $role) {
+                $roleList[] = $role;
+            }
+        }
+
+        return $roleList;
+    }
+
+    public function getScopeForbiddenAttributeList($scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        $key = $scope . '_'. $action . '_' . $thresholdLevel;
+        if (isset($this->forbiddenAttributesCache[$key])) {
+            return $this->forbiddenAttributesCache[$key];
+        }
+
+        $fieldTableQuickAccess = $this->data->fieldTableQuickAccess;
+
+        if (!isset($fieldTableQuickAccess->$scope) || !isset($fieldTableQuickAccess->$scope->attributes) || !isset($fieldTableQuickAccess->$scope->attributes->$action)) {
+            $this->forbiddenAttributesCache[$key] = [];
+            return [];
+        }
+
+        $levelList = [];
+        foreach ($this->fieldLevelList as $level) {
+            if (array_search($level, $this->fieldLevelList) >= array_search($thresholdLevel, $this->fieldLevelList)) {
+                $levelList[] = $level;
+            }
+        }
+
+        $attributeList = [];
+
+        foreach ($levelList as $level) {
+            if (!isset($fieldTableQuickAccess->$scope->attributes->$action->$level)) continue;
+            foreach ($fieldTableQuickAccess->$scope->attributes->$action->$level as $attribute) {
+                if (in_array($attribute, $attributeList)) continue;
+                $attributeList[] = $attribute;
+            }
+        }
+
+        $this->forbiddenAttributesCache[$key] = $attributeList;
+
+        return $attributeList;
+    }
+
+    public function getScopeForbiddenFieldList($scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        $key = $scope . '_'. $action . '_' . $thresholdLevel;
+        if (isset($this->forbiddenFieldsCache[$key])) {
+            return $this->forbiddenFieldsCache[$key];
+        }
+
+        $fieldTableQuickAccess = $this->data->fieldTableQuickAccess;
+
+        if (!isset($fieldTableQuickAccess->$scope) || !isset($fieldTableQuickAccess->$scope->fields) || !isset($fieldTableQuickAccess->$scope->fields->$action)) {
+            $this->forbiddenFieldsCache[$key] = [];
+            return [];
+        }
+
+        $levelList = [];
+        foreach ($this->fieldLevelList as $level) {
+            if (array_search($level, $this->fieldLevelList) >= array_search($thresholdLevel, $this->fieldLevelList)) {
+                $levelList[] = $level;
+            }
+        }
+
+        $fieldList = [];
+
+        foreach ($levelList as $level) {
+            if (!isset($fieldTableQuickAccess->$scope->fields->$action->$level)) continue;
+            foreach ($fieldTableQuickAccess->$scope->fields->$action->$level as $field) {
+                if (in_array($field, $fieldList)) continue;
+                $fieldList[] = $field;
+            }
+        }
+
+        $this->forbiddenFieldsCache[$key] = $fieldList;
+
+        return $fieldList;
+    }
+
+    protected function fillFieldTableQuickAccess()
+    {
+        $fieldTable = $this->data->fieldTable;
+
+        $fieldTableQuickAccess = (object) [];
+
+        foreach (get_object_vars($fieldTable) as $scope => $scopeData) {
+            $fieldTableQuickAccess->$scope = (object) [
+                'attributes' => (object) [],
+                'fields' => (object) []
+            ];
+
+            foreach ($this->fieldActionList as $action) {
+                $fieldTableQuickAccess->$scope->attributes->$action = (object) [];
+                $fieldTableQuickAccess->$scope->fields->$action = (object) [];
+                foreach ($this->fieldLevelList as $level) {
+                    $fieldTableQuickAccess->$scope->attributes->$action->$level = [];
+                    $fieldTableQuickAccess->$scope->fields->$action->$level = [];
+                }
+            }
+
+            foreach (get_object_vars($scopeData) as $field => $fieldData) {
+                $attributeList = $this->getFieldManager()->getAttributeList($scope, $field);
+
+                foreach ($this->fieldActionList as $action) {
+                    if (!isset($fieldData->$action)) continue;
+                    foreach ($this->fieldLevelList as $level) {
+                        if ($fieldData->$action === $level) {
+                            $fieldTableQuickAccess->$scope->fields->$action->{$level}[] = $field;
+                            foreach ($attributeList as $attribute) {
+                                $fieldTableQuickAccess->$scope->attributes->$action->{$level}[] = $attribute;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        $this->data->fieldTableQuickAccess = $fieldTableQuickAccess;
+    }
+
+    protected function applyDefault(&$table, &$fieldTable)
+    {
+        if ($this->getUser()->isAdmin()) {
            return;
        }

-        $data = $this->metadata->get('app.acl.solid', array());
+        $data = $this->metadata->get('app.'.$this->type.'.default.scopeLevel', array());

-        foreach ($data as $entityType => $item) {
-            $this->data['table'][$entityType] = $item;
+        foreach ($data as $scope => $item) {
+            if (isset($table->$scope)) continue;
+            $value = $item;
+            if (is_array($item)) {
+                $value = (object) $item;
+            }
+            $table->$scope = $value;
+        }
+
+        $defaultFieldData = $this->metadata->get('app.'.$this->type.'.default.fieldLevel', array());
+
+        foreach ($this->getScopeList() as $scope) {
+            if (isset($table->$scope) && $table->$scope === false) continue;
+            if (!$this->getMetadata()->get('scopes.' . $scope . '.entity')) continue;
+
+            $fieldList = array_keys($this->getMetadata()->get("entityDefs.{$scope}.fields", []));
+
+            $defaultScopeFieldData = $this->metadata->get('app.'.$this->type.'.default.scopeFieldLevel.' . $scope, array());
+
+            foreach (array_merge($defaultFieldData, $defaultScopeFieldData) as $field => $f) {
+                if (!in_array($field, $fieldList)) continue;
+                if (!isset($fieldTable->$scope)) {
+                    $fieldTable->$scope = (object) [];
+                }
+                if (isset($fieldTable->$scope->$field)) continue;
+                $fieldTable->$scope->$field = (object) [];
+                foreach ($this->fieldActionList as $action) {
+                    $level = 'no';
+                    if ($f === true) {
+                        $level = 'yes';
+                    } else {
+                        if (is_array($f) && isset($f[$action])) {
+                            $level = $f[$action];
+                        }
+                    }
+                    $fieldTable->$scope->$field->$action = $level;
+                }
+            }
+        }
+
+        foreach ($this->getScopeWithAclList() as $scope) {
+            if (!isset($table->$scope)) {
+                $aclType = $this->metadata->get('scopes.' . $scope . '.' . $this->type);
+                if ($aclType === true) {
+                    $aclType = $this->defaultAclType;
+                }
+                if (!empty($aclType)) {
+                    $defaultValue = $this->metadata->get('app.'.$this->type.'.scopeLevelTypesDefaults.' . $aclType, $this->metadata->get('app.'.$this->type.'.scopeLevelTypesDefaults.record'));
+                    if (is_array($defaultValue)) {
+                        $defaultValue = (object) $defaultValue;
+                    }
+                    $table->$scope = $defaultValue;
+
+                    if (is_object($table->$scope)) {
+                        $actionList = $this->getMetadata()->get(['scopes', $scope, $this->type . 'ActionList']);
+                        if ($actionList) {
+                            foreach (get_object_vars($table->$scope) as $action => $level) {
+                                if (!in_array($action, $actionList)) {
+                                    unset($table->$scope->$action);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
        }
    }

-    private function mergeValues(array $list, $defaultValue)
+    protected function applyMandatory(&$table, &$fieldTable)
+    {
+        if ($this->getUser()->isAdmin()) {
+            return;
+        }
+
+        $data = $this->metadata->get('app.'.$this->type.'.mandatory.scopeLevel', array());
+
+        foreach ($data as $scope => $item) {
+            $value = $item;
+            if (is_array($item)) {
+                $value = (object) $item;
+            }
+            $table->$scope = $value;
+        }
+
+        $mandatoryFieldData = $this->metadata->get('app.'.$this->type.'.mandatory.fieldLevel', array());
+
+        foreach ($this->getScopeList() as $scope) {
+            if (isset($table->$scope) && $table->$scope === false) continue;
+            if (!$this->getMetadata()->get('scopes.' . $scope . '.entity')) continue;
+
+            $fieldList = array_keys($this->getMetadata()->get("entityDefs.{$scope}.fields", []));
+
+            $mandatoryScopeFieldData = $this->metadata->get('app.'.$this->type.'.mandatory.scopeFieldLevel.' . $scope, array());
+
+            foreach (array_merge($mandatoryFieldData, $mandatoryScopeFieldData) as $field => $f) {
+                if (!in_array($field, $fieldList)) continue;
+                if (!isset($fieldTable->$scope)) {
+                    $fieldTable->$scope = (object) [];
+                }
+                $fieldTable->$scope->$field = (object) [];
+                foreach ($this->fieldActionList as $action) {
+                    $level = 'no';
+                    if ($f === true) {
+                        $level = 'yes';
+                    } else {
+                        if (is_array($f) && isset($f[$action])) {
+                            $level = $f[$action];
+                        }
+                    }
+                    $fieldTable->$scope->$field->$action = $level;
+                }
+            }
+        }
+    }
+
+    protected function applyDisabled(&$table, &$fieldTable)
+    {
+        if ($this->getUser()->isAdmin()) {
+            return;
+        }
+
+        foreach ($this->getScopeList() as $scope) {
+            if ($this->getMetadata()->get('scopes.' . $scope . '.disabled')) {
+                $table->$scope = false;
+                unset($fieldTable->$scope);
+            }
+        }
+    }
+
+    protected function applyAdditional(&$table, &$fieldTable, &$valuePermissionLists)
+    {
+        if ($this->getUser()->get('isPortalUser')) {
+            foreach ($this->getScopeList() as $scope) {
+                $table->$scope = false;
+                unset($fieldTable->$scope);
+            }
+            foreach ($this->valuePermissionList as $permission) {
+                $valuePermissionLists->{$permission}[] = 'no';
+            }
+        }
+    }
+
+    private function mergeValueList(array $list, $defaultValue)
    {
        $result = null;
        foreach ($list as $level) {
@@ -183,51 +569,76 @@ class Table
        return $result;
    }

-    private function getScopeList()
+    protected function getScopeWithAclList()
    {
        $scopeList = [];
        $scopes = $this->metadata->get('scopes');
        foreach ($scopes as $scope => $d) {
-        	if (!empty($d['acl'])) {
-        		$scopeList[] = $scope;
-        	}
+        	if (empty($d['acl'])) continue;
+        	$scopeList[] = $scope;
        }
        return $scopeList;
    }

-    private function merge($tables)
+    protected function getScopeList()
    {
-        $data = array();
-        $scopeList = $this->getScopeList();
+        $scopeList = [];
+        $scopes = $this->metadata->get('scopes');
+        foreach ($scopes as $scope => $d) {
+            $scopeList[] = $scope;
+        }
+        return $scopeList;
+    }

-        foreach ($tables as $table) {
+    private function mergeTableList(array $tableList)
+    {
+        $data = (object) [];
+        $scopeList = $this->getScopeWithAclList();
+
+        foreach ($tableList as $table) {
            foreach ($scopeList as $scope) {
-            	if (!isset($table->$scope)) {
-            		continue;
-            	}
+            	if (!isset($table->$scope)) continue;
+
            	$row = $table->$scope;

                if ($row == false) {
-                    if (!isset($data[$scope])) {
-                        $data[$scope] = false;
+                    if (!isset($data->$scope)) {
+                        $data->$scope = false;
                    }
                } else if ($row === true) {
-                    $data[$scope] = true;
+                    $data->$scope = true;
                } else {
-                    if (!isset($data[$scope])) {
-                        $data[$scope] = array();
+                    if (!isset($data->$scope)) {
+                        $data->$scope = (object) [];
                    }
-                    if ($data[$scope] == false) {
-                        $data[$scope] = array();
+                    if ($data->$scope === false) {
+                        $data->$scope = (object) [];
                    }

-                    if (is_array($row) || $row instanceof \stdClass) {
-                        foreach ($row as $action => $level) {
-                            if (!isset($data[$scope][$action])) {
-                                $data[$scope][$action] = $level;
+                    if (!is_object($row)) continue;
+
+                    $actionList = $this->getMetadata()->get(['scopes', $scope, $this->type . 'ActionList'], $this->actionList);
+
+                    foreach ($actionList as $i => $action) {
+                        if (isset($row->$action)) {
+                            $level = $row->$action;
+                            if (!isset($data->$scope->$action)) {
+                                $data->$scope->$action = $level;
                            } else {
-                                if (array_search($data[$scope][$action], $this->levelList) > array_search($level, $this->levelList)) {
-                                    $data[$scope][$action] = $level;
+                                if (array_search($data->$scope->$action, $this->levelList) > array_search($level, $this->levelList)) {
+                                    $data->$scope->$action = $level;
+                                }
+                            }
+                        } else {
+                            if ($i > 0) {
+                                // TODO remove it
+                                $previousAction = $this->actionList[$i - 1];
+                                if (in_array($action, $this->booleanActionList)) {
+                                    $data->$scope->$action = 'yes';
+                                } else {
+                                    if ($action === 'stream' && isset($data->$scope->$previousAction)) {
+                                        $data->$scope->$action = $data->$scope->$previousAction;
+                                    }
                                }
                            }
                        }
@@ -236,24 +647,76 @@ class Table
            }
        }

-        foreach ($scopeList as $scope) {
-        	if (!array_key_exists($scope, $data)) {
-        		$aclType = $this->metadata->get('scopes.' . $scope . '.acl');
-                if ($aclType === true) {
-                    $aclType = 'recordAllTeamOwnNo';
+        return $data;
+    }
+
+    private function mergeFieldTableList(array $tableList)
+    {
+        $data = (object) [];
+        $scopeList = $this->getScopeWithAclList();
+
+        foreach ($tableList as $table) {
+            foreach ($scopeList as $scope) {
+                if (!isset($table->$scope)) continue;
+
+                if (!isset($data->$scope)) {
+                    $data->$scope = (object) [];
                }
-        		if (!empty($aclType)) {
-	        		$data[$scope] = $this->metadata->get('app.acl.defaults.' . $aclType, true);
-        		}
-        	}
+
+                if (!is_object($table->$scope)) continue;
+
+                $fieldList = array_keys($this->getMetadata()->get("entityDefs.{$scope}.fields", []));
+
+                foreach (get_object_vars($table->$scope) as $field => $row) {
+                    if (!is_object($row)) continue;
+
+                    if (!in_array($field, $fieldList)) continue;
+
+                    if (!isset($data->$scope->$field)) {
+                        $data->$scope->$field = (object) [];
+                    }
+
+                    foreach ($this->fieldActionList as $i => $action) {
+                        if (!isset($row->$action)) continue;
+
+                        $level = $row->$action;
+                        if (!isset($data->$scope->$field->$action)) {
+                            $data->$scope->$field->$action = $level;
+                        } else {
+                            if (array_search($data->$scope->$field->$action, $this->fieldLevelList) > array_search($level, $this->fieldLevelList)) {
+                                $data->$scope->$field->$action = $level;
+                            }
+                        }
+                    }
+                }
+            }
        }
+
        return $data;
    }

    private function buildCache()
    {
-        $contents = '<' . '?'. 'php return ' .  var_export($this->data, true)  . ';';
-        $this->fileManager->putContents($this->cacheFile, $contents);
+        $this->fileManager->putPhpContents($this->cacheFilePath, $this->data, true);
+        /*$contents = '<' . '?'. 'php return ' .  $this->varExport($this->data)  . ';';
+        $this->fileManager->putContents($this->cacheFilePath, $contents);*/
    }
+
+    /*private function varExport($variable)
+    {
+        if ($variable instanceof \StdClass) {
+            $result = '(object) ' . $this->varExport(get_object_vars($variable), true);
+        } else if (is_array($variable)) {
+            $array = array();
+            foreach ($variable as $key => $value) {
+                $array[] = var_export($key, true).' => ' . $this->varExport($value, true);
+            }
+            $result = '['.implode(', ', $array).']';
+        } else {
+            $result = var_export($variable, true);
+        }
+
+        return $result;
+    }*/
 }

@@ -45,6 +45,8 @@ class AclManager

    private $tableHashMap = array();

+    protected $tableClassName = '\\Espo\\Core\\Acl\\Table';
+
    public function __construct(Container $container)
    {
        $this->container = $container;
@@ -56,6 +58,11 @@ class AclManager
        return $this->container;
    }

+    protected function getMetadata()
+    {
+        return $this->metadata;
+    }
+
    public function getImplementation($scope)
    {
        if (empty($this->implementationHashMap[$scope])) {
@@ -75,10 +82,10 @@ class AclManager
            }

            if (class_exists($className)) {
-                $acl = new $className();
+                $acl = new $className($scope);
                $dependencies = $acl->getDependencyList();
                foreach ($dependencies as $name) {
-                    $acl->inject($name, $this->container->get($name));
+                    $acl->inject($name, $this->getContainer()->get($name));
                }
                $this->implementationHashMap[$scope] = $acl;
            } else {
@@ -91,14 +98,18 @@ class AclManager

    protected function getTable(User $user)
    {
-        $key = spl_object_hash($user);
+        $key = $user->id;
+        if (empty($key)) {
+            $key = spl_object_hash($user);
+        }

        if (empty($this->tableHashMap[$key])) {
            $config = $this->getContainer()->get('config');
            $fileManager = $this->getContainer()->get('fileManager');
            $metadata = $this->getContainer()->get('metadata');
+            $fieldManager = $this->getContainer()->get('fieldManager');

-            $this->tableHashMap[$key] = new \Espo\Core\Acl\Table($user, $config, $fileManager, $metadata);
+            $this->tableHashMap[$key] = new $this->tableClassName($user, $config, $fileManager, $metadata, $fieldManager);
        }

        return $this->tableHashMap[$key];
@@ -119,9 +130,6 @@ class AclManager

    public function get(User $user, $permission)
    {
-        if ($user->isAdmin()) {
-            return true;
-        }
        return $this->getTable($user)->get($permission);
    }

@@ -143,46 +151,48 @@ class AclManager
        return $this->getImplementation($scope)->checkReadOnlyOwn($user, $data);
    }

-    public function check(User $user, $subject, $action = null, $isOwner = null, $inTeam = null)
+    public function check(User $user, $subject, $action = null)
    {
-        if ($user->isAdmin()) {
-            return true;
-        }
        if (is_string($subject)) {
-            return $this->checkScope($user, $subject, $action, $isOwner, $inTeam);
+            return $this->checkScope($user, $subject, $action);
        } else {
            $entity = $subject;
            if ($entity instanceof Entity) {
-                $entityType = $entity->getEntityType();
-
-                $impl = $this->getImplementation($entityType);
-                $methodName = 'checkEntity' . ucfirst($action);
-                if (method_exists($impl, $methodName)) {
-                    $data = $this->getTable($user)->getScopeData($entityType);
-                    return $impl->$methodName($user, $entity, $data);
-                }
-
                return $this->checkEntity($user, $entity, $action);
            }
        }
    }

-    public function checkEntity(User $user, Entity $entity, $action)
+    public function checkEntity(User $user, Entity $entity, $action = 'read')
    {
-        if ($user->isAdmin()) {
-            return true;
+        $scope = $entity->getEntityType();
+
+        $data = $this->getTable($user)->getScopeData($scope);
+
+        $impl = $this->getImplementation($scope);
+
+        $methodName = 'checkEntity' . ucfirst($action);
+        if (method_exists($impl, $methodName)) {
+            return $impl->$methodName($user, $entity, $data);
        }
-        $data = $this->getTable($user)->getScopeData($entity->getEntityType());
-        return $this->getImplementation($entity->getEntityType())->checkEntity($user, $entity, $data, $action);
+
+        return $impl->checkEntity($user, $entity, $data, $action);
    }

-    public function checkScope(User $user, $scope, $action = null, $isOwner = null, $inTeam = null, $entity = null)
+    public function checkIsOwner(User $user, Entity $entity)
+    {
+        return $this->getImplementation($entity->getEntityType())->checkIsOwner($user, $entity);
+    }
+
+    public function checkInTeam(User $user, Entity $entity)
+    {
+        return $this->getImplementation($entity->getEntityType())->checkInTeam($user, $entity);
+    }
+
+    public function checkScope(User $user, $scope, $action = null)
    {
-        if ($user->isAdmin()) {
-            return true;
-        }
        $data = $this->getTable($user)->getScopeData($scope);
-        return $this->getImplementation($scope)->checkScope($user, $data, $scope, $action, $isOwner, $inTeam, $entity);
+        return $this->getImplementation($scope)->checkScope($user, $data, $action);
    }

    public function checkUser(User $user, $permission, User $entity)
@@ -213,5 +223,52 @@ class AclManager
        }
        return true;
    }
+
+    public function getScopeForbiddenAttributeList(User $user, $scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        if ($user->isAdmin()) return [];
+        return $this->getTable($user)->getScopeForbiddenAttributeList($scope, $action, $thresholdLevel);
+    }
+
+    public function getScopeForbiddenFieldList(User $user, $scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        if ($user->isAdmin()) return [];
+        return $this->getTable($user)->getScopeForbiddenFieldList($scope, $action, $thresholdLevel);
+    }
+
+    public function checkUserPermission(User $user, $target, $permissionType = 'userPermission')
+    {
+        $permission = $this->get($user, $permissionType);
+
+        if (is_object($target)) {
+            $userId = $target->id;
+        } else {
+            $userId = $target;
+        }
+
+        if ($user->id === $userId) return true;
+
+        if ($permission === 'no') {
+            return false;
+        }
+
+        if ($permission === 'yes') {
+            return true;
+        }
+
+        if ($permission === 'team') {
+            $teamIdList = $user->getLinkMultipleIdList('teams');
+            if (!$this->getContainer()->get('entityManager')->getRepository('User')->checkBelongsToAnyOfTeams($userId, $teamIdList)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function checkAssignmentPermission(User $user, $target)
+    {
+        return $this->checkUserPermission($user, $target, 'assignmentPermission');
+    }
 }

@@ -0,0 +1,212 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\AclPortal;
+
+use \Espo\Entities\User;
+use \Espo\ORM\Entity;
+
+class Base extends \Espo\Core\Acl\Base
+{
+    public function checkScope(User $user, $data, $action = null, Entity $entity = null, $entityAccessData = array())
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if (is_null($data)) {
+            return false;
+        }
+        if ($data === false) {
+            return false;
+        }
+        if ($data === true) {
+            return true;
+        }
+        if (is_string($data)) {
+            return true;
+        }
+
+        $isOwner = null;
+        if (isset($entityAccessData['isOwner'])) {
+            $isOwner = $entityAccessData['isOwner'];
+        }
+        $inAccount = null;
+        if (isset($entityAccessData['inAccount'])) {
+            $inAccount = $entityAccessData['inAccount'];
+        }
+        $isOwnContact = null;
+        if (isset($entityAccessData['isOwnContact'])) {
+            $isOwnContact = $entityAccessData['isOwnContact'];
+        }
+
+        if (is_null($action)) {
+            return true;
+        }
+
+        if (!isset($data->$action)) {
+            return false;
+        }
+
+        $value = $data->$action;
+
+        if ($value === 'all' || $value === 'yes' || $value === true) {
+            return true;
+        }
+
+        if (!$value || $value === 'no') {
+            return false;
+        }
+
+        if (is_null($isOwner)) {
+            if ($entity) {
+                $isOwner = $this->checkIsOwner($user, $entity);
+            } else {
+                return true;
+            }
+        }
+
+        if ($isOwner) {
+            if ($value === 'own' || $value === 'account' || $value === 'contact') {
+                return true;
+            }
+        }
+
+        if ($value === 'account') {
+            if (is_null($inAccount) && $entity) {
+                $inAccount = $this->checkInAccount($user, $entity);
+            }
+            if ($inAccount) {
+                return true;
+            }
+        }
+
+        if ($value === 'contact') {
+            if (is_null($isOwnContact) && $entity) {
+                $isOwnContact = $this->checkIsOwnContact($user, $entity);
+            }
+            if ($isOwnContact) {
+                return true;
+            }
+        }
+
+        return false;
+
+    }
+
+    public function checkReadOnlyAccount(User $user, $data)
+    {
+        if (empty($data) || !is_object($data) || !isset($data->read)) {
+            return false;
+        }
+        return $data->read === 'account';
+    }
+
+    public function checkReadOnlyContact(User $user, $data)
+    {
+        if (empty($data) || !is_object($data) || !isset($data->read)) {
+            return false;
+        }
+        return $data->read === 'contact';
+    }
+
+    public function checkIsOwner(User $user, Entity $entity)
+    {
+        if ($entity->hasAttribute('createdById')) {
+            if ($entity->has('createdById')) {
+                if ($user->id === $entity->get('createdById')) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public function checkInAccount(User $user, Entity $entity)
+    {
+        $accountIdList = $user->getLinkMultipleIdList('accounts');
+        if (count($accountIdList)) {
+            if ($entity->hasAttribute('accountId')) {
+                if (in_array($entity->get('accountId'), $accountIdList)) {
+                    return true;
+                }
+            }
+
+            if ($entity->hasRelation('accounts')) {
+                $repository = $this->getEntityManager()->getRepository($entity->getEntityType());
+                foreach ($accountIdList as $accountId) {
+                    if ($repository->isRelated($entity, 'accounts', $accountId)) {
+                        return true;
+                    }
+                }
+            }
+
+            if ($entity->hasAttribute('parentId') && $entity->hasRelation('parent')) {
+                if ($entity->get('parentType') === 'Account') {
+                    if (in_array($entity->get('parentId'), $accountIdList)) {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public function checkIsOwnContact(User $user, Entity $entity)
+    {
+        $contactId = $user->get('contactId');
+        if ($contactId) {
+            if ($entity->hasAttribute('contactId')) {
+                if ($entity->get('contactId') === $contactId) {
+                    return true;
+                }
+            }
+
+            if ($entity->hasRelation('contacts')) {
+                $repository = $this->getEntityManager()->getRepository($entity->getEntityType());
+                if ($repository->isRelated($entity, 'contacts', $contactId)) {
+                    return true;
+                }
+            }
+
+            if ($entity->hasAttribute('parentId') && $entity->hasRelation('parent')) {
+                if ($entity->get('parentType') === 'Contact') {
+                    if ($entity->get('parentId') === $contactId) {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+}
+
@@ -0,0 +1,135 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\AclPortal;
+
+use \Espo\Core\Exceptions\Error;
+
+use \Espo\ORM\Entity;
+use \Espo\Entities\User;
+use \Espo\Entities\Portal;
+
+use \Espo\Core\Utils\Config;
+use \Espo\Core\Utils\Metadata;
+use \Espo\Core\Utils\FieldManager;
+use \Espo\Core\Utils\File\Manager as FileManager;
+
+class Table extends \Espo\Core\Acl\Table
+{
+    protected $type = 'aclPortal';
+
+    protected $portal;
+
+    protected $defaultAclType = 'recordAllOwnNo';
+
+    protected $levelList = ['yes', 'all', 'account', 'contact', 'own', 'no'];
+
+    protected $valuePermissionList = [];
+
+    public function __construct(User $user, Portal $portal, Config $config = null, FileManager $fileManager = null, Metadata $metadata = null, FieldManager $fieldManager = null)
+    {
+        if (empty($portal)) {
+            throw new Error("No portal was passed to AclPortal\\Table constructor.");
+        }
+        $this->portal = $portal;
+        parent::__construct($user, $config, $fileManager, $metadata, $fieldManager);
+    }
+
+    protected function getPortal()
+    {
+        return $this->portal;
+    }
+
+    protected function initCacheFilePath()
+    {
+        $this->cacheFilePath = 'data/cache/application/acl-portal/'.$this->getPortal()->id.'/' . $this->getUser()->id . '.php';
+    }
+
+    protected function getRoleList()
+    {
+        $roleList = [];
+
+        $userRoleList = $this->getUser()->get('portalRoles');
+        if (!(is_array($userRoleList) || $userRoleList instanceof \Traversable)) {
+            throw new Error();
+        }
+        foreach ($userRoleList as $role) {
+            $roleList[] = $role;
+        }
+
+        $portalRoleList = $this->getPortal()->get('portalRoles');
+        if (!(is_array($portalRoleList) || $portalRoleList instanceof \Traversable)) {
+            throw new Error();
+        }
+        foreach ($portalRoleList as $role) {
+            $roleList[] = $role;
+        }
+
+        return $roleList;
+    }
+
+    protected function getScopeWithAclList()
+    {
+        $scopeList = [];
+        $scopes = $this->getMetadata()->get('scopes');
+        foreach ($scopes as $scope => $d) {
+            if (empty($d['acl'])) continue;
+            if (empty($d['aclPortal'])) continue;
+            $scopeList[] = $scope;
+        }
+        return $scopeList;
+    }
+
+    protected function applyDefault(&$table, &$fieldTable)
+    {
+        parent::applyDefault($table, $fieldTable);
+
+        foreach ($this->getScopeList() as $scope) {
+            if (!isset($table->$scope)) {
+                $table->$scope = false;
+            }
+        }
+    }
+
+    protected function applyDisabled(&$table, &$fieldTable)
+    {
+        foreach ($this->getScopeList() as $scope) {
+            $d = $this->getMetadata()->get('scopes.' . $scope);
+            if (!empty($d['disabled']) || !empty($d['portalDisabled'])) {
+                $table->$scope = false;
+                unset($fieldTable->$scope);
+            }
+        }
+    }
+
+    protected function applyAdditional(&$table, &$fieldTable, &$valuePermissionLists)
+    {
+    }
+}
+
@@ -33,26 +33,28 @@ class Application
 {
    private $metadata;

-    private $container;
+    protected $container;

    private $slim;

    private $auth;

-    /**
-     * Constructor
-     */
    public function __construct()
    {
-        $this->container = new Container();
-
        date_default_timezone_set('UTC');

-        $GLOBALS['log'] = $this->container->get('log');
+        $this->initContainer();
+
+        $GLOBALS['log'] = $this->getContainer()->get('log');

        $this->initAutoloads();
    }

+    protected function initContainer()
+    {
+        $this->container = new Container();
+    }
+
    public function getSlim()
    {
        if (empty($this->slim)) {
@@ -69,12 +71,9 @@ class Application
        return $this->metadata;
    }

-    protected function getAuth()
+    protected function createAuth()
    {
-        if (empty($this->auth)) {
-            $this->auth = new \Espo\Core\Utils\Auth($this->container);
-        }
-        return $this->auth;
+        return new \Espo\Core\Utils\Auth($this->container);
    }

    public function getContainer()
@@ -91,19 +90,10 @@ class Application

    public function runClient()
    {
-        $config = $this->getContainer()->get('config');
-        $themeManager = $this->getContainer()->get('themeManager');
-
-        $html = file_get_contents('main.html');
-        $html = str_replace('{{cacheTimestamp}}', $config->get('cacheTimestamp', 0), $html);
-        $html = str_replace('{{useCache}}', $config->get('useCache') ? 'true' : 'false' , $html);
-        $html = str_replace('{{stylesheet}}', $themeManager->getStylesheet(), $html);
-        $html = str_replace('{{runScript}}', 'app.start();' , $html);
-        echo $html;
-        exit;
+        $this->getContainer()->get('clientManager')->display();
    }

-    public function runEntryPoint($entryPoint)
+    public function runEntryPoint($entryPoint, $data = array(), $final = false)
    {
        if (empty($entryPoint)) {
            throw new \Error();
@@ -112,18 +102,27 @@ class Application
        $slim = $this->getSlim();
        $container = $this->getContainer();

-        $slim->get('/', function() {});
-        $slim->post('/', function() {});
+        $slim->any('.*', function() {});

        $entryPointManager = new \Espo\Core\EntryPointManager($container);

        try {
-            $auth = $this->getAuth();
-            $apiAuth = new \Espo\Core\Utils\Api\Auth($auth, $entryPointManager->checkAuthRequired($entryPoint), true);
+            $authRequired = $entryPointManager->checkAuthRequired($entryPoint);
+            $authNotStrict = $entryPointManager->checkNotStrictAuth($entryPoint);
+            if ($authRequired && !$authNotStrict) {
+                if (!$final && $portalId = $this->detectedPortalId()) {
+                    $app = new \Espo\Core\Portal\Application($portalId);
+                    $app->setBasePath($this->getBasePath());
+                    $app->runEntryPoint($entryPoint, $data, true);
+                    exit;
+                }
+            }
+            $auth = new \Espo\Core\Utils\Auth($this->container, $authNotStrict);
+            $apiAuth = new \Espo\Core\Utils\Api\Auth($auth, $authRequired, true);
            $slim->add($apiAuth);

-            $slim->hook('slim.before.dispatch', function () use ($entryPoint, $entryPointManager, $container) {
-                $entryPointManager->run($entryPoint);
+            $slim->hook('slim.before.dispatch', function () use ($entryPoint, $entryPointManager, $container, $data) {
+                $entryPointManager->run($entryPoint, $data);
            });

            $slim->run();
@@ -134,7 +133,7 @@ class Application

    public function runCron()
    {
-        $auth = $this->getAuth();
+        $auth = $this->createAuth();
        $auth->useNoAuth(true);

        $cronManager = new \Espo\Core\CronManager($this->container);
@@ -164,20 +163,25 @@ class Application
        return false;
    }

+    protected function createApiAuth($auth)
+    {
+        return new \Espo\Core\Utils\Api\Auth($auth);
+    }
+
    protected function routeHooks()
    {
        $container = $this->getContainer();
        $slim = $this->getSlim();

        try {
-            $auth = $this->getAuth();
+            $auth = $this->createAuth();
        } catch (\Exception $e) {
            $container->get('output')->processError($e->getMessage(), $e->getCode());
        }

-        $apiAuth = new \Espo\Core\Utils\Api\Auth($auth);
-        $this->getSlim()->add($apiAuth);
+        $apiAuth = $this->createApiAuth($auth);

+        $this->getSlim()->add($apiAuth);
        $this->getSlim()->hook('slim.before.dispatch', function () use ($slim, $container) {

            $route = $slim->router()->getCurrentRoute();
@@ -218,7 +222,7 @@ class Application
            }

            try {
-                $controllerManager = new \Espo\Core\ControllerManager($container);
+                $controllerManager = $this->getContainer()->get('controllerManager');
                $result = $controllerManager->process($controllerName, $actionName, $params, $data, $slim->request());
                $container->get('output')->render($result);
            } catch (\Exception $e) {
@@ -237,13 +241,19 @@ class Application
        });
    }

-    protected function initRoutes()
+    protected function getRouteList()
    {
        $routes = new \Espo\Core\Utils\Route($this->getContainer()->get('config'), $this->getMetadata(), $this->getContainer()->get('fileManager'));
-        $crudList = array_keys( $this->getContainer()->get('config')->get('crud') );

-        foreach ($routes->getAll() as $route) {

+        return $routes->getAll();
+    }
+
+    protected function initRoutes()
+    {
+        $crudList = array_keys($this->getContainer()->get('config')->get('crud'));
+
+        foreach ($this->getRouteList() as $route) {
            $method = strtolower($route['method']);
            if (!in_array($method, $crudList)) {
                $GLOBALS['log']->error('Route: Method ['.$method.'] does not exist. Please check your route ['.$route['route'].']');
@@ -288,5 +298,37 @@ class Application

        $classLoader->register(true);
    }
+
+    public function setBasePath($basePath)
+    {
+        $this->getContainer()->get('clientManager')->setBasePath($basePath);
+    }
+
+    public function getBasePath()
+    {
+        return $this->getContainer()->get('clientManager')->getBasePath();
+    }
+
+    public function detectedPortalId()
+    {
+        if (!empty($_GET['portalId'])) {
+            return $_GET['portalId'];
+        }
+        if (!empty($_COOKIE['auth-token'])) {
+            $token = $this->getContainer()->get('entityManager')->getRepository('AuthToken')->where(array('token' => $_COOKIE['auth-token']))->findOne();
+
+            if ($token && $token->get('portalId')) {
+                return $token->get('portalId');
+            }
+        }
+        return null;
+    }
+
+    public function setupSystemUser()
+    {
+        $user = $this->getContainer()->get('entityManager')->getEntity('User', 'system');
+        $this->getContainer()->setUser($user);
+        $this->getContainer()->get('entityManager')->setUser($user);
+    }
 }

@@ -28,6 +28,7 @@
 ************************************************************************/

 namespace Espo\Core;
+
 class Container
 {

@@ -39,7 +40,6 @@ class Container
     */
    public function __construct()
    {
-
    }

    public function get($name)
@@ -47,7 +47,15 @@ class Container
        if (empty($this->data[$name])) {
            $this->load($name);
        }
-        return $this->data[$name];
+        if (isset($this->data[$name])) {
+            return $this->data[$name];
+        }
+        return null;
+    }
+
+    protected function set($name, $obj)
+    {
+        $this->data[$name] = $obj;
    }

    private function load($name)
@@ -115,53 +123,61 @@ class Container
        return $this;
    }

-    private function loadSlim()
+    protected function loadSlim()
    {
        return new \Espo\Core\Utils\Api\Slim();
    }

-    private function loadFileManager()
+    protected function loadFileManager()
    {
        return new \Espo\Core\Utils\File\Manager(
            $this->get('config')
        );
    }

-    private function loadPreferences()
+    protected function loadControllerManager()
+    {
+        return new \Espo\Core\ControllerManager(
+            $this
+        );
+    }
+
+    protected function loadPreferences()
    {
        return $this->get('entityManager')->getEntity('Preferences', $this->get('user')->id);
    }

-    private function loadConfig()
+    protected function loadConfig()
    {
        return new \Espo\Core\Utils\Config(
            new \Espo\Core\Utils\File\Manager()
        );
    }

-    private function loadHookManager()
+    protected function loadHookManager()
    {
        return new \Espo\Core\HookManager(
            $this
        );
    }

-    private function loadOutput()
+    protected function loadOutput()
    {
        return new \Espo\Core\Utils\Api\Output(
            $this->get('slim')
        );
    }

-    private function loadMailSender()
+    protected function loadMailSender()
    {
        $className = $this->getServiceClassName('mailSernder', '\\Espo\\Core\\Mail\\Sender');
        return new $className(
-            $this->get('config')
+            $this->get('config'),
+            $this->get('entityManager')
        );
    }

-    private function loadDateTime()
+    protected function loadDateTime()
    {
        return new \Espo\Core\Utils\DateTime(
            $this->get('config')->get('dateFormat'),
@@ -170,48 +186,51 @@ class Container
        );
    }

-    private function loadNumber()
+    protected function loadNumber()
    {
-        return new \Espo\Core\Utils\Number(
+        return new \Espo\Core\Utils\NumberUtil(
            $this->get('config')->get('decimalMark'),
            $this->get('config')->get('thousandSeparator')
        );
    }

-    private function loadServiceFactory()
+    protected function loadServiceFactory()
    {
        return new \Espo\Core\ServiceFactory(
            $this
        );
    }

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

-    private function loadMetadata()
+    protected function loadMetadata()
    {
        return new \Espo\Core\Utils\Metadata(
-            $this->get('config'),
-            $this->get('fileManager')
+            $this->get('fileManager'),
+            $this->get('config')->get('useCache')
        );
    }

-    private function loadLayout()
+    protected function loadLayout()
    {
        return new \Espo\Core\Utils\Layout(
            $this->get('fileManager'),
-            $this->get('metadata')
+            $this->get('metadata'),
+            $this->get('user')
        );
    }

-    private function loadAclManager()
+    protected function loadAclManager()
    {
        $className = $this->getServiceClassName('acl', '\\Espo\\Core\\AclManager');
        return new $className(
@@ -219,7 +238,7 @@ class Container
        );
    }

-    private function loadAcl()
+    protected function loadAcl()
    {
        $className = $this->getServiceClassName('acl', '\\Espo\\Core\\Acl');
        return new $className(
@@ -228,18 +247,28 @@ class Container
        );
    }

-    private function loadSchema()
+    protected function loadSchema()
    {
        return new \Espo\Core\Utils\Database\Schema\Schema(
            $this->get('config'),
            $this->get('metadata'),
            $this->get('fileManager'),
            $this->get('entityManager'),
-            $this->get('classParser')
+            $this->get('classParser'),
+            $this->get('ormMetadata')
        );
    }

-    private function loadClassParser()
+    protected function loadOrmMetadata()
+    {
+        return new \Espo\Core\Utils\Metadata\OrmMetadata(
+            $this->get('metadata'),
+            $this->get('fileManager'),
+            $this->get('config')->get('useCache')
+        );
+    }
+
+    protected function loadClassParser()
    {
        return new \Espo\Core\Utils\File\ClassParser(
            $this->get('fileManager'),
@@ -248,46 +277,57 @@ class Container
        );
    }

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

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

-    private function loadScheduledJob()
+    protected function loadScheduledJob()
    {
        return new \Espo\Core\Utils\ScheduledJob(
            $this
        );
    }

-    private function loadDataManager()
+    protected function loadDataManager()
    {
        return new \Espo\Core\DataManager(
            $this
        );
    }

-    private function loadFieldManager()
+    protected function loadFieldManager()
    {
        return new \Espo\Core\Utils\FieldManager(
            $this->get('metadata'),
-            $this->get('language')
+            $this->get('language'),
+            $this
        );
    }

-    private function loadThemeManager()
+    protected function loadThemeManager()
    {
        return new \Espo\Core\Utils\ThemeManager(
            $this->get('config'),
@@ -295,9 +335,17 @@ class Container
        );
    }

-    public function setUser($user)
+    protected function loadClientManager()
    {
-        $this->data['user'] = $user;
+        return new \Espo\Core\Utils\ClientManager(
+            $this->get('config'),
+            $this->get('themeManager')
+        );
+    }
+
+    public function setUser(\Espo\Entities\User $user)
+    {
+        $this->set('user', $user);
    }
 }

@@ -119,7 +119,7 @@ class ControllerManager
            $controller->$afterMethodName($params, $data, $request);
        }

-        if (is_array($result) || is_bool($result)) {
+        if (is_array($result) || is_bool($result) || $result instanceof \StdClass) {
            return \Espo\Core\Utils\Json::encode($result);
        }

@@ -64,7 +64,7 @@ class Record extends Base
        return $service;
    }

-    public function actionRead($params)
+    public function actionRead($params, $data, $request)
    {
        $id = $params['id'];
        $entity = $this->getRecordService()->getEntity($id);
@@ -87,7 +87,7 @@ class Record extends Base
            throw new BadRequest();
        }

-        if (!$this->getAcl()->check($this->name, 'edit')) {
+        if (!$this->getAcl()->check($this->name, 'create')) {
            throw new Forbidden();
        }

@@ -128,12 +128,10 @@ class Record extends Base
        $where = $request->get('where');
        $offset = $request->get('offset');
        $maxSize = $request->get('maxSize');
-        $asc = $request->get('asc') === 'true';
+        $asc = $request->get('asc', 'true') === 'true';
        $sortBy = $request->get('sortBy');
        $q = $request->get('q');
-        $primaryFilter = $request->get('primaryFilter');
        $textFilter = $request->get('textFilter');
-        $boolFilterList = $request->get('boolFilterList');

        if (empty($maxSize)) {
            $maxSize = self::MAX_SIZE_LIMIT;
@@ -151,12 +149,8 @@ class Record extends Base
            'q' => $q,
            'textFilter' => $textFilter
        );
-        if ($request->get('primaryFilter')) {
-            $params['primaryFilter'] = $request->get('primaryFilter');
-        }
-        if ($request->get('boolFilterList')) {
-            $params['boolFilterList'] = $request->get('boolFilterList');
-        }
+
+        $this->fetchListParamsFromRequest($params, $request, $data);

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

@@ -166,6 +160,16 @@ class Record extends Base
        );
    }

+    protected function fetchListParamsFromRequest(&$params, $request, $data)
+    {
+        if ($request->get('primaryFilter')) {
+            $params['primaryFilter'] = $request->get('primaryFilter');
+        }
+        if ($request->get('boolFilterList')) {
+            $params['boolFilterList'] = $request->get('boolFilterList');
+        }
+    }
+
    public function actionListLinked($params, $data, $request)
    {
        $id = $params['id'];
@@ -174,7 +178,7 @@ class Record extends Base
        $where = $request->get('where');
        $offset = $request->get('offset');
        $maxSize = $request->get('maxSize');
-        $asc = $request->get('asc') === 'true';
+        $asc = $request->get('asc', 'true') === 'true';
        $sortBy = $request->get('sortBy');
        $q = $request->get('q');
        $textFilter = $request->get('textFilter');
@@ -195,12 +199,8 @@ class Record extends Base
            'q' => $q,
            'textFilter' => $textFilter
        );
-        if ($request->get('primaryFilter')) {
-            $params['primaryFilter'] = $request->get('primaryFilter');
-        }
-        if ($request->get('boolFilterList')) {
-            $params['boolFilterList'] = $request->get('boolFilterList');
-        }
+
+        $this->fetchListParamsFromRequest($params, $request, $data);

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

@@ -226,6 +226,10 @@ class Record extends Base

    public function actionExport($params, $data, $request)
    {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+
        if ($this->getConfig()->get('exportDisabled') && !$this->getUser()->isAdmin()) {
            throw new Forbidden();
        }
@@ -234,17 +238,23 @@ class Record extends Base
            throw new Forbidden();
        }

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

        $params = array();
        if ($byWhere) {
+            $params['selectData'] = $selectData;
            $params['where'] = $where;
        } else {
            $params['ids'] = $ids;
        }

+        if (isset($data['attributeList'])) {
+            $params['attributeList'] = $data['attributeList'];
+        }
+
        return array(
            'id' => $this->getRecordService()->export($params)
        );
@@ -266,6 +276,9 @@ class Record extends Base
        $params = array();
        if (array_key_exists('where', $data) && !empty($data['byWhere'])) {
            $params['where'] = json_decode(json_encode($data['where']), true);
+            if (array_key_exists('selectData', $data)) {
+                $params['selectData'] = json_decode(json_encode($data['selectData']), true);
+            }
        } else if (array_key_exists('ids', $data)) {
            $params['ids'] = $data['ids'];
        }
@@ -290,9 +303,11 @@ class Record extends Base
        if (array_key_exists('where', $data) && !empty($data['byWhere'])) {
            $where = json_decode(json_encode($data['where']), true);
            $params['where'] = $where;
+            if (array_key_exists('selectData', $data)) {
+                $params['selectData'] = json_decode(json_encode($data['selectData']), true);
+            }
        }
        if (array_key_exists('ids', $data)) {
-            $where = json_decode(json_encode($data['where']), true);
            $params['ids'] = $data['ids'];
        }

@@ -319,20 +334,26 @@ class Record extends Base
                throw new BadRequest();
            }
            $where = json_decode(json_encode($data['where']), true);
-            return $this->getRecordService()->linkEntityMass($id, $link, $where);
+
+            $selectData = null;
+            if (isset($data['selectData']) && is_array($data['selectData'])) {
+                $selectData = json_decode(json_encode($data['selectData']), true);
+            }
+
+            return $this->getRecordService()->linkEntityMass($id, $link, $where, $selectData);
        } else {
-            $foreignIds = array();
+            $foreignIdList = array();
            if (isset($data['id'])) {
-                $foreignIds[] = $data['id'];
+                $foreignIdList[] = $data['id'];
            }
            if (isset($data['ids']) && is_array($data['ids'])) {
                foreach ($data['ids'] as $foreignId) {
-                    $foreignIds[] = $foreignId;
+                    $foreignIdList[] = $foreignId;
                }
            }

            $result = false;
-            foreach ($foreignIds as $foreignId) {
+            foreach ($foreignIdList as $foreignId) {
                if ($this->getRecordService()->linkEntity($id, $link, $foreignId)) {
                    $result = true;
                }
@@ -386,7 +407,7 @@ class Record extends Base
        if (!$request->isPut()) {
            throw new BadRequest();
        }
-        if (!$this->getAcl()->check($this->name, 'read')) {
+        if (!$this->getAcl()->check($this->name, 'stream')) {
            throw new Forbidden();
        }
        $id = $params['id'];
@@ -411,17 +432,34 @@ class Record extends Base
            throw new BadRequest();
        }

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

        if (!$this->getAcl()->check($this->name, 'edit')) {
            throw new Forbidden();
        }

-        return $this->getRecordService()->merge($targetId, $sourceIds);
+        return $this->getRecordService()->merge($targetId, $sourceIds, $attributes);
+    }
+
+    public function postActionGetDuplicateAttributes($params, $data, $request)
+    {
+        if (empty($data['id'])) {
+            throw new BadRequest();
+        }
+
+        if (!$this->getAcl()->check($this->name, 'create')) {
+            throw new Forbidden();
+        }
+        if (!$this->getAcl()->check($this->name, 'read')) {
+            throw new Forbidden();
+        }
+
+        return $this->getRecordService()->getDuplicateAttributes($data['id']);
    }
 }

@@ -37,7 +37,6 @@ use \Espo\Core\Utils\Util;

 class RecordTree extends Record
 {
-
    public static $defaultAction = 'list';

    protected $defaultRecordServiceName = 'RecordTree';
@@ -51,9 +50,11 @@ class RecordTree extends Record
        $where = $request->get('where');
        $parentId = $request->get('parentId');
        $maxDepth = $request->get('maxDepth');
+        $onlyNotEmpty = $request->get('onlyNotEmpty');

        $collection = $this->getRecordService()->getTree($parentId, array(
-            'where' => $where
+            'where' => $where,
+            'onlyNotEmpty' => $onlyNotEmpty
        ), 0, $maxDepth);
        return array(
            'list' => $collection->toArray(),
@@ -35,15 +35,21 @@ use Espo\Core\Exceptions\NotFound;
 class CronManager
 {
    private $container;
+
    private $config;
+
    private $fileManager;
+
    private $entityManager;

    private $scheduledJobUtil;

    const PENDING = 'Pending';
+
    const RUNNING = 'Running';
+
    const SUCCESS = 'Success';
+
    const FAILED = 'Failed';

    protected $lastRunTime = 'data/cache/application/cronLastRunTime.php';
@@ -149,19 +155,15 @@ class CronManager

        $this->setLastRunTime(time());

-        $entityManager = $this->getEntityManager();
-
-        $cronJob = $this->getCronJob();
-        $cronScheduledJob = $this->getCronScheduledJob();
-
-        //Check scheduled jobs and create related jobs
+        $this->getCronJob()->markFailedJobs();
+        $this->getCronJob()->updateFailedJobAttempts();
        $this->createJobsFromScheduledJobs();
+        $this->getCronJob()->removePendingJobDuplicates();

-        $pendingJobs = $cronJob->getPendingJobs();
+        $pendingJobList = $this->getCronJob()->getPendingJobList();

-        foreach ($pendingJobs as $job) {
-
-            $jobEntity = $entityManager->getEntity('Job', $job['id']);
+        foreach ($pendingJobList as $job) {
+            $jobEntity = $this->getEntityManager()->getEntity('Job', $job['id']);

            if (!isset($jobEntity)) {
                $GLOBALS['log']->error('CronManager: empty Job entity ['.$job['id'].'].');
@@ -169,7 +171,7 @@ class CronManager
            }

            $jobEntity->set('status', self::RUNNING);
-            $entityManager->saveEntity($jobEntity);
+            $this->getEntityManager()->saveEntity($jobEntity);

            $isSuccess = true;

@@ -187,11 +189,10 @@ class CronManager
            $status = $isSuccess ? self::SUCCESS : self::FAILED;

            $jobEntity->set('status', $status);
-            $entityManager->saveEntity($jobEntity);
+            $this->getEntityManager()->saveEntity($jobEntity);

-            //set status in the schedulerJobLog
            if (!empty($job['scheduled_job_id'])) {
-                $cronScheduledJob->addLogRecord($job['scheduled_job_id'], $status);
+                $this->getCronScheduledJob()->addLogRecord($job['scheduled_job_id'], $status, null, $job['target_id'], $job['target_type']);
            }
        }
    }
@@ -213,12 +214,20 @@ class CronManager
        }

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

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

    /**
@@ -248,7 +257,7 @@ class CronManager
            $data = Json::decode($data, true);
        }

-        $service->$serviceMethod($data);
+        $service->$serviceMethod($data, $job['target_id'], $job['target_type']);
    }

    /**
@@ -258,55 +267,62 @@ class CronManager
     */
    protected function createJobsFromScheduledJobs()
    {
-        $entityManager = $this->getEntityManager();
+        $activeScheduledJobList = $this->getCronScheduledJob()->getActiveScheduledJobList();

-        $activeScheduledJobs = $this->getCronScheduledJob()->getActiveJobs();
+        $runningScheduledJobIdList = $this->getCronJob()->getRunningScheduledJobIdList();

-        $cronJob = $this->getCronJob();
-        $runningScheduledJobs = $cronJob->getActiveJobs('scheduled_job_id', self::RUNNING, PDO::FETCH_COLUMN);
+        $createdJobIdList = array();
+        foreach ($activeScheduledJobList as $scheduledJob) {
+            $scheduling = $scheduledJob['scheduling'];

-        $createdJobs = array();
-        foreach ($activeScheduledJobs as $scheduledJob) {
-
-            if (in_array($scheduledJob['id'], $runningScheduledJobs)) {
+            try {
+                $cronExpression = \Cron\CronExpression::factory($scheduling);
+            } catch (\Exception $e) {
+                $GLOBALS['log']->error('CronManager (ScheduledJob ['.$scheduledJob['id'].']): Scheduling string error - '. $e->getMessage() . '.');
                continue;
            }

-            $scheduling = $scheduledJob['scheduling'];
-
-            $cronExpression = \Cron\CronExpression::factory($scheduling);
-
            try {
-                $prevDate = $cronExpression->getPreviousRunDate()->format('Y-m-d H:i:s');
+                $previousDate = $cronExpression->getPreviousRunDate()->format('Y-m-d H:i:s');
            } catch (\Exception $e) {
-                $GLOBALS['log']->error('CronManager: ScheduledJob ['.$scheduledJob['id'].']: CronExpression - Impossible CRON expression ['.$scheduling.']');
+                $GLOBALS['log']->error('CronManager (ScheduledJob ['.$scheduledJob['id'].']): Unsupported CRON expression ['.$scheduling.']');
                continue;
            }

            if ($cronExpression->isDue()) {
-                $prevDate = date('Y-m-d H:i:s');
+                $previousDate = date('Y-m-d H:i:s');
            }

-            $existsJob = $cronJob->getJobByScheduledJob($scheduledJob['id'], $prevDate);
+            $existingJob = $this->getCronJob()->getJobByScheduledJob($scheduledJob['id'], $previousDate);
+            if ($existingJob) continue;

-            if (!isset($existsJob) || empty($existsJob)) {
-                //create a new job
-                $jobEntity = $entityManager->getEntity('Job');
-                $jobEntity->set(array(
-                    'name' => $scheduledJob['name'],
-                    'status' => self::PENDING,
-                    'scheduledJobId' => $scheduledJob['id'],
-                    'executeTime' => $prevDate,
-                    'method' => $scheduledJob['job'],
-                ));
-                $jobEntityId = $entityManager->saveEntity($jobEntity);
-                if (!empty($jobEntityId)) {
-                    $createdJobs[] = $jobEntityId;
+            $className = $this->getScheduledJobUtil()->get($scheduledJob['job']);
+            if ($className) {
+                if (method_exists($className, 'prepare')) {
+                    $implementation = new $className($this->container);
+                    $implementation->prepare($scheduledJob, $previousDate);
+                    continue;
                }
            }
+
+            if (in_array($scheduledJob['id'], $runningScheduledJobIdList)) {
+                continue;
+            }
+
+            $jobEntity = $this->getEntityManager()->getEntity('Job');
+            $jobEntity->set(array(
+                'name' => $scheduledJob['name'],
+                'status' => self::PENDING,
+                'scheduledJobId' => $scheduledJob['id'],
+                'executeTime' => $previousDate,
+                'method' => $scheduledJob['job']
+            ));
+            $this->getEntityManager()->saveEntity($jobEntity);
+
+            $createdJobIdList[] = $jobEntity->id;
        }

-        return $createdJobs;
+        return $createdJobIdList;
    }
 }

@@ -28,6 +28,7 @@
 ************************************************************************/

 namespace Espo\Core;
+
 class DataManager
 {
    private $container;
@@ -113,11 +114,11 @@ class DataManager

        $metadata->init(true);

-        $ormMeta = $metadata->getOrmMetadata(true);
+        $ormData = $this->getContainer()->get('ormMetadata')->getData(true);

        $this->updateCacheTimestamp();

-        return empty($ormMeta) ? false : true;
+        return empty($ormData) ? false : true;
    }

    /**
@@ -81,7 +81,16 @@ class EntryPointManager
        return $className::$authRequired;
    }

-    public function run($name)
+    public function checkNotStrictAuth($name)
+    {
+        $className = $this->getClassName($name);
+        if (!$className) {
+            throw new NotFound();
+        }
+        return $className::$notStrictAuth;
+    }
+
+    public function run($name, $data = array())
    {
        $className = $this->getClassName($name);
        if (!$className) {
@@ -89,7 +98,7 @@ class EntryPointManager
        }
        $entryPoint = new $className($this->container);

-        $entryPoint->run();
+        $entryPoint->run($data);
    }

    protected function getClassName($name)
@@ -39,6 +39,8 @@ abstract class Base

    public static $authRequired = true;

+    public static $notStrictAuth = false;
+
    protected function getContainer()
    {
        return $this->container;
@@ -94,12 +96,15 @@ abstract class Base
        return $this->getContainer()->get('language');
    }

+    protected function getClientManager()
+    {
+        return $this->getContainer()->get('clientManager');
+    }
+
    public function __construct(Container $container)
    {
        $this->container = $container;
    }

-    abstract public function run();
-
 }

@@ -51,6 +51,8 @@ class HookManager
        'afterSave',
        'beforeRemove',
        'afterRemove',
+        'afterRelate',
+        'afterUnrelate'
    );

    protected $paths = array(
@@ -63,7 +65,6 @@ class HookManager
    public function __construct(Container $container)
    {
        $this->container = $container;
-        $this->loadHooks();
    }

    protected function getConfig()
@@ -85,24 +86,30 @@ class HookManager

        $metadata = $this->container->get('metadata');

-        $this->data = $this->getHookData($this->paths['corePath']);
+        $data = $this->getHookData($this->paths['customPath']);

        foreach ($metadata->getModuleList() as $moduleName) {
            $modulePath = str_replace('{*}', $moduleName, $this->paths['modulePath']);
-            $this->data = array_merge_recursive($this->data, $this->getHookData($modulePath));
+            $data = $this->getHookData($modulePath, $data);
        }

-        $this->data = array_merge_recursive($this->data, $this->getHookData($this->paths['customPath']));
+        $data = $this->getHookData($this->paths['corePath'], $data);
+
+        $this->data = $this->sortHooks($data);

        if ($this->getConfig()->get('useCache')) {
            $this->getFileManager()->putPhpContents($this->cacheFile, $this->data);
        }
    }

-    public function process($scope, $hookName, $injection = null, array $options = array())
+    public function process($scope, $hookName, $injection = null, array $options = array(), array $hookData = array())
    {
+        if (!isset($this->data)) {
+            $this->loadHooks();
+        }
+
        if ($scope != 'Common') {
-            $this->process('Common', $hookName, $injection, $options);
+            $this->process('Common', $hookName, $injection, $options, $hookData);
        }

        if (!empty($this->data[$scope])) {
@@ -115,7 +122,7 @@ class HookManager
                        }
                    }
                    $hook = $this->hooks[$className];
-                    $hook->$hookName($injection, $options);
+                    $hook->$hookName($injection, $options, $hookData);
                }
            }
        }
@@ -131,7 +138,8 @@ class HookManager
            }
            return $hook;
        }
-        $GLOBALS['log']->error("Hook class '{$name}' does not exist.");
+
+        $GLOBALS['log']->error("Hook class '{$className}' does not exist.");
    }

    /**
@@ -141,14 +149,12 @@ class HookManager
     *
     * @return array
     */
-    protected function getHookData($hookDirs)
+    protected function getHookData($hookDirs, array $hookData = array())
    {
        if (is_string($hookDirs)) {
            $hookDirs = (array) $hookDirs;
        }

-        $hooks = array();
-
        foreach ($hookDirs as $hookDir) {

            if (file_exists($hookDir)) {
@@ -157,6 +163,7 @@ class HookManager
                foreach ($fileList as $scopeName => $hookFiles) {

                    $hookScopeDirPath = Util::concatPath($hookDir, $scopeName);
+                    $normalizedScopeName = Util::normilizeScopeName($scopeName);

                    $scopeHooks = array();
                    foreach($hookFiles as $hookFile) {
@@ -164,32 +171,70 @@ class HookManager
                        $className = Util::getClassName($hookFilePath);

                        foreach($this->hookList as $hookName) {
-                            if (method_exists($className, $hookName)) {
-                                $scopeHooks[$hookName][$className::$order][] = $className;
+                            $entityHookData = isset($hookData[$scopeName][$hookName]) ? $hookData[$scopeName][$hookName] : array();
+                            if (method_exists($className, $hookName) && !$this->isHookExists($className, $entityHookData)) {
+                                $hookData[$normalizedScopeName][$hookName][$className::$order][] = $className;
                            }
                        }
                    }
-
-                    //sort hooks by order
-                    foreach ($scopeHooks as $hookName => $hookList) {
-                        ksort($hookList);
-
-                        $sortedHookList = array();
-                        foreach($hookList as $hookDetails) {
-                            $sortedHookList = array_merge($sortedHookList, $hookDetails);
-                        }
-
-                        $normalizedScopeName = Util::normilizeScopeName($scopeName);
-
-                        $hooks[$normalizedScopeName][$hookName] = isset($hooks[$normalizedScopeName][$hookName]) ? array_merge($hooks[$normalizedScopeName][$hookName], $sortedHookList) : $sortedHookList;
-                    }
                }
            }

        }

+        return $hookData;
+    }
+
+    /**
+     * Sort hooks by an order
+     *
+     * @param  array  $scopeHooks
+     *
+     * @return array
+     */
+    protected function sortHooks(array $unsortedHooks)
+    {
+        $hooks = array();
+
+        foreach ($unsortedHooks as $scopeName => $scopeHooks) {
+            foreach ($scopeHooks as $hookName => $hookList) {
+                ksort($hookList);
+
+                $sortedHookList = array();
+                foreach($hookList as $hookDetails) {
+                    $sortedHookList = array_merge($sortedHookList, $hookDetails);
+                }
+
+                $normalizedScopeName = Util::normilizeScopeName($scopeName);
+
+                $hooks[$normalizedScopeName][$hookName] = isset($hooks[$normalizedScopeName][$hookName]) ? array_merge($hooks[$normalizedScopeName][$hookName], $sortedHookList) : $sortedHookList;
+            }
+        }
+
        return $hooks;
    }

+    /**
+     * Check if hook exists in the list
+     *
+     * @param  string  $className
+     * @param  array  $hookData
+     *
+     * @return boolean
+     */
+    protected function isHookExists($className, array $hookData)
+    {
+        $class = preg_replace('/^.*\\\(.*)$/', '$1', $className);
+
+        foreach ($hookData as $key => $hookList) {
+            foreach ($hookList as $rowHookName) {
+                if (preg_match('/\\'.$class.'$/', $rowHookName)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
 }

@@ -29,15 +29,16 @@

 namespace Espo\Core\Hooks;

-use \Espo\Core\Interfaces\Injectable;
+use Espo\Core\Interfaces\Injectable;

 abstract class Base implements Injectable
 {
    protected $dependencies = array(
+        'container',
        'entityManager',
        'config',
        'metadata',
-        'acl',
+        'aclManager',
        'user',
    );

@@ -59,6 +60,13 @@ abstract class Base implements Injectable
        return $this->dependencies;
    }

+    protected function addDependencyList(array $list)
+    {
+        foreach ($list as $item) {
+            $this->addDependency($item);
+        }
+    }
+
    protected function addDependency($name)
    {
        $this->dependencies[] = $name;
@@ -74,29 +82,39 @@ abstract class Base implements Injectable
        $this->injections[$name] = $object;
    }

+    protected function getContainer()
+    {
+        return $this->getInjection('container');
+    }
+
    protected function getEntityManager()
    {
-        return $this->injections['entityManager'];
+        return $this->getInjection('entityManager');
    }

    protected function getUser()
    {
-        return $this->injections['user'];
+        return $this->getInjection('user');
    }

    protected function getAcl()
    {
-        return $this->injections['acl'];
+        return $this->getContainer()->get('acl');
+    }
+
+    protected function getAclManager()
+    {
+        return $this->getInjection('aclManager');
    }

    protected function getConfig()
    {
-        return $this->injections['config'];
+        return $this->getInjection('config');
    }

    protected function getMetadata()
    {
-        return $this->injections['metadata'];
+        return $this->getInjection('metadata');
    }

    protected function getRepository()
@@ -34,7 +34,7 @@ use Espo\Core\Exceptions\Error;

 use Espo\Core\Utils\File\Manager as FileManager;
 use Espo\Core\Utils\DateTime;
-use Espo\Core\Utils\Number;
+use Espo\Core\Utils\NumberUtil;

 require('vendor/zordius/lightncandy/src/lightncandy.php');

@@ -46,42 +46,52 @@ class Htmlizer

    protected $config;

-    public function __construct(FileManager $fileManager, DateTime $dateTime, Number $number)
+    protected $acl;
+
+    public function __construct(FileManager $fileManager, DateTime $dateTime, NumberUtil $number, $acl = null)
    {
        $this->fileManager = $fileManager;
        $this->dateTime = $dateTime;
        $this->number = $number;
+        $this->acl = $acl;
    }

-    protected function formatNumber($value)
+    protected function getAcl()
    {
-        return $this->number->format($value);
+        return $this->acl;
    }

    protected function format($value)
    {
-        if (is_float($value) || is_int($value)) {
-            $value = $this->formatNumber($value);
+        if (is_float($value)) {
+            $value = $this->number->format($value, 2);
+        } else if (is_int($value)) {
+            $value = $this->number->format($value);
        } else if (is_string($value)) {
            $value = nl2br($value);
        }
        return $value;
    }

-    protected function getDataFromEntity(Entity $entity)
+    protected function getDataFromEntity(Entity $entity, $skipLinks = false)
    {
        $data = $entity->toArray();

-
-
        $fieldDefs = $entity->getFields();
        $fieldList = array_keys($fieldDefs);

+        $forbidenAttributeList = [];
+
+        if ($this->getAcl()) {
+            $forbidenAttributeList = $this->getAcl()->getScopeForbiddenAttributeList($entity->getEntityType(), 'read');
+        }
+
        foreach ($fieldList as $field) {
-            $type = null;
-            if (!empty($fieldDefs[$field]['type'])) {
-                $type = $fieldDefs[$field]['type'];
-            }
+            if (in_array($field, $forbidenAttributeList)) continue;
+
+
+            $type = $entity->getAttributeType($field);
+
            if ($type == Entity::DATETIME) {
                if (!empty($data[$field])) {
                    $data[$field] = $this->dateTime->convertSystemDateTime($data[$field]);
@@ -116,6 +126,8 @@ class Htmlizer
                        $data[$field][$k] = $this->format($data[$field][$k]);
                    }
                }
+            } else if ($type === Entity::PASSWORD) {
+                unset($data[$field]);
            }

            if (array_key_exists($field, $data)) {
@@ -123,19 +135,52 @@ class Htmlizer
            }
        }

+        if (!$skipLinks) {
+            $relationDefs = $entity->getRelations();
+            foreach ($entity->getRelationList() as $relation) {
+                if (
+                    !empty($relationDefs[$relation]['type'])
+                    &&
+                    ($entity->getRelationType($relation) === 'belongsTo' || $entity->getRelationType($relation) === 'belongsToParent')
+                ) {
+                    $relatedEntity = $entity->get($relation);
+                    if (!$relatedEntity) continue;
+                    if ($this->getAcl()) {
+                        if (!$this->getAcl()->check($relatedEntity, 'read')) continue;
+                    }
+
+                    $data[$relation] = $this->getDataFromEntity($relatedEntity, true);
+                }
+            }
+        }
+
        return $data;
    }

-    public function render(Entity $entity, $template)
+    public function render(Entity $entity, $template, $id = null, $additionalData = array(), $skipLinks = false)
    {
        $code = \LightnCandy::compile($template);
-        $id = uniqid('', true);
-        $fileName = 'data/cache/template-' . $id;
-        $this->fileManager->putContents($fileName, $code);
-        $renderer = include($fileName);
-        $this->fileManager->removeFile($fileName);

-        $data = $this->getDataFromEntity($entity);
+        $toRemove = false;
+        if ($id === null) {
+            $id = uniqid('', true);
+            $toRemove = true;
+        }
+
+        $fileName = 'data/cache/templates/' . $id . '.php';
+
+        $this->fileManager->putContents($fileName, $code);
+        $renderer = $this->fileManager->getPhpContents($fileName);
+
+        if ($toRemove) {
+            $this->fileManager->removeFile($fileName);
+        }
+
+        $data = $this->getDataFromEntity($entity, $skipLinks);
+
+        foreach ($additionalData as $k => $value) {
+            $data[$k] = $value;
+        }

        $html = $renderer($data);

@@ -25,14 +25,14 @@
 *
 * 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\Interfaces;

 interface Injectable
 {
    public function getDependencyList();
-    
+
    public function inject($name, $object);
 }

@@ -70,7 +70,5 @@ abstract class Base
        $this->container = $container;
    }

-    abstract public function run();
-
 }

@@ -0,0 +1,43 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Loaders;
+
+class EmailFilterManager extends Base
+{
+    public function load()
+    {
+        $emailFilterManager = new \Espo\Core\Utils\EmailFilterManager(
+            $this->getContainer()->get('entityManager')
+        );
+
+        return $emailFilterManager;
+    }
+}
+
@@ -40,8 +40,9 @@ class EntityManager extends Base
            'port' => $config->get('database.port'),
            'dbname' => $config->get('database.dbname'),
            'user' => $config->get('database.user'),
+            'charset' => $config->get('database.charset', 'utf8'),
            'password' => $config->get('database.password'),
-            'metadata' => $this->getContainer()->get('metadata')->getOrmMetadata(),
+            'metadata' => $this->getContainer()->get('ormMetadata')->getData(),
            'repositoryFactoryClassName' => '\\Espo\\Core\\ORM\\RepositoryFactory',
            'driver' => $config->get('database.driver'),
            'platform' => $config->get('database.platform')
@@ -36,7 +36,9 @@ class EntityManagerUtil extends Base
        $entityManager = new \Espo\Core\Utils\EntityManager(
            $this->getContainer()->get('metadata'),
            $this->getContainer()->get('language'),
-            $this->getContainer()->get('fileManager')
+            $this->getContainer()->get('fileManager'),
+            $this->getContainer()->get('config'),
+            $this->getContainer()
        );

        return $entityManager;
@@ -0,0 +1,44 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Loaders;
+
+class TemplateFileManager extends Base
+{
+    public function load()
+    {
+        $templateFileManager = new \Espo\Core\Utils\TemplateFileManager(
+            $this->getContainer()->get('config'),
+            $this->getContainer()->get('metadata')
+        );
+
+        return $templateFileManager;
+    }
+}
+
@@ -39,51 +39,83 @@ class FiltersMatcher

    }

-    public function match(Email $email, $filterList = [])
+    protected function matchTo(Email $email, $filter)
    {
-        foreach ($filterList as $filter) {
-            if ($filter->get('from')) {
-                if ($this->matchString(strtolower($filter->get('from')), strtolower($email->get('from')))) {
-                    return true;
-                }
-            }
-            if ($filter->get('to')) {
-                if ($email->get('to')) {
-                    $toArr = explode(';', $email->get('to'));
-                    foreach ($toArr as $to) {
-                        if ($this->matchString(strtolower($filter->get('to')), strtolower($to))) {
-                            return true;
-                        }
-                    }
-                }
-            }
-            if ($filter->get('subject')) {
-                if ($this->matchString($filter->get('subject'), $email->get('name'))) {
+        if ($email->get('to')) {
+            $toArr = explode(';', $email->get('to'));
+            foreach ($toArr as $to) {
+                if ($this->matchString(strtolower($filter->get('to')), strtolower($to))) {
                    return true;
                }
            }
        }
+    }
+
+    public function match(Email $email, $subject, $skipBody = false)
+    {
+        if (is_array($subject) || $subject instanceof \Traversable) {
+            $filterList = $subject;
+        } else {
+            $filterList = [$subject];
+        }
+
+        foreach ($filterList as $filter) {
+            $filterCount = 0;
+
+            if ($filter->get('from')) {
+                $filterCount++;
+                if (!$this->matchString(strtolower($filter->get('from')), strtolower($email->get('from')))) {
+                    continue;
+                }
+            }
+
+            if ($filter->get('to')) {
+                $filterCount++;
+                if (!$this->matchTo($email, $filter)) {
+                    continue;
+                }
+            }
+
+            if ($filter->get('subject')) {
+                $filterCount++;
+                if (!$this->matchString($filter->get('subject'), $email->get('name'))) {
+                    continue;
+                }
+            }
+
+            $wordList = $filter->get('bodyContains');
+            if (!empty($wordList)) {
+                $filterCount++;
+                if ($skipBody) {
+                    continue;
+                }
+                if (!$this->matchBody($email, $filter)) {
+                    continue;
+                }
+
+            }
+
+            if ($filterCount) {
+                return true;
+            }
+        }
+
        return false;
    }

-    public function matchBody(Email $email, $filterList = [])
+    protected function matchBody(Email $email, $filter)
    {
-        foreach ($filterList as $filter) {
-            if ($filter->get('bodyContains')) {
-                $phraseList = $filter->get('bodyContains');
-                $body = $email->get('body');
-                $bodyPlain = $email->get('bodyPlain');
-                foreach ($phraseList as $phrase) {
-                    if (stripos($bodyPlain, $phrase) !== false) {
-                        return true;
-                    }
-                    if (stripos($body, $phrase) !== false) {
-                        return true;
-                    }
-                }
+        $phraseList = $filter->get('bodyContains');
+        $body = $email->get('body');
+        $bodyPlain = $email->get('bodyPlain');
+        foreach ($phraseList as $phrase) {
+            if (stripos($bodyPlain, $phrase) !== false) {
+                return true;
+            }
+            if (stripos($body, $phrase) !== false) {
+                return true;
            }
        }
-        return false;
    }

    protected function matchString($pattern, $value)
@@ -38,16 +38,13 @@ class Importer
 {
    private $entityManager;

-    private $fileManager;
-
    private $config;

    private $filtersMatcher;

-    public function __construct($entityManager, $fileManager, $config)
+    public function __construct($entityManager, $config)
    {
        $this->entityManager = $entityManager;
-        $this->fileManager = $fileManager;
        $this->config = $config;
        $this->filtersMatcher = new FiltersMatcher();
    }
@@ -56,219 +53,246 @@ class Importer
    {
        return $this->entityManager;
    }
+
    protected function getConfig()
    {
        return $this->config;
    }

-    protected function getFileManager()
-    {
-        return $this->fileManager;
-    }
-
    protected function getFiltersMatcher()
    {
        return $this->filtersMatcher;
    }

-    public function importMessage($message, $userId = null, $teamsIdList = [], $userIdList = [], $filterList = [])
+    public function importMessage($parserType = 'ZendMail', $message, $assignedUserId = null, $teamsIdList = [], $userIdList = [], $filterList = [], $fetchOnlyHeader = false, $folderData = null)
    {
-        try {
-            $email = $this->getEntityManager()->getEntity('Email');
+        $parser = $message->getParser();
+        $parserClassName = '\\Espo\\Core\\Mail\\Parsers\\' . $parserType;

-            $subject = $message->subject;
-            if ($subject !== '0' && empty($subject)) {
-                $subject = '(No Subject)';
+        if (!$parser || get_class($parser) !== $parserClassName) {
+            $parser = new $parserClassName($this->getEntityManager());
+        }
+
+        $email = $this->getEntityManager()->getEntity('Email');
+
+        $email->set('isBeingImported', true);
+
+        $subject = '';
+        if ($parser->checkMessageAttribute($message, 'subject')) {
+            $subject = $parser->getMessageAttribute($message, 'subject');
+        }
+        if (!empty($subject) && is_string($subject)) {
+            $subject = trim($subject);
+        }
+        if ($subject !== '0' && empty($subject)) {
+            $subject = '(No Subject)';
+        }
+
+        $email->set('isHtml', false);
+        $email->set('name', $subject);
+        $email->set('status', 'Archived');
+        $email->set('attachmentsIds', []);
+        if ($assignedUserId) {
+            $email->set('assignedUserId', $assignedUserId);
+            $email->addLinkMultipleId('assignedUsers', $assignedUserId);
+        }
+        $email->set('teamsIds', $teamsIdList);
+
+        if (!empty($userIdList)) {
+            foreach ($userIdList as $uId) {
+                $email->addLinkMultipleId('users', $uId);
            }
+        }

-            $email->set('isHtml', false);
-            $email->set('name', $subject);
-            $email->set('status', 'Archived');
-            $email->set('attachmentsIds', array());
-            if ($userId) {
-                $email->set('assignedUserId', $userId);
-            }
-            $email->set('teamsIds', $teamsIdList);
+        if ($parser->checkMessageAttribute($message, 'from')) {
+            $email->set('fromString', $parser->getMessageAttribute($message, 'from'));
+        }

-            if (!empty($userIdList)) {
-                $email->set('usersIds', $userIdList);
-            }
+        if ($parser->checkMessageAttribute($message, 'reply-To')) {
+            $email->set('replyToString', $parser->getMessageAttribute($message, 'reply-To'));
+        }

-            $fromArr = $this->getAddressListFromMessage($message, 'from');
-            if (isset($message->from)) {
-                $email->set('fromString', $message->from);
-            }
-            if (isset($message->replyTo)) {
-                $email->set('replyToString', $message->replyTo);
-            }
-
-            $toArr = $this->getAddressListFromMessage($message, 'to');
-            $ccArr = $this->getAddressListFromMessage($message, 'cc');
-            $replyToArr = $this->getAddressListFromMessage($message, 'replyTo');
+        $fromArr = $parser->getAddressListFromMessage($message, 'from');
+        $toArr = $parser->getAddressListFromMessage($message, 'to');
+        $ccArr = $parser->getAddressListFromMessage($message, 'cc');
+        $replyToArr = $parser->getAddressListFromMessage($message, 'reply-To');

+        if (count($fromArr)) {
            $email->set('from', $fromArr[0]);
-            $email->set('to', implode(';', $toArr));
-            $email->set('cc', implode(';', $ccArr));
-            $email->set('replyTo', implode(';', $replyToArr));
+        }
+        $email->set('to', implode(';', $toArr));
+        $email->set('cc', implode(';', $ccArr));
+        $email->set('replyTo', implode(';', $replyToArr));

-            if ($this->getFiltersMatcher()->match($email, $filterList)) {
-                return false;
+        if ($folderData) {
+            foreach ($folderData as $uId => $folderId) {
+                $email->setLinkMultipleColumn('users', 'folderId', $uId, $folderId);
            }
+        }

+        if ($this->getFiltersMatcher()->match($email, $filterList, true)) {
+            return false;
+        }

-            if (isset($message->messageId) && !empty($message->messageId)) {
-                $email->set('messageId', $message->messageId);
-                if (isset($message->deliveredTo)) {
-                    $email->set('messageIdInternal', $message->messageId . '-' . $message->deliveredTo);
-                }
-                if (stripos($message->messageId, '@espo-system') !== false) {
-                    return;
+        if ($parser->checkMessageAttribute($message, 'message-Id') && $parser->getMessageAttribute($message, 'message-Id')) {
+            $messageId = $parser->getMessageMessageId($message);
+
+            $email->set('messageId', $messageId);
+            if ($parser->checkMessageAttribute($message, 'delivered-To')) {
+                $email->set('messageIdInternal', $messageId . '-' . $parser->getMessageAttribute($message, 'delivered-To'));
+            }
+            if (stripos($messageId, '@espo-system') !== false) {
+                return;
+            }
+        }
+
+        if ($duplicate = $this->findDuplicate($email)) {
+            if ($assignedUserId) {
+                $duplicate->addLinkMultipleId('users', $assignedUserId);
+                $duplicate->addLinkMultipleId('assignedUsers', $assignedUserId);
+            }
+            if (!empty($userIdList)) {
+                foreach ($userIdList as $uId) {
+                    $duplicate->addLinkMultipleId('users', $uId);
                }
            }

-            if ($duplicate = $this->findDuplicate($email)) {
-            	$duplicate->loadLinkMultipleField('users');
-            	$usersIds = $duplicate->get('usersIds');
-                if ($userId) {
-                    if (!in_array($userId, $usersIds)) {
-            	       $usersIds[] = $userId;
-                    }
+            if ($folderData) {
+                foreach ($folderData as $uId => $folderId) {
+                    $email->setLinkMultipleColumn('users', 'folderId', $uId, $folderId);
                }
-                if (!empty($userIdList)) {
-                    foreach ($userIdList as $additionalUserId) {
-                        if (!in_array($additionalUserId, $usersIds)) {
-                            $usersIds[] = $additionalUserId;
-                        }
-                    }
-                }
-            	$duplicate->set('usersIds', $usersIds);
-
-            	$this->getEntityManager()->saveEntity($duplicate);
-
-                if (!empty($teamsIdList)) {
-                    foreach ($teamsIdList as $teamId) {
-                        $this->getEntityManager()->getRepository('Email')->relate($duplicate, 'teams', $teamId);
-                    }
-                }
-                return false;
            }

-            if (isset($message->date)) {
-                $dt = new \DateTime($message->date);
+            $duplicate->set('isBeingImported', true);
+
+            $this->getEntityManager()->saveEntity($duplicate);
+
+            if (!empty($teamsIdList)) {
+                foreach ($teamsIdList as $teamId) {
+                    $this->getEntityManager()->getRepository('Email')->relate($duplicate, 'teams', $teamId);
+                }
+            }
+            return $duplicate;
+        }
+
+        if ($parser->checkMessageAttribute($message, 'date')) {
+            try {
+                $dt = new \DateTime($parser->getMessageAttribute($message, 'date'));
                if ($dt) {
                    $dateSent = $dt->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d H:i:s');
                    $email->set('dateSent', $dateSent);
                }
-            } else {
-				$email->set('dateSent', date('Y-m-d H:i:s'));
-			}
-            if (isset($message->deliveryDate)) {
-                $dt = new \DateTime($message->deliveryDate);
+            } catch (\Exception $e) {}
+        } else {
+            $email->set('dateSent', date('Y-m-d H:i:s'));
+        }
+        if ($parser->checkMessageAttribute($message, 'delivery-Date')) {
+            try {
+                $dt = new \DateTime($parser->getMessageAttribute($message, 'delivery-Date'));
                if ($dt) {
                    $deliveryDate = $dt->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d H:i:s');
-                    $email->set('deliveryDate', $deliveryDate);
+                    $email->set('delivery-Date', $deliveryDate);
                }
-            }
+            } catch (\Exception $e) {}
+        }

-            $inlineIds = array();
+        if (!$fetchOnlyHeader) {
+            $parser->fetchContentParts($email, $message);

-            if ($message->isMultipart()) {
-                foreach (new \RecursiveIteratorIterator($message) as $part) {
-                    $this->importPartDataToEmail($email, $part, $inlineIds);
-                }
-            } else {
-                $this->importPartDataToEmail($email, $message, $inlineIds, 'text/plain');
-            }
-
-            if (!$email->get('body') && $email->get('bodyPlain')) {
-                $email->set('body', $email->get('bodyPlain'));
-            }
-
-            $body = $email->get('body');
-            if (!empty($body)) {
-                foreach ($inlineIds as $cid => $attachmentId) {
-                    $body = str_replace('cid:' . $cid, '?entryPoint=attachment&amp;id=' . $attachmentId, $body);
-                }
-                $email->set('body', $body);
-            }
-
-            if ($this->getFiltersMatcher()->matchBody($email, $filterList)) {
+            if ($this->getFiltersMatcher()->match($email, $filterList)) {
                return false;
            }
+        } else {
+            $email->set('body', '(Not fetched)');
+            $email->set('isHtml', false);
+        }

-            $parentFound = false;
+        $parentFound = false;

-            if (isset($message->inReplyTo) && !empty($message->inReplyTo)) {
-                $arr = explode(' ', $message->inReplyTo);
-                $inReplyTo = $arr[0];
-                $replied = $this->getEntityManager()->getRepository('Email')->where(array(
-                    'messageId' => $inReplyTo
-                ))->findOne();
-                if ($replied) {
-                    $email->set('repliedId', $replied->id);
-                }
+        $replied = null;
+
+        if ($parser->checkMessageAttribute($message, 'in-Reply-To') && $parser->getMessageAttribute($message, 'in-Reply-To')) {
+            $arr = explode(' ', $parser->getMessageAttribute($message, 'in-Reply-To'));
+            $inReplyTo = $arr[0];
+            $replied = $this->getEntityManager()->getRepository('Email')->where(array(
+                'messageId' => $inReplyTo
+            ))->findOne();
+            if ($replied) {
+                $email->set('repliedId', $replied->id);
            }
+        }

-            if (isset($message->references) && !empty($message->references)) {
-                $arr = explode(' ', $message->references);
-                $reference = $arr[0];
-                $reference = str_replace(array('/', '@'), " ", trim($reference, '<>'));
-                $parentType = $parentId = null;
-                $emailSent = PHP_INT_MAX;
-                $n = sscanf($reference, '%s %s %d %d espo', $parentType, $parentId, $emailSent, $number);
-                if ($n == 4 && $emailSent < time()) {
-                    if (!empty($parentType) && !empty($parentId)) {
-                        if ($parentType == 'Lead') {
-                            $parent = $this->getEntityManager()->getEntity('Lead', $parentId);
-                            if ($parent && $parent->get('status') == 'Converted') {
-                                if ($parent->get('createdAccountId')) {
-                                    $account = $this->getEntityManager()->getEntity('Account', $parent->get('createdAccountId'));
-                                    if ($account) {
-                                        $parentType = 'Account';
-                                        $parentId = $account->id;
-                                    }
-                                } else {
-                                    if ($this->getConfig()->get('b2cMode')) {
-                                        if ($parent->get('createdContactId')) {
-                                            $contact = $this->getEntityManager()->getEntity('Contact', $parent->get('createdContactId'));
-                                            if ($contact) {
-                                                $parentType = 'Contact';
-                                                $parentId = $contact->id;
-                                            }
+        if ($parser->checkMessageAttribute($message, 'references') && $parser->getMessageAttribute($message, 'references')) {
+            $arr = explode(' ', $parser->getMessageAttribute($message, 'references'));
+            $reference = $arr[0];
+            $reference = str_replace(array('/', '@'), " ", trim($reference, '<>'));
+            $parentType = $parentId = null;
+            $emailSent = PHP_INT_MAX;
+            $number = null;
+            $n = sscanf($reference, '%s %s %d %d espo', $parentType, $parentId, $emailSent, $number);
+            if ($n != 4) {
+                $n = sscanf($reference, '%s %s %d %d espo-system', $parentType, $parentId, $emailSent, $number);
+            }
+            if ($n == 4 && $emailSent < time()) {
+                if (!empty($parentType) && !empty($parentId)) {
+                    if ($parentType == 'Lead') {
+                        $parent = $this->getEntityManager()->getEntity('Lead', $parentId);
+                        if ($parent && $parent->get('status') == 'Converted') {
+                            if ($parent->get('createdAccountId')) {
+                                $account = $this->getEntityManager()->getEntity('Account', $parent->get('createdAccountId'));
+                                if ($account) {
+                                    $parentType = 'Account';
+                                    $parentId = $account->id;
+                                }
+                            } else {
+                                if ($this->getConfig()->get('b2cMode')) {
+                                    if ($parent->get('createdContactId')) {
+                                        $contact = $this->getEntityManager()->getEntity('Contact', $parent->get('createdContactId'));
+                                        if ($contact) {
+                                            $parentType = 'Contact';
+                                            $parentId = $contact->id;
                                        }
                                    }
                                }
                            }
                        }
-                        $email->set('parentType', $parentType);
-                        $email->set('parentId', $parentId);
-                        $parentFound = true;
                    }
+                    $email->set('parentType', $parentType);
+                    $email->set('parentId', $parentId);
+                    $parentFound = true;
                }
            }
+        }

-            if (!$parentFound) {
-                $from = $email->get('from');
-                if ($from) {
-                    $parentFound = $this->findParent($email, $from);
+        if (!$parentFound) {
+            if ($replied && $replied->get('parentId') && $replied->get('parentType')) {
+                $parentFound = $this->getEntityManager()->getEntity($replied->get('parentType'), $replied->get('parentId'));
+                if ($parentFound) {
+                    $email->set('parentType', $replied->get('parentType'));
+                    $email->set('parentId', $replied->get('parentId'));
                }
            }
-            if (!$parentFound) {
-                if (!empty($replyToArr)) {
-                    $parentFound = $this->findParent($email, $replyToArr[0]);
-                }
+        }
+        if (!$parentFound) {
+            $from = $email->get('from');
+            if ($from) {
+                $parentFound = $this->findParent($email, $from);
            }
-            if (!$parentFound) {
-                if (!empty($toArr)) {
-                    $parentFound = $this->findParent($email, $toArr[0]);
-                }
+        }
+        if (!$parentFound) {
+            if (!empty($replyToArr)) {
+                $parentFound = $this->findParent($email, $replyToArr[0]);
            }
+        }
+        if (!$parentFound) {
+            if (!empty($toArr)) {
+                $parentFound = $this->findParent($email, $toArr[0]);
+            }
+        }

-            $this->getEntityManager()->saveEntity($email);
+        $this->getEntityManager()->saveEntity($email);

-            return $email;
-
-        } catch (\Exception $e) {}
+        return $email;
    }

    protected function findParent(Entity $email, $emailAddress)
@@ -297,15 +321,15 @@ class Importer
                $email->set('parentId', $account->id);
                return true;
            } else {
-	            $lead = $this->getEntityManager()->getRepository('Lead')->where(array(
-	                'emailAddress' => $emailAddress
-	            ))->findOne();
-	            if ($lead) {
-	                $email->set('parentType', 'Lead');
-	                $email->set('parentId', $lead->id);
-	                return true;
-	            }
-	       	}
+                $lead = $this->getEntityManager()->getRepository('Lead')->where(array(
+                    'emailAddress' => $emailAddress
+                ))->findOne();
+                if ($lead) {
+                    $email->set('parentType', 'Lead');
+                    $email->set('parentId', $lead->id);
+                    return true;
+                }
+            }
        }
    }

@@ -320,208 +344,4 @@ class Importer
            }
        }
    }
-
-    protected function normilizeHeader($header)
-    {
-        if (is_a($header, 'ArrayIterator')) {
-            return $header->current();
-        } else {
-            return $header;
-        }
-    }
-
-    protected function getAddressListFromMessage($message, $type)
-    {
-        $addressList = array();
-        if (isset($message->$type)) {
-            $list = $this->normilizeHeader($message->getHeader($type))->getAddressList();
-            foreach ($list as $address) {
-                $addressList[] = $address->getEmail();
-            }
-        }
-        return $addressList;
-    }
-
-    protected function importPartDataToEmail(\Espo\Entities\Email $email, $part, &$inlineIds = array(), $defaultContentType = null)
-    {
-        try {
-            $type = null;
-
-            if ($part->getHeaders() && isset($part->contentType)) {
-                $type = strtok($part->contentType, ';');
-            }
-
-            $contentDisposition = false;
-            if (isset($part->ContentDisposition)) {
-                if (strpos(strtolower($part->ContentDisposition), 'attachment') === 0) {
-                    $contentDisposition = 'attachment';
-                } else if (strpos(strtolower($part->ContentDisposition), 'inline') === 0) {
-                    $contentDisposition = 'inline';
-                }
-            }
-
-            if (empty($type)) {
-                if (!empty($defaultContentType)) {
-                    $type = $defaultContentType;
-                } else {
-                    return;
-                }
-            }
-
-            $encoding = null;
-            $isAttachment = true;
-            if ($type == 'text/plain' || $type == 'text/html') {
-                if ($contentDisposition !== 'attachment') {
-                    $isAttachment = false;
-                    $content = $this->getContentFromPart($part);
-                    if ($type == 'text/plain') {
-                        $bodyPlain = '';
-                        if ($email->get('bodyPlain')) {
-                            $bodyPlain .= $email->get('bodyPlain') . "\n";
-                        }
-                        $bodyPlain .= $content;
-                        $email->set('bodyPlain', $bodyPlain);
-                    } else if ($type == 'text/html') {
-                        $body = '';
-                        if ($email->get('body')) {
-                            $body .= $email->get('body') . "<br>";
-                        }
-                        $body .= $content;
-                        $email->set('isHtml', true);
-                        $email->set('body', $body);
-                    }
-                }
-            }
-
-            if ($isAttachment) {
-                $content = $part->getContent();
-                $disposition = null;
-
-                $fileName = null;
-                $contentId = null;
-
-                if ($contentDisposition) {
-
-                    if ($contentDisposition === 'attachment') {
-                        $fileName = $this->fetchFileNameFromContentDisposition($part->ContentDisposition);
-                        if ($fileName) {
-                            $disposition = 'attachment';
-                        }
-                    } else if ($contentDisposition ===  'inline') {
-                        if (isset($part->contentID)) {
-                            $contentId = trim($part->contentID, '<>');
-                            $fileName = $contentId;
-                            $disposition = 'inline';
-                        } else {
-                            // for iOS attachments
-                            if (empty($fileName)) {
-                                $fileName = $this->fetchFileNameFromContentDisposition($part->ContentDisposition);
-                                if ($fileName) {
-                                    $disposition = 'attachment';
-                                }
-                            }
-                        }
-                    }
-                }
-
-                if (isset($part->contentTransferEncoding)) {
-                    $encoding = strtolower($this->normilizeHeader($part->getHeader('Content-Transfer-Encoding'))->getTransferEncoding());
-                }
-
-                $attachment = $this->getEntityManager()->getEntity('Attachment');
-                $attachment->set('name', $fileName);
-                $attachment->set('type', $type);
-
-                if ($disposition == 'inline') {
-                    $attachment->set('role', 'Inline Attachment');
-                } else {
-                    $attachment->set('role', 'Attachment');
-                }
-
-                if ($encoding == 'base64') {
-                    $content = base64_decode($content);
-                }
-
-                $attachment->set('size', strlen($content));
-
-                $this->getEntityManager()->saveEntity($attachment);
-
-                $path = 'data/upload/' . $attachment->id;
-                $this->getFileManager()->putContents($path, $content);
-
-                if ($disposition == 'attachment') {
-                    $attachmentsIds = $email->get('attachmentsIds');
-                    $attachmentsIds[] = $attachment->id;
-                    $email->set('attachmentsIds', $attachmentsIds);
-                } else if ($disposition == 'inline') {
-                    $inlineIds[$contentId] = $attachment->id;
-                }
-            }
-        } catch (\Exception $e) {}
-    }
-
-    protected function fetchFileNameFromContentDisposition($contentDisposition)
-    {
-        $m = array();
-        if (preg_match('/filename="?([^"]+)"?/i', $contentDisposition, $m)) {
-            $fileName = $m[1];
-            return $fileName;
-        } else if (preg_match('/filename\*="?([^"]+)"?/i', $contentDisposition, $m)) {
-            $fileName = $m[1];
-            if ($fileName && stripos($fileName, "''") !== false) {
-                list($encoding, $fileName) = explode("''", $fileName);
-                $fileName = rawurldecode($fileName);
-                if (strtoupper($encoding) !== 'UTF-8') {
-                    $fileName = mb_convert_encoding($fileName, 'UTF-8', $encoding);
-                }
-                return $fileName;
-            }
-        }
-        return false;
-    }
-
-    protected function getContentFromPart($part)
-    {
-        if ($part instanceof \Zend\Mime\Part) {
-            $content = $part->getRawContent();
-            if (strtolower($part->charset) != 'utf-8') {
-                $content = mb_convert_encoding($content, 'UTF-8', $part->charset);
-            }
-        } else {
-            $content = $part->getContent();
-
-            $encoding = null;
-
-            if (isset($part->contentTransferEncoding)) {
-                $cteHeader = $this->normilizeHeader($part->getHeader('Content-Transfer-Encoding'));
-                $encoding = strtolower($cteHeader->getTransferEncoding());
-            }
-
-            if ($encoding == 'base64') {
-                $content = base64_decode($content);
-            }
-
-            $charset = 'UTF-8';
-
-            if (isset($part->contentType)) {
-                $ctHeader = $this->normilizeHeader($part->getHeader('Content-Type'));
-                $charsetParamValue = $ctHeader->getParameter('charset');
-                if (!empty($charsetParamValue)) {
-                    $charset = strtoupper($charsetParamValue);
-                }
-            }
-
-            if (isset($part->contentTransferEncoding)) {
-                $cteHeader = $this->normilizeHeader($part->getHeader('Content-Transfer-Encoding'));
-                if ($cteHeader->getTransferEncoding() == 'quoted-printable') {
-                    $content = quoted_printable_decode($content);
-                }
-            }
-
-            if ($charset !== 'UTF-8') {
-                $content = mb_convert_encoding($content, 'UTF-8', $charset);
-            }
-        }
-        return $content;
-    }
 }
@@ -31,8 +31,6 @@ namespace Espo\Core\Mail\Mail\Storage;

 class Imap extends \Zend\Mail\Storage\Imap
 {
-	protected $messageClass = '\\Espo\\Core\\Mail\\Mail\\Storage\\Message';
-
    public function getIdsFromUID($uid)
    {
        $uid = intval($uid) + 1;
@@ -44,5 +42,22 @@ class Imap extends \Zend\Mail\Storage\Imap
        return $this->protocol->search(array('SINCE "' . $date . '"'));
    }

+    public function getHeaderAndFlags($id, $part = null)
+    {
+        $data = $this->protocol->fetch(['FLAGS', 'RFC822.HEADER'], $id);
+
+        $header = $data['RFC822.HEADER'];
+
+        $flags = [];
+        foreach ($data['FLAGS'] as $flag) {
+            $flags[] = isset(static::$knownFlags[$flag]) ? static::$knownFlags[$flag] : $flag;
+        }
+
+        return array(
+            'flags' => $flags,
+            'header' => $header
+        );
+    }
+
 }

@@ -34,6 +34,7 @@ use Zend\Mail\Header\HeaderInterface;
 use Zend\Mime;
 use Zend\Mail\Storage\Exception;
 use Zend\Mail\Storage\AbstractStorage;
+use Zend\Stdlib\ErrorHandler;

 class Message extends \Zend\Mail\Storage\Message
 {
@@ -0,0 +1,144 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Mail;
+
+use \Espo\Entities\Email;
+
+class MessageWrapper
+{
+    private $storage;
+
+    private $id;
+
+    private $rawHeader = null;
+
+    private $rawContent = null;
+
+    private $zendMessage = null;
+
+    protected $zendMessageClass = '\Zend\Mail\Storage\Message';
+
+    protected $fullRawContent = null;
+
+    protected $flagList = null;
+
+    public function __construct($storage = null, $id = null, $parser = null)
+    {
+        if ($storage) {
+            $data = $storage->getHeaderAndFlags($id);
+            $this->rawHeader = $data['header'];
+            $this->flagList = $data['flags'];
+        }
+
+        $this->id = $id;
+        $this->storage = $storage;
+        $this->parser = $parser;
+    }
+
+    public function setFullRawContent($content)
+    {
+        $this->fullRawContent = $content;
+    }
+
+    public function getRawHeader()
+    {
+        return $this->rawHeader;
+    }
+
+    public function getParser()
+    {
+        return $this->parser;
+    }
+
+    public function checkAttribute($attribute)
+    {
+        return $this->getParser()->checkMessageAttribute($this, $attribute);
+    }
+
+    public function getAttribute($attribute)
+    {
+        return $this->getParser()->getMessageAttribute($this, $attribute);
+    }
+
+    public function getRawContent()
+    {
+        if (is_null($this->rawContent)) {
+            $this->rawContent = $this->storage->getRawContent($this->id);
+        }
+
+        return $this->rawContent;
+    }
+
+    public function getFullRawContent()
+    {
+        if ($this->fullRawContent) {
+            return $this->fullRawContent;
+        }
+
+        return $this->getRawHeader() . "\n" . $this->getRawContent();
+    }
+
+    public function getZendMessage()
+    {
+        if (!$this->zendMessage) {
+            $data = array();
+            if ($this->storage) {
+                $data['handler'] = $this->storage;
+            }
+            if ($this->flagList) {
+                $data['flags'] = $this->flagList;
+            }
+            if ($this->fullRawContent) {
+                $data['raw'] = $this->fullRawContent;
+            } else {
+                if ($this->rawHeader) {
+                    $data['headers'] = $this->rawHeader;
+                }
+            }
+            if ($this->id) {
+                $data['id'] = $this->id;
+            }
+
+            $this->zendMessage = new $this->zendMessageClass($data);
+        }
+
+        return $this->zendMessage;
+    }
+
+    public function getFlags()
+    {
+        return $this->flagList;
+    }
+
+    public function isFetched()
+    {
+        return !!$this->rawHeader;
+    }
+}
@@ -0,0 +1,167 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Mail\Parsers;
+
+class PhpMimeMailParser
+{
+    private $entityManager;
+
+    private $parserHash = array();
+
+    public function __construct($entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    protected function getEntityManager()
+    {
+        return $this->entityManager;
+    }
+
+    protected function getParser($message)
+    {
+        $key = spl_object_hash($message);
+        if (!array_key_exists($key, $this->parserHash)) {
+            $this->parserHash[$key] = new PhpMimeMailParser\Parser();
+            $raw = $message->getRawHeader();
+            if (!$raw) {
+                $raw = $message->getFullRawContent();
+            }
+            $this->parserHash[$key]->setText($raw);
+        }
+
+        return $this->parserHash[$key];
+    }
+
+    protected function loadContent($message)
+    {
+        $this->getParser($message);
+
+        $raw = $message->getFullRawContent();
+        $this->getParser($message)->setText($raw);
+    }
+
+    public function checkMessageAttribute($message, $attribute)
+    {
+        return $this->getParser($message)->getHeader($attribute) !== false;
+    }
+
+    public function getMessageAttribute($message, $attribute)
+    {
+        if (!$this->checkMessageAttribute($message, $attribute)) return null;
+
+        return $this->getParser($message)->getHeader($attribute);
+    }
+
+    public function getMessageMessageId($message)
+    {
+        return $this->getMessageAttribute($message, 'Message-ID');
+    }
+
+    public function getAddressListFromMessage($message, $type)
+    {
+        $addressList = [];
+        if ($this->checkMessageAttribute($message, $type)) {
+            $list = $this->getParser($message)->getAddresses($type);
+            foreach ($list as $address) {
+                $addressList[] = $address['address'];
+            }
+        }
+        return $addressList;
+    }
+
+    public function fetchContentParts(\Espo\Entities\Email $email, $message)
+    {
+        $this->loadContent($message);
+
+        $bodyPlain = $this->getParser($message)->getMessageBody('text');
+        $bodyHtml = $this->getParser($message)->getMessageBody('html');
+
+        if ($bodyHtml) {
+            $email->set('isHtml', true);
+            $email->set('body', $bodyHtml);
+            $email->set('bodyPlain', $bodyPlain);
+        } else {
+            $email->set('isHtml', false);
+            $email->set('body', $bodyPlain);
+        }
+
+        if (!$email->get('body') && $email->get('bodyPlain')) {
+            $email->set('body', $email->get('bodyPlain'));
+        }
+
+        $attachmentObjList = $this->getParser($message)->getAttachments();
+        $inlineIds = array();
+
+        foreach ($attachmentObjList as $attachmentObj) {
+            $attachment = $this->getEntityManager()->getEntity('Attachment');
+
+            $content = $attachmentObj->getContent();
+            $disposition = $attachmentObj->getContentDisposition();
+
+            $attachment = $this->getEntityManager()->getEntity('Attachment');
+            $attachment->set('name', $attachmentObj->getFileName());
+            $attachment->set('type', $attachmentObj->getContentType());
+
+            if ($disposition == 'inline') {
+                $attachment->set('role', 'Inline Attachment');
+                $contentId = $attachmentObj->getContentID();
+            } else {
+                $attachment->set('role', 'Attachment');
+            }
+
+            $attachment->set('contents', $content);
+
+            $this->getEntityManager()->saveEntity($attachment);
+
+            if ($disposition == 'attachment') {
+                $attachmentsIds = $email->get('attachmentsIds');
+                $attachmentsIds[] = $attachment->id;
+                $email->set('attachmentsIds', $attachmentsIds);
+            } else if ($disposition == 'inline') {
+                $inlineIds[$contentId] = $attachment->id;
+            }
+        }
+
+        $body = $email->get('body');
+
+        if (!empty($body)) {
+            foreach ($inlineIds as $cid => $attachmentId) {
+                if (strpos($body, 'cid:' . $cid) !== false) {
+                    $body = str_replace('cid:' . $cid, '?entryPoint=attachment&amp;id=' . $attachmentId, $body);
+                } else {
+                    $email->addLinkMultipleId('attachments', $attachmentId);
+                }
+            }
+            $email->set('body', $body);
+        }
+    }
+}
+
@@ -0,0 +1,89 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Mail\Parsers\PhpMimeMailParser;
+
+use \PhpMimeMailParser\Attachment;
+
+class Parser extends \PhpMimeMailParser\Parser
+{
+    public function getAttachments()
+    {
+        $attachments = [];
+        $dispositions = ['attachment', 'inline'];
+        $non_attachment_types = ['text/plain', 'text/html'];
+        $nonameIter = 0;
+
+        foreach ($this->parts as $part) {
+            $disposition = $this->getPart('content-disposition', $part);
+            $filename = 'noname';
+
+            if (isset($part['disposition-filename'])) {
+                $filename = $this->decodeHeader($part['disposition-filename']);
+            } elseif (isset($part['content-name'])) {
+                // if we have no disposition but we have a content-name, it's a valid attachment.
+                // we simulate the presence of an attachment disposition with a disposition filename
+                $filename = $this->decodeHeader($part['content-name']);
+                if (!$disposition) {
+                    $disposition = 'attachment';
+                }
+            } elseif (!in_array($part['content-type'], $non_attachment_types, true)
+                && substr($part['content-type'], 0, 10) !== 'multipart/'
+                ) {
+                // if we cannot get it by getMessageBody(), we assume it is an attachment
+                $disposition = 'attachment';
+            }
+
+            if (in_array($disposition, $dispositions) === true && isset($filename) === true) {
+                if ($filename == 'noname') {
+                    $nonameIter++;
+                    $filename = 'noname'.$nonameIter;
+                }
+
+                $headersAttachments = $this->getPart('headers', $part);
+                $contentidAttachments = $this->getPart('content-id', $part);
+
+                $mimePartStr = $this->getPartComplete($part);
+
+                $attachments[] = new Attachment(
+                    $filename,
+                    $this->getPart('content-type', $part),
+                    $this->getAttachmentStream($part),
+                    $disposition,
+                    $contentidAttachments,
+                    $headersAttachments,
+                    $mimePartStr
+                );
+            }
+        }
+
+        return $attachments;
+    }
+}
+
@@ -0,0 +1,349 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Mail\Parsers;
+
+class ZendMail
+{
+    private $entityManager;
+
+    public function __construct($entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    protected function getEntityManager()
+    {
+        return $this->entityManager;
+    }
+
+    public function checkMessageAttribute($message, $attribute)
+    {
+        $zendMessage = $message->getZendMessage();
+
+        return isset($zendMessage->$attribute);
+    }
+
+    public function getMessageAttribute($message, $attribute)
+    {
+        $zendMessage = $message->getZendMessage();
+
+        if (!isset($zendMessage->$attribute)) return null;
+
+        return $zendMessage->$attribute;
+    }
+
+    public function getMessageMessageId($message)
+    {
+        $zendMessage = $message->getZendMessage();
+
+        if (!isset($zendMessage->messageId)) return null;
+
+        $messageId = $zendMessage->messageId;
+        $messageId = str_replace('<<', '<', $messageId);
+        $messageId = str_replace('>>', '>', $messageId);
+
+        return $messageId;
+    }
+
+    public function getAddressListFromMessage($message, $type)
+    {
+        $zendMessage = $message->getZendMessage();
+
+        $addressList = array();
+        if (isset($zendMessage->$type)) {
+            $list = $this->normilizeHeader($zendMessage->getHeader($type))->getAddressList();
+            foreach ($list as $address) {
+                $addressList[] = $address->getEmail();
+            }
+        }
+        return $addressList;
+    }
+
+    public function fetchContentParts(\Espo\Entities\Email $email, $message)
+    {
+        $zendMessage = $message->getZendMessage();
+
+        $inlineIds = array();
+
+        if ($zendMessage->isMultipart()) {
+            foreach (new \RecursiveIteratorIterator($zendMessage) as $part) {
+                $this->importPartDataToEmail($email, $part, $inlineIds);
+            }
+        } else {
+            $this->importPartDataToEmail($email, $zendMessage, $inlineIds, 'text/plain');
+        }
+
+        if (!$email->get('body') && $email->get('bodyPlain')) {
+            $email->set('body', $email->get('bodyPlain'));
+        }
+
+        $body = $email->get('body');
+        if (!empty($body)) {
+            foreach ($inlineIds as $cid => $attachmentId) {
+                if (strpos($body, 'cid:' . $cid) !== false) {
+                    $body = str_replace('cid:' . $cid, '?entryPoint=attachment&amp;id=' . $attachmentId, $body);
+                } else {
+                    $email->addLinkMultipleId('attachments', $attachmentId);
+                }
+            }
+            $email->set('body', $body);
+        }
+    }
+
+    protected function importPartDataToEmail(\Espo\Entities\Email $email, $part, &$inlineIds = array(), $defaultContentType = null)
+    {
+        try {
+            $type = null;
+
+            if ($part->getHeaders() && isset($part->contentType)) {
+                $type = strtok($part->contentType, ';');
+            }
+
+            $contentDisposition = false;
+            if (isset($part->ContentDisposition)) {
+                if (strpos(strtolower($part->ContentDisposition), 'attachment') === 0) {
+                    $contentDisposition = 'attachment';
+                } else if (strpos(strtolower($part->ContentDisposition), 'inline') === 0) {
+                    $contentDisposition = 'inline';
+                }
+            } else if (isset($part->contentID)) {
+                $contentDisposition = 'inline';
+            }
+
+            if (empty($type)) {
+                if (!empty($defaultContentType)) {
+                    $type = $defaultContentType;
+                } else {
+                    return;
+                }
+            }
+
+            $encoding = null;
+            $isAttachment = true;
+            if ($type == 'text/plain' || $type == 'text/html') {
+                if ($contentDisposition !== 'attachment') {
+                    $isAttachment = false;
+                    $content = $this->getContentFromPart($part);
+                    if ($type == 'text/plain') {
+                        $bodyPlain = '';
+                        if ($email->get('bodyPlain')) {
+                            $bodyPlain .= $email->get('bodyPlain') . "\n";
+                        }
+                        $bodyPlain .= $content;
+                        $email->set('bodyPlain', $bodyPlain);
+                    } else if ($type == 'text/html') {
+                        $body = '';
+                        if ($email->get('body')) {
+                            $body .= $email->get('body') . "<br>";
+                        }
+                        $body .= $content;
+                        $email->set('isHtml', true);
+                        $email->set('body', $body);
+                    }
+                }
+            }
+
+            if ($isAttachment) {
+                $content = $part->getContent();
+
+                $disposition = null;
+
+                $fileName = null;
+                $contentId = null;
+
+                if ($contentDisposition) {
+                    if ($contentDisposition === 'attachment') {
+                        $fileName = $this->fetchFileNameFromContentDisposition($part->ContentDisposition);
+                        if ($fileName) {
+                            $disposition = 'attachment';
+                        }
+                    } else if ($contentDisposition ===  'inline') {
+                        if (isset($part->contentID)) {
+                            $contentId = trim($part->contentID, '<>');
+                            $fileName = $contentId;
+                            $disposition = 'inline';
+                        } else {
+                            // for iOS attachments
+                            if (empty($fileName)) {
+                                $fileName = $this->fetchFileNameFromContentDisposition($part->ContentDisposition);
+                                if ($fileName) {
+                                    $disposition = 'attachment';
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (isset($part->contentTransferEncoding)) {
+                    $encoding = strtolower($this->normilizeHeader($part->getHeader('Content-Transfer-Encoding'))->getTransferEncoding());
+                }
+
+                $attachment = $this->getEntityManager()->getEntity('Attachment');
+                $attachment->set('name', $fileName);
+                $attachment->set('type', $type);
+
+                if ($disposition == 'inline') {
+                    $attachment->set('role', 'Inline Attachment');
+                } else {
+                    $attachment->set('role', 'Attachment');
+                }
+
+                if ($encoding == 'base64') {
+                    $content = base64_decode($content);
+                }
+
+                $attachment->set('contents', $content);
+
+                $this->getEntityManager()->saveEntity($attachment);
+
+                if ($disposition == 'attachment') {
+                    $attachmentsIds = $email->get('attachmentsIds');
+                    $attachmentsIds[] = $attachment->id;
+                    $email->set('attachmentsIds', $attachmentsIds);
+                } else if ($disposition == 'inline') {
+                    $inlineIds[$contentId] = $attachment->id;
+                }
+            }
+        } catch (\Exception $e) {}
+    }
+
+    protected function getContentFromPart($part)
+    {
+        if ($part instanceof \Zend\Mime\Part) {
+            $content = $part->getRawContent();
+            if (strtolower($part->charset) != 'utf-8') {
+                $content = mb_convert_encoding($content, 'UTF-8', $part->charset);
+            }
+        } else {
+            $content = $part->getContent();
+
+            $encoding = null;
+
+            if (isset($part->contentTransferEncoding)) {
+                $cteHeader = $this->normilizeHeader($part->getHeader('Content-Transfer-Encoding'));
+                $encoding = strtolower($cteHeader->getTransferEncoding());
+            }
+
+            if ($encoding == 'base64') {
+                $content = base64_decode($content);
+            }
+
+            $charset = 'UTF-8';
+
+            if (isset($part->contentType)) {
+                $ctHeader = $this->normilizeHeader($part->getHeader('Content-Type'));
+                $charsetParamValue = $ctHeader->getParameter('charset');
+                if (!empty($charsetParamValue)) {
+                    $charset = strtoupper($charsetParamValue);
+                }
+            }
+
+            if (isset($part->contentTransferEncoding)) {
+                $cteHeader = $this->normilizeHeader($part->getHeader('Content-Transfer-Encoding'));
+                if ($cteHeader->getTransferEncoding() == 'quoted-printable') {
+                    $content = quoted_printable_decode($content);
+                }
+            }
+
+            if ($charset !== 'UTF-8') {
+                $content = mb_convert_encoding($content, 'UTF-8', $charset);
+            }
+        }
+        return $content;
+    }
+
+    protected function normilizeHeader($header)
+    {
+        if (is_a($header, 'ArrayIterator')) {
+            return $header->current();
+        } else {
+            return $header;
+        }
+    }
+
+    protected function fetchFileNameFromContentDisposition($contentDisposition)
+    {
+        $contentDisposition = preg_replace('/\\\\"/', "{{_!Q!U!O!T!E!_}}", $contentDisposition);
+
+        $fileName = false;
+        $m = array();
+
+        if (preg_match('/filename="([^"]+)";?/i', $contentDisposition, $m)) {
+            $fileName = $m[1];
+        } else if (preg_match('/filename=([^";]+);?/i', $contentDisposition, $m)) {
+            $fileName = $m[1];
+        } else if (preg_match('/filename\*="([^"]+)";?/i', $contentDisposition, $m)) {
+            $fileName = $m[1];
+            $fileName = $this->decodeAttachmentFileName($fileName);
+        } else if (preg_match('/filename\*=([^";]+);?/i', $contentDisposition, $m)) {
+            $fileName = $m[1];
+            $fileName = $this->decodeAttachmentFileName($fileName);
+        } else {
+            $fileName = '';
+            foreach (['0', '1'] as $i) {
+                if (preg_match('/filename\*'.$i.'[\*]?="([^"]+)";?/i', $contentDisposition, $m)) {
+                    $part = $m[1];
+                    $fileName .= $part;
+                } else if (preg_match('/filename\*'.$i.'[\*]?=([^";]+);?/i', $contentDisposition, $m)) {
+                    $part = $m[1];
+                    $fileName .= $part;
+                }
+            }
+
+            if ($fileName === '') {
+                $fileName = null;
+            } else {
+                $fileName = $this->decodeAttachmentFileName($fileName);
+            }
+        }
+
+        if ($fileName) {
+            $fileName = str_replace('{{_!Q!U!O!T!E!_}}', '"', $fileName);
+        }
+
+        return $fileName;
+    }
+
+    protected function decodeAttachmentFileName($fileName)
+    {
+        if ($fileName && stripos($fileName, "''") !== false) {
+            list($encoding, $fileName) = explode("''", $fileName);
+            $fileName = rawurldecode($fileName);
+            if (strtoupper($encoding) !== 'UTF-8') {
+                if ($encoding) {
+                    $fileName = mb_convert_encoding($fileName, 'UTF-8', $encoding);
+                }
+            }
+        }
+        return $fileName;
+    }
+
+}
+
@@ -45,18 +45,31 @@ class Sender
 {
    protected $config;

+    protected $entityManager;
+
    protected $transport;

    protected $isGlobal = false;

    protected $params = array();

-    public function __construct($config)
+    public function __construct($config, $entityManager)
    {
        $this->config = $config;
+        $this->entityManager = $entityManager;
        $this->useGlobal();
    }

+    protected function getConfig()
+    {
+        return $this->config;
+    }
+
+    protected function getEntityManager()
+    {
+        return $this->entityManager;
+    }
+
    public function resetParams()
    {
        $this->params = array();
@@ -91,10 +104,10 @@ class Sender
            $opts['connection_config']['ssl'] = strtolower($params['security']);
        }

-        if (in_array('fromName', $params)) {
+        if (array_key_exists('fromName', $params)) {
            $this->params['fromName'] = $params['fromName'];
        }
-        if (in_array('fromAddress', $params)) {
+        if (array_key_exists('fromAddress', $params)) {
            $this->params['fromAddress'] = $params['fromAddress'];
        }

@@ -138,7 +151,7 @@ class Sender
        return $this;
    }

-    public function send(Email $email, $params = array(), &$message = null, $attachmetList = [])
+    public function send(Email $email, $params = array(), &$message = null, $attachmentList = [])
    {
        if (!$message) {
            $message = new Message();
@@ -177,6 +190,10 @@ class Sender
            $email->set('from', $fromAddress);
        }

+        $sender = new \Zend\Mail\Header\Sender();
+        $sender->setAddress($email->get('from'));
+        $message->getHeaders()->addHeader($sender);
+
        if (!empty($params['replyToAddress'])) {
            $replyToName = null;
            if (!empty($params['replyToName'])) {
@@ -229,13 +246,13 @@ class Sender
        $attachmentCollection = $email->get('attachments');
        $attachmentInlineCollection = $email->getInlineAttachments();

-        foreach ($attachmetList as $attachment) {
+        foreach ($attachmentList as $attachment) {
            $attachmentCollection[] = $attachment;
        }

        if (!empty($attachmentCollection)) {
            foreach ($attachmentCollection as $a) {
-                $fileName = 'data/upload/' . $a->id;
+                $fileName = $this->getEntityManager()->getRepository('Attachment')->getFilePath($a);
                $attachment = new MimePart(file_get_contents($fileName));
                $attachment->disposition = Mime::DISPOSITION_ATTACHMENT;
                $attachment->encoding = Mime::ENCODING_BASE64;
@@ -249,7 +266,7 @@ class Sender

        if (!empty($attachmentInlineCollection)) {
            foreach ($attachmentInlineCollection as $a) {
-                $fileName = 'data/upload/' . $a->id;
+                $fileName = $this->getEntityManager()->getRepository('Attachment')->getFilePath($a);
                $attachment = new MimePart(file_get_contents($fileName));
                $attachment->disposition = Mime::DISPOSITION_INLINE;
                $attachment->encoding = Mime::ENCODING_BASE64;
@@ -327,15 +344,12 @@ class Sender
        $message->setEncoding('UTF-8');

        try {
-            $rand = mt_rand(1000, 9999);
-
-            if ($email->get('parentType') && $email->get('parentId')) {
-                $messageId = '' . $email->get('parentType') .'/' . $email->get('parentId') . '/' . time() . '/' . $rand . '@espo';
+            $messageId = $email->get('messageId');
+            if (empty($messageId) || !is_string($messageId) || strlen($messageId) < 4) {
+                $messageId = $this->generateMessageId($email);
+                $email->set('messageId', '<' . $messageId . '>');
            } else {
-                $messageId = '' . md5($email->get('name')) . '/' . time() . '/' . $rand .  '@espo';
-            }
-            if ($email->get('isSystem')) {
-                $messageId .= '-system';
+                $messageId = substr($messageId, 1, strlen($messageId) - 2);
            }

            $messageIdHeader = new \Zend\Mail\Header\MessageId();
@@ -344,7 +358,6 @@ class Sender

            $this->transport->send($message);

-            $email->set('messageId', '<' . $messageId . '>');
            $email->set('status', 'Sent');
            $email->set('dateSent', date("Y-m-d H:i:s"));
        } catch (\Exception $e) {
@@ -353,5 +366,21 @@ class Sender

        $this->useGlobal();
    }
+
+    static public function generateMessageId(Email $email)
+    {
+        $rand = mt_rand(1000, 9999);
+
+        if ($email->get('parentType') && $email->get('parentId')) {
+            $messageId = '' . $email->get('parentType') .'/' . $email->get('parentId') . '/' . time() . '/' . $rand . '@espo';
+        } else {
+            $messageId = '' . md5($email->get('name')) . '/' . time() . '/' . $rand .  '@espo';
+        }
+        if ($email->get('isSystem')) {
+            $messageId .= '-system';
+        }
+
+        return $messageId;
+    }
 }

@@ -53,6 +53,13 @@ class Base implements Injectable
    {
    }

+    protected function addDependencyList(array $list)
+    {
+        foreach ($list as $item) {
+            $this->addDependency($item);
+        }
+    }
+
    protected function addDependency($name)
    {
        $this->dependencies[] = $name;
@@ -31,46 +31,180 @@ namespace Espo\Core\ORM;

 class Entity extends \Espo\ORM\Entity
 {
+    public function hasLinkMultipleField($field)
+    {
+        return $this->hasAttribute($field . 'Ids');
+    }
+
+    public function hasLinkField($field)
+    {
+        return $this->hasAttribute($field . 'Id');
+    }

    public function loadLinkMultipleField($field, $columns = null)
    {
-        if ($this->hasRelation($field) && $this->hasField($field . 'Ids')) {
+        if (!$this->hasRelation($field) || !$this->hasAttribute($field . 'Ids')) return;

-            $defs = array();
-            if (!empty($columns)) {
-                $defs['additionalColumns'] = $columns;
-            }
+        $defs = array();
+        if (!empty($columns)) {
+            $defs['additionalColumns'] = $columns;
+        }

-            $collection = $this->get($field, $defs);
-            $ids = array();
-            $names = new \stdClass();
-            $types = new \stdClass();
-            if (!empty($columns)) {
-                $columnsData = new \stdClass();
-            }
+        $collection = $this->get($field, $defs);
+        $ids = array();
+        $names = new \stdClass();
+        $types = new \stdClass();
+        if (!empty($columns)) {
+            $columnsData = new \stdClass();
+        }

-            if ($collection) {
-                foreach ($collection as $e) {
-                    $id = $e->id;
-                    $ids[] = $id;
-                    $names->$id = $e->get('name');
-                    $types->$id = $e->get('type');
-                    if (!empty($columns)) {
-                        $columnsData->$id = new \stdClass();
-                        foreach ($columns as $column => $f) {
-                            $columnsData->$id->$column = $e->get($f);
-                        }
+        if ($collection) {
+            foreach ($collection as $e) {
+                $id = $e->id;
+                $ids[] = $id;
+                $names->$id = $e->get('name');
+                $types->$id = $e->get('type');
+                if (!empty($columns)) {
+                    $columnsData->$id = new \stdClass();
+                    foreach ($columns as $column => $f) {
+                        $columnsData->$id->$column = $e->get($f);
                    }
                }
            }
+        }

-            $this->set($field . 'Ids', $ids);
-            $this->set($field . 'Names', $names);
-            $this->set($field . 'Types', $types);
-            if (!empty($columns)) {
-                $this->set($field . 'Columns', $columnsData);
+        $this->set($field . 'Ids', $ids);
+        $this->set($field . 'Names', $names);
+        $this->set($field . 'Types', $types);
+        if (!empty($columns)) {
+            $this->set($field . 'Columns', $columnsData);
+        }
+    }
+
+    public function loadLinkField($field)
+    {
+        if (!$this->hasRelation($field) || !$this->hasAttribute($field . 'Id')) return;
+        if ($this->getRelationType($field) !== 'hasOne' && $this->getRelationType($field) !== 'belongsTo') return;
+
+        $entity = $this->get($field);
+
+        $entityId = null;
+        $entityName = null;
+        if ($entity) {
+            $entityId = $entity->id;
+            $entityName = $entity->get('name');
+        }
+
+        $this->set($field . 'Id', $entityId);
+        $this->set($field . 'Name', $entityName);
+    }
+
+    public function getLinkMultipleColumn($field, $column, $id)
+    {
+        $columnsField = $field . 'Columns';
+
+        if (!$this->has($columnsField)) {
+            return;
+        }
+        $columns = $this->get($columnsField);
+        if ($columns instanceof \StdClass) {
+            if (isset($columns->$id)) {
+                if (isset($columns->$id->$column)) {
+                    return $columns->$id->$column;
+                }
            }
        }
    }
+
+    public function setLinkMultipleColumn($field, $column, $id, $value)
+    {
+        $columnsField = $field . 'Columns';
+        if (!$this->hasField($columnsField)) {
+            return;
+        }
+        $object = $this->get($columnsField);
+        if (!isset($object) || !($object instanceof \StdClass)) {
+            $object = (object) [];
+        }
+        if (!isset($object->$id)) {
+            $object->$id = (object) [];
+        }
+        if (!isset($object->$id->$column)) {
+            $object->$id->$column = (object) [];
+        }
+
+        $object->$id->$column = $value;
+        $this->set($columnsField, $object);
+    }
+
+    public function setLinkMultipleIdList($field, array $idList)
+    {
+        $idsField = $field . 'Ids';
+        $this->set($idsField, $idList);
+    }
+
+    public function addLinkMultipleId($field, $id)
+    {
+        $idsField = $field . 'Ids';
+
+        if (!$this->hasField($idsField)) return;
+
+        if (!$this->has($idsField)) {
+            if (!$this->isNew()) {
+                $this->loadLinkMultipleField($field);
+            } else {
+                $this->set($idsField, []);
+            }
+        }
+        if (!$this->has($idsField)) {
+            return;
+        }
+        $idList = $this->get($idsField);
+        if (!in_array($id, $idList)) {
+            $idList[] = $id;
+            $this->set($idsField, $idList);
+        }
+    }
+
+    public function getLinkMultipleIdList($field)
+    {
+        $idsField = $field . 'Ids';
+
+        if (!$this->hasAttribute($idsField)) return null;
+
+        if (!$this->has($idsField)) {
+            if (!$this->isNew()) {
+                $this->loadLinkMultipleField($field);
+            }
+        }
+        $valueList = $this->get($idsField);
+        if (empty($valueList)) {
+            return [];
+        }
+        return $valueList;
+    }
+
+    public function hasLinkMultipleId($field, $id)
+    {
+        $idsField = $field . 'Ids';
+
+        if (!$this->hasAttribute($idsField)) return null;
+
+        if (!$this->has($idsField)) {
+            if (!$this->isNew()) {
+                $this->loadLinkMultipleField($field);
+            }
+        }
+
+        if (!$this->has($idsField)) {
+            return;
+        }
+
+        $idList = $this->get($idsField);
+        if (in_array($id, $idList)) {
+            return true;
+        }
+        return false;
+    }
 }

@@ -47,6 +47,18 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable

    private $restoreData = null;

+    protected function addDependency($name)
+    {
+        $this->dependencies[] = $name;
+    }
+
+    protected function addDependencyList(array $list)
+    {
+        foreach ($list as $item) {
+            $this->addDependency($item);
+        }
+    }
+
    public function inject($name, $object)
    {
        $this->injections[$name] = $object;
@@ -67,6 +79,16 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
        return $this->getInjection('metadata');
    }

+    public function __construct($entityType, EntityManager $entityManager, EntityFactory $entityFactory)
+    {
+        parent::__construct($entityType, $entityManager, $entityFactory);
+        $this->init();
+    }
+
+    protected function init()
+    {
+    }
+
    public function handleSelectParams(&$params)
    {
        $this->handleEmailAddressParams($params);
@@ -76,7 +98,7 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable

    protected function handleCurrencyParams(&$params)
    {
-        $entityName = $this->entityName;
+        $entityType = $this->entityType;

        $metadata = $this->getMetadata();

@@ -84,7 +106,7 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
            return;
        }

-        $defs = $metadata->get('entityDefs.' . $entityName);
+        $defs = $metadata->get('entityDefs.' . $entityType);

        foreach ($defs['fields'] as $field => $d) {
            if (isset($d['type']) && $d['type'] == 'currency') {
@@ -96,7 +118,7 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
                }
                $alias = Util::toUnderScore($field) . "_currency_alias";
                $params['customJoin'] .= "
-                    LEFT JOIN currency AS `{$alias}` ON {$alias}.id = ".Util::toUnderScore($entityName).".".Util::toUnderScore($field)."_currency
+                    LEFT JOIN currency AS `{$alias}` ON {$alias}.id = ".Util::toUnderScore($entityType).".".Util::toUnderScore($field)."_currency
                ";
            }
        }
@@ -105,9 +127,9 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable

    protected function handleEmailAddressParams(&$params)
    {
-        $entityName = $this->entityName;
+        $entityType = $this->entityType;

-        $defs = $this->getEntityManager()->getMetadata()->get($entityName);
+        $defs = $this->getEntityManager()->getMetadata()->get($entityType);
        if (!empty($defs['relations']) && array_key_exists('emailAddresses', $defs['relations'])) {
            if (empty($params['leftJoins'])) {
                $params['leftJoins'] = array();
@@ -127,9 +149,9 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable

    protected function handlePhoneNumberParams(&$params)
    {
-        $entityName = $this->entityName;
+        $entityType = $this->entityType;

-        $defs = $this->getEntityManager()->getMetadata()->get($entityName);
+        $defs = $this->getEntityManager()->getMetadata()->get($entityType);
        if (!empty($defs['relations']) && array_key_exists('phoneNumbers', $defs['relations'])) {
            if (empty($params['leftJoins'])) {
                $params['leftJoins'] = array();
@@ -150,13 +172,13 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
    protected function beforeRemove(Entity $entity, array $options = array())
    {
        parent::beforeRemove($entity, $options);
-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeRemove', $entity, $options);
+        $this->getEntityManager()->getHookManager()->process($this->entityType, 'beforeRemove', $entity, $options);

        $nowString = date('Y-m-d H:i:s', time());
-        if ($entity->hasField('modifiedAt')) {
+        if ($entity->hasAttribute('modifiedAt')) {
            $entity->set('modifiedAt', $nowString);
        }
-        if ($entity->hasField('modifiedById')) {
+        if ($entity->hasAttribute('modifiedById')) {
            $entity->set('modifiedById', $this->getEntityManager()->getUser()->id);
        }
    }
@@ -164,23 +186,52 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
    protected function afterRemove(Entity $entity, array $options = array())
    {
        parent::afterRemove($entity, $options);
-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'afterRemove', $entity, $options);
+        $this->getEntityManager()->getHookManager()->process($this->entityType, 'afterRemove', $entity, $options);
    }

    public function remove(Entity $entity, array $options = array())
    {
        $result = parent::remove($entity, $options);
        if ($result) {
-            $this->getEntityManager()->getHookManager()->process($this->entityName, 'afterRemove', $entity, $options);
+            $this->getEntityManager()->getHookManager()->process($this->entityType, 'afterRemove', $entity, $options);
        }
        return $result;
    }

+    protected function afterRelate(Entity $entity, $relationName, $foreign, $data = null, array $options = array())
+    {
+        parent::afterRelate($entity, $relationName, $foreign, $data, $options);
+
+        if ($foreign instanceof Entity) {
+            $foreignEntity = $foreign;
+            $hookData = array(
+                'relationName' => $relationName,
+                'relationData' => $data,
+                'foreignEntity' => $foreignEntity
+            );
+            $this->getEntityManager()->getHookManager()->process($this->entityType, 'afterRelate', $entity, $options, $hookData);
+        }
+    }
+
+    protected function afterUnrelate(Entity $entity, $relationName, $foreign, array $options = array())
+    {
+        parent::afterUnrelate($entity, $relationName, $foreign, $options);
+
+        if ($foreign instanceof Entity) {
+            $foreignEntity = $foreign;
+            $hookData = array(
+                'relationName' => $relationName,
+                'foreignEntity' => $foreignEntity
+            );
+            $this->getEntityManager()->getHookManager()->process($this->entityType, 'afterUnrelate', $entity, $options, $hookData);
+        }
+    }
+
    protected function beforeSave(Entity $entity, array $options = array())
    {
        parent::beforeSave($entity, $options);

-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeSave', $entity, $options);
+        $this->getEntityManager()->getHookManager()->process($this->entityType, 'beforeSave', $entity, $options);
    }

    protected function afterSave(Entity $entity, array $options = array())
@@ -191,11 +242,12 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
        }
        parent::afterSave($entity, $options);

-        $this->handleEmailAddressSave($entity);
-        $this->handlePhoneNumberSave($entity);
-        $this->handleSpecifiedRelations($entity);
+        $this->processEmailAddressSave($entity);
+        $this->processPhoneNumberSave($entity);
+        $this->processSpecifiedRelationsSave($entity);
+        $this->processFileFieldsSave($entity);

-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'afterSave', $entity, $options);
+        $this->getEntityManager()->getHookManager()->process($this->entityType, 'afterSave', $entity, $options);
    }

    public function save(Entity $entity, array $options = array())
@@ -208,41 +260,55 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
                $entity->set('id', Util::generateId());
            }

-            if ($entity->hasField('createdAt')) {
-                $entity->set('createdAt', $nowString);
+            if ($entity->hasAttribute('createdAt')) {
+                if (empty($options['import']) || !$entity->has('createdAt')) {
+                    $entity->set('createdAt', $nowString);
+                }
            }
-            if ($entity->hasField('modifiedAt')) {
+            if ($entity->hasAttribute('modifiedAt')) {
                $entity->set('modifiedAt', $nowString);
            }
-            if ($entity->hasField('createdById')) {
-                $entity->set('createdById', $this->entityManager->getUser()->id);
+            if ($entity->hasAttribute('createdById')) {
+                if (empty($options['import']) || !$entity->has('createdById')) {
+                    $entity->set('createdById', $this->getEntityManager()->getUser()->id);
+                }
            }

            if ($entity->has('modifiedById')) {
                $restoreData['modifiedById'] = $entity->get('modifiedById');
            }
+            if ($entity->has('modifiedByName')) {
+                $restoreData['modifiedByName'] = $entity->get('modifiedByName');
+            }
            if ($entity->has('modifiedAt')) {
                $restoreData['modifiedAt'] = $entity->get('modifiedAt');
            }
            $entity->clear('modifiedById');
+            $entity->clear('modifiedByName');
        } else {
            if (empty($options['silent'])) {
-                if ($entity->hasField('modifiedAt')) {
+                if ($entity->hasAttribute('modifiedAt')) {
                    $entity->set('modifiedAt', $nowString);
                }
-                if ($entity->hasField('modifiedById')) {
-                    $entity->set('modifiedById', $this->entityManager->getUser()->id);
+                if ($entity->hasAttribute('modifiedById')) {
+                    $entity->set('modifiedById', $this->getEntityManager()->getUser()->id);
+                    $entity->set('modifiedByName', $this->getEntityManager()->getUser()->get('name'));
                }
            }

            if ($entity->has('createdById')) {
-                $restoreData['createdById'] = $entity->get('createdById');
+                if (empty($options['import'])) {
+                    $restoreData['createdById'] = $entity->get('createdById');
+                    $entity->clear('createdById');
+                }
            }
+
            if ($entity->has('createdAt')) {
-                $restoreData['createdAt'] = $entity->get('createdAt');
+                if (empty($options['import'])) {
+                    $restoreData['createdAt'] = $entity->get('createdAt');
+                    $entity->clear('createdAt');
+                }
            }
-            $entity->clear('createdById');
-            $entity->clear('createdAt');
        }
        $this->restoreData = $restoreData;

@@ -251,30 +317,51 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
        return $result;
    }

-    protected function handleEmailAddressSave(Entity $entity)
+    protected function processFileFieldsSave(Entity $entity)
    {
-        if ($entity->hasRelation('emailAddresses') && $entity->hasField('emailAddress')) {
+        foreach ($entity->getRelations() as $name => $defs) {
+            if (!isset($defs['type']) || !isset($defs['entity'])) continue;
+            if (!($defs['type'] === $entity::BELONGS_TO && $defs['entity'] === 'Attachment')) continue;
+
+            $attribute = $name . 'Id';
+            if (!$entity->hasAttribute($attribute)) continue;
+            if (!$entity->get($attribute)) continue;
+            if (!$entity->isAttributeChanged($attribute)) continue;
+
+            $attachment = $this->getEntityManager()->getEntity('Attachment', $entity->get($attribute));
+            if (!$attachment) continue;
+            $attachment->set(array(
+                'relatedId' => $entity->id,
+                'relatedType' => $entity->getEntityType()
+            ));
+            $this->getEntityManager()->saveEntity($attachment);
+        }
+    }
+
+    protected function processEmailAddressSave(Entity $entity)
+    {
+        if ($entity->hasRelation('emailAddresses') && $entity->hasAttribute('emailAddress')) {
            $emailAddressRepository = $this->getEntityManager()->getRepository('EmailAddress')->storeEntityEmailAddress($entity);
        }
    }

-    protected function handlePhoneNumberSave(Entity $entity)
+    protected function processPhoneNumberSave(Entity $entity)
    {
-        if ($entity->hasRelation('phoneNumbers') && $entity->hasField('phoneNumber')) {
+        if ($entity->hasRelation('phoneNumbers') && $entity->hasAttribute('phoneNumber')) {
            $emailAddressRepository = $this->getEntityManager()->getRepository('PhoneNumber')->storeEntityPhoneNumber($entity);
        }
    }

-    protected function handleSpecifiedRelations(Entity $entity)
+    protected function processSpecifiedRelationsSave(Entity $entity)
    {
-        $relationTypes = array($entity::HAS_MANY, $entity::MANY_MANY, $entity::HAS_CHILDREN);
+        $relationTypeList = [$entity::HAS_MANY, $entity::MANY_MANY, $entity::HAS_CHILDREN];
        foreach ($entity->getRelations() as $name => $defs) {
-            if (in_array($defs['type'], $relationTypes)) {
+            if (in_array($defs['type'], $relationTypeList)) {
                $fieldName = $name . 'Ids';
                $columnsFieldsName = $name . 'Columns';

-                if ($entity->has($fieldName) || $entity->has($columnsFieldsName)) {

+                if ($entity->has($fieldName) || $entity->has($columnsFieldsName)) {
                    if ($this->getMetadata()->get("entityDefs." . $entity->getEntityType() . ".fields.{$name}.noSave")) {
                        continue;
                    }
@@ -330,15 +417,16 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
                            } else {
                                if (!empty($columns)) {
                                    foreach ($columns as $columnName => $columnField) {
-                                        if ($columnData->$id->$columnName != $existingColumnsData->$id->$columnName) {
-                                            $toUpdateIds[] = $id;
+                                        if (isset($columnData->$id)) {
+                                            if ($columnData->$id->$columnName !== $existingColumnsData->$id->$columnName) {
+                                                $toUpdateIds[] = $id;
+                                            }
                                        }
                                    }
                                }
                            }
                        }

-
                        foreach ($specifiedIds as $id) {
                            if (!in_array($id, $existingIds)) {
                                $data = null;
@@ -359,6 +447,42 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
                        }
                    }
                }
+            } else if ($defs['type'] === $entity::HAS_ONE) {
+                if (empty($defs['entity']) || empty($defs['foreignKey'])) continue;
+
+                if ($this->getMetadata()->get("entityDefs." . $entity->getEntityType() . ".fields.{$name}.noSave")) {
+                    continue;
+                }
+
+                $foreignEntityType = $defs['entity'];
+                $foreignKey = $defs['foreignKey'];
+                $idFieldName = $name . 'Id';
+                $nameFieldName = $name . 'Name';
+
+                if (!$entity->has($idFieldName)) continue;
+
+                $where = array();
+                $where[$foreignKey] = $entity->id;
+                $previousForeignEntity = $this->getEntityManager()->getRepository($foreignEntityType)->where($where)->findOne();
+                if ($previousForeignEntity) {
+                    $entity->setFetched($idFieldName, $previousForeignEntity->id);
+                    if ($previousForeignEntity->id !== $entity->get($idFieldName)) {
+                        $previousForeignEntity->set($foreignKey, null);
+                        $this->getEntityManager()->saveEntity($previousForeignEntity);
+                    }
+                } else {
+                    $entity->setFetched($idFieldName, null);
+                }
+
+                if ($entity->get($idFieldName)) {
+                    $newForeignEntity = $this->getEntityManager()->getEntity($foreignEntityType, $entity->get($idFieldName));
+                    if ($newForeignEntity) {
+                        $newForeignEntity->set($foreignKey, $entity->id);
+                        $this->getEntityManager()->saveEntity($newForeignEntity);
+                    } else {
+                        $entity->set($idFieldName, null);
+                    }
+                }
            }
        }
    }
@@ -31,12 +31,18 @@ namespace Espo\Core\ORM;

 use \Espo\Core\Interfaces\Injectable;

+use \Espo\ORM\EntityFactory;
+
 abstract class Repository extends \Espo\ORM\Repository implements Injectable
 {
    protected $dependencies = array();

    protected $injections = array();

+    protected function init()
+    {
+    }
+
    public function inject($name, $object)
    {
        $this->injections[$name] = $object;
@@ -51,5 +57,23 @@ abstract class Repository extends \Espo\ORM\Repository implements Injectable
    {
        return $this->dependencies;
    }
+
+    protected function addDependencyList(array $list)
+    {
+        foreach ($list as $item) {
+            $this->addDependency($item);
+        }
+    }
+
+    protected function addDependency($name)
+    {
+        $this->dependencies[] = $name;
+    }
+
+    public function __construct($entityType, EntityManager $entityManager, EntityFactory $entityFactory)
+    {
+        parent::__construct($entityType, $entityManager, $entityFactory);
+        $this->init();
+    }
 }

@@ -29,7 +29,7 @@

 namespace Espo\Core\Pdf;

-require "vendor/tecnick.com/tcpdf/tcpdf.php";
+require "vendor/tecnickcom/tcpdf/tcpdf.php";

 class Tcpdf extends \TCPDF
 {
@@ -0,0 +1,57 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Portal;
+
+use \Espo\ORM\Entity;
+use \Espo\Entities\User;
+
+class Acl extends \Espo\Core\Acl
+{
+    public function checkReadOnlyAccount($scope)
+    {
+        return $this->getAclManager()->checkReadOnlyAccount($this->getUser(), $scope);
+    }
+
+    public function checkReadOnlyContact($scope)
+    {
+        return $this->getAclManager()->checkReadOnlyContact($this->getUser(), $scope);
+    }
+
+    public function checkInAccount(Entity $entity)
+    {
+        return $this->getAclManager()->checkInAccount($this->getUser(), $entity);
+    }
+
+    public function checkIsOwnContact(Entity $entity)
+    {
+        return $this->getAclManager()->checkIsOwnContact($this->getUser(), $entity);
+    }
+}
+
@@ -0,0 +1,260 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Portal;
+
+use \Espo\ORM\Entity;
+use \Espo\Entities\User;
+use \Espo\Core\Utils\Util;
+
+class AclManager extends \Espo\Core\AclManager
+{
+    protected $tableClassName = '\\Espo\\Core\\AclPortal\\Table';
+
+    private $mainManager = null;
+
+    private $portal = null;
+
+    public function getImplementation($scope)
+    {
+        if (empty($this->implementationHashMap[$scope])) {
+            $normalizedName = Util::normilizeClassName($scope);
+
+            $className = '\\Espo\\Custom\\AclPortal\\' . $normalizedName;
+            if (!class_exists($className)) {
+                $moduleName = $this->getMetadata()->getScopeModuleName($scope);
+                if ($moduleName) {
+                    $className = '\\Espo\\Modules\\' . $moduleName . '\\AclPortal\\' . $normalizedName;
+                } else {
+                    $className = '\\Espo\\AclPortal\\' . $normalizedName;
+                }
+                if (!class_exists($className)) {
+                    $className = '\\Espo\\Core\\AclPortal\\Base';
+                }
+            }
+
+            if (class_exists($className)) {
+                $acl = new $className($scope);
+                $dependencies = $acl->getDependencyList();
+                foreach ($dependencies as $name) {
+                    $acl->inject($name, $this->getContainer()->get($name));
+                }
+                $this->implementationHashMap[$scope] = $acl;
+            } else {
+                throw new Error();
+            }
+        }
+
+        return $this->implementationHashMap[$scope];
+    }
+
+    public function setMainManager($mainManager)
+    {
+        $this->mainManager = $mainManager;
+    }
+
+    protected function getMainManager()
+    {
+        return $this->mainManager;
+    }
+
+    public function setPortal($portal)
+    {
+        $this->portal = $portal;
+    }
+
+    protected function getPortal()
+    {
+        if ($this->portal) {
+            return $this->portal;
+        }
+        return $this->getContainer()->get('portal');
+    }
+
+    protected function getTable(User $user)
+    {
+        $key = $user->id;
+        if (empty($key)) {
+            $key = spl_object_hash($user);
+        }
+
+        if (empty($this->tableHashMap[$key])) {
+            $config = $this->getContainer()->get('config');
+            $fileManager = $this->getContainer()->get('fileManager');
+            $metadata = $this->getContainer()->get('metadata');
+            $fieldManager = $this->getContainer()->get('fieldManager');
+            $portal = $this->getPortal();
+
+            $this->tableHashMap[$key] = new $this->tableClassName($user, $portal, $config, $fileManager, $metadata, $fieldManager);
+        }
+
+        return $this->tableHashMap[$key];
+    }
+
+    public function checkReadOnlyAccount(User $user, $scope)
+    {
+        if ($user->isAdmin()) {
+            return false;
+        }
+        $data = $this->getTable($user)->getScopeData($scope);
+        return $this->getImplementation($scope)->checkReadOnlyAccount($user, $data);
+    }
+
+    public function checkReadOnlyContact(User $user, $scope)
+    {
+        if ($user->isAdmin()) {
+            return false;
+        }
+        $data = $this->getTable($user)->getScopeData($scope);
+        return $this->getImplementation($scope)->checkReadOnlyContact($user, $data);
+    }
+
+    public function checkInAccount(User $user, Entity $entity, $action)
+    {
+        return $this->getImplementation($entity->getEntityType())->checkInAccount($user, $entity);
+    }
+
+    public function checkIsOwnContact(User $user, Entity $entity, $action)
+    {
+        return $this->getImplementation($entity->getEntityType())->checkIsOwnContact($user, $entity);
+    }
+
+    public function getMap(User $user)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->getMap($user);
+        }
+        return parent::getMap($user);
+    }
+
+    public function getLevel(User $user, $scope, $action)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->getLevel($user, $scope, $action);
+        }
+        return parent::getLevel($user, $scope, $action);
+    }
+
+    public function get(User $user, $permission)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->get($user, $permission);
+        }
+        return parent::get($user, $permission);
+    }
+
+    public function checkReadOnlyTeam(User $user, $scope)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            $data = $this->getTable($user)->getScopeData($scope);
+            return $this->getMainManager()->checkReadOnlyTeam($user, $data);
+        }
+        return parent::checkReadOnlyTeam($user, $scope);
+    }
+
+    public function checkReadOnlyOwn(User $user, $scope)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            $data = $this->getTable($user)->getScopeData($scope);
+            return $this->getMainManager()->checkReadOnlyOwn($user, $data);
+        }
+        return parent::checkReadOnlyOwn($user, $scope);
+    }
+
+    public function check(User $user, $subject, $action = null)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->check($user, $subject, $action);
+        }
+        return parent::check($user, $subject, $action);
+    }
+
+    public function checkEntity(User $user, Entity $entity, $action = 'read')
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkEntity($user, $entity, $action);
+        }
+        return parent::checkEntity($user, $entity, $action);
+    }
+
+    public function checkIsOwner(User $user, Entity $entity)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkIsOwner($user, $entity);
+        }
+        return parent::checkIsOwner($user, $entity);
+    }
+
+    public function checkInTeam(User $user, Entity $entity)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkInTeam($user, $entity);
+        }
+        return parent::checkInTeam($user, $entity);
+    }
+
+    public function checkScope(User $user, $scope, $action = null)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkScope($user, $scope, $action);
+        }
+        return parent::checkScope($user, $scope, $action);
+    }
+
+    public function checkUser(User $user, $permission, User $entity)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkUser($user, $permission, $entity);
+        }
+        return parent::checkUser($user, $permission, $entity);
+    }
+
+    public function getScopeForbiddenAttributeList(User $user, $scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->getScopeForbiddenAttributeList($user, $scope, $action, $thresholdLevel);
+        }
+        return parent::getScopeForbiddenAttributeList($user, $scope, $action, $thresholdLevel);
+    }
+
+    public function getScopeForbiddenFieldList(User $user, $scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->getScopeForbiddenFieldList($user, $scope, $action, $thresholdLevel);
+        }
+        return parent::getScopeForbiddenFieldList($user, $scope, $action, $thresholdLevel);
+    }
+
+    protected function checkUserIsNotPortal($user)
+    {
+        return !$user->get('isPortalUser');
+    }
+
+}
+
@@ -0,0 +1,104 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Portal;
+
+use \Espo\Core\Exceptions\Error;
+use \Espo\Core\Exceptions\NotFound;
+use \Espo\Core\Exceptions\Forbidden;
+
+class Application extends \Espo\Core\Application
+{
+    public function __construct($portalId)
+    {
+        date_default_timezone_set('UTC');
+
+        $this->initContainer();
+
+        if (empty($portalId)) {
+            throw new Error("Portal id was not passed to ApplicationPortal.");
+        }
+
+        $GLOBALS['log'] = $this->getContainer()->get('log');
+
+        $portal = $this->getContainer()->get('entityManager')->getEntity('Portal', $portalId);
+
+        if (!$portal) {
+            $portal = $this->getContainer()->get('entityManager')->getRepository('Portal')->where(array(
+                'customId' => $portalId
+            ))->findOne();
+        }
+
+        if (!$portal) {
+            throw new NotFound();
+        }
+        if (!$portal->get('isActive')) {
+            throw new Forbidden("Portal is not active.");
+        }
+
+        $this->portal = $portal;
+
+        $this->getContainer()->setPortal($portal);
+
+        $this->initAutoloads();
+    }
+
+    protected function getPortal()
+    {
+        return $this->portal;
+    }
+
+    protected function initContainer()
+    {
+        $this->container = new Container();
+    }
+
+    protected function getRouteList()
+    {
+        $routeList = parent::getRouteList();
+        foreach ($routeList as $i => $route) {
+            if (isset($route['route'])) {
+                if ($route['route']{0} !== '/') {
+                    $route['route'] = '/' . $route['route'];
+                }
+                $route['route'] = '/:portalId' . $route['route'];
+            }
+            $routeList[$i] = $route;
+        }
+        return $routeList;
+    }
+
+    public function runClient()
+    {
+        $this->getContainer()->get('clientManager')->display(null, 'html/portal.html', array(
+            'portalId' => $this->getPortal()->id
+        ));
+    }
+}
+
@@ -0,0 +1,141 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Portal;
+
+class Container extends \Espo\Core\Container
+{
+    protected function getServiceClassName($name, $default)
+    {
+        $metadata = $this->get('metadata');
+        $className = $metadata->get('app.serviceContainerPortal.classNames.' . $name, $default);
+        return $className;
+    }
+
+    protected function getServiceMainClassName($name, $default)
+    {
+        $metadata = $this->get('metadata');
+        $className = $metadata->get('app.serviceContainer.classNames.' . $name, $default);
+        return $className;
+    }
+
+    protected function loadAclManager()
+    {
+        $className = $this->getServiceClassName('aclManager', '\\Espo\\Core\\Portal\\AclManager');
+        $mainClassName = $this->getServiceMainClassName('aclManager', '\\Espo\\Core\\AclManager');
+
+        $obj = new $className(
+            $this->get('container')
+        );
+        $objMain = new $mainClassName(
+            $this->get('container')
+        );
+        $obj->setMainManager($objMain);
+
+        return $obj;
+    }
+
+    protected function loadAcl()
+    {
+        $className = $this->getServiceClassName('acl', '\\Espo\\Core\\Portal\\Acl');
+        return new $className(
+            $this->get('aclManager'),
+            $this->get('user')
+        );
+    }
+
+    protected function loadThemeManager()
+    {
+        return new \Espo\Core\Portal\Utils\ThemeManager(
+            $this->get('config'),
+            $this->get('metadata'),
+            $this->get('portal')
+        );
+    }
+
+    protected function loadLayout()
+    {
+        return new \Espo\Core\Portal\Utils\Layout(
+            $this->get('fileManager'),
+            $this->get('metadata'),
+            $this->get('user')
+        );
+    }
+
+    protected function loadLanguage()
+    {
+        $language = new \Espo\Core\Portal\Utils\Language(
+            \Espo\Core\Utils\Language::detectLanguage($this->get('config'), $this->get('preferences')),
+            $this->get('fileManager'),
+            $this->get('metadata'),
+            $this->get('useCache')
+        );
+        $language->setPortal($this->get('portal'));
+        return $language;
+    }
+
+    public function setPortal(\Espo\Entities\Portal $portal)
+    {
+        $this->set('portal', $portal);
+
+        $data = array();
+        foreach ($this->get('portal')->getSettingsAttributeList() as $attribute) {
+            $data[$attribute] = $this->get('portal')->get($attribute);
+        }
+        if (empty($data['language'])) {
+            unset($data['language']);
+        }
+        if (empty($data['theme'])) {
+            unset($data['theme']);
+        }
+        if (empty($data['timeZone'])) {
+            unset($data['timeZone']);
+        }
+        if (empty($data['dateFormat'])) {
+            unset($data['dateFormat']);
+        }
+        if (empty($data['timeFormat'])) {
+            unset($data['timeFormat']);
+        }
+        if (isset($data['weekStart']) && $data['weekStart'] === -1) {
+            unset($data['weekStart']);
+        }
+        if (array_key_exists('weekStart', $data) && is_null($data['weekStart'])) {
+            unset($data['weekStart']);
+        }
+        if (empty($data['defaultCurrency'])) {
+            unset($data['defaultCurrency']);
+        }
+
+        foreach ($data as $attribute => $value) {
+            $this->get('config')->set($attribute, $value, true);
+        }
+    }
+}
+
@@ -0,0 +1,45 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Portal\Utils;
+
+use \Espo\Entities\Portal;
+
+class Language extends \Espo\Core\Utils\Language
+{
+    public function setPortal($portal)
+    {
+        if ($portal->get('language') !== '' && $portal->get('language')) {
+            if (!$this->getPreferences()->get('language')) {
+                $this->setLanguage($portal->get('language'));
+            }
+        }
+    }
+
+}
@@ -0,0 +1,129 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Portal\Utils;
+
+use \Espo\Core\Utils\Util;
+use \Espo\Core\Utils\Json;
+
+class Layout extends \Espo\Core\Utils\Layout
+{
+    public function get($scope, $name)
+    {
+        $scope = $this->sanitizeInput($scope);
+        $name = $this->sanitizeInput($name);
+
+        if (isset($this->changedData[$scope][$name])) {
+            return Json::encode($this->changedData[$scope][$name]);
+        }
+
+        $fileFullPath = Util::concatPath($this->getLayoutPath($scope, true), 'portal/' . $name . '.json');
+
+        if (!file_exists($fileFullPath)) {
+            $fileFullPath = Util::concatPath($this->getLayoutPath($scope), 'portal/' . $name . '.json');
+        }
+        if (!file_exists($fileFullPath)) {
+            $fileFullPath = Util::concatPath($this->getLayoutPath($scope, true), $name . '.json');
+        }
+        if (!file_exists($fileFullPath)) {
+            $fileFullPath = Util::concatPath($this->getLayoutPath($scope), $name . '.json');
+        }
+
+
+        if (!file_exists($fileFullPath)) {
+            $defaultPath = $this->params['defaultsPath'];
+            $fileFullPath = Util::concatPath(Util::concatPath($defaultPath, 'layouts'), $name . '.json' );
+
+            if (!file_exists($fileFullPath)) {
+                return false;
+            }
+        }
+
+        return $this->getFileManager()->getContents($fileFullPath);
+    }
+
+
+    public function set($data, $scope, $name)
+    {
+        $scope = $this->sanitizeInput($scope);
+        $name = $this->sanitizeInput($name);
+
+        if (empty($scope) || empty($name)) {
+            return false;
+        }
+
+        $this->changedData[$scope][$name] = $data;
+    }
+
+    public function resetToDefault($scope, $name)
+    {
+        $scope = $this->sanitizeInput($scope);
+        $name = $this->sanitizeInput($name);
+
+        $filePath = 'custom/Espo/Custom/Resources/layouts/' . $scope . '/' . $name . '.json';
+        if ($this->getFileManager()->isFile($filePath)) {
+            $this->getFileManager()->removeFile($filePath);
+        }
+        if (!empty($this->changedData[$scope]) && !empty($this->changedData[$scope][$name])) {
+            unset($this->changedData[$scope][$name]);
+        }
+        return $this->get($scope, $name);
+    }
+
+    /**
+     * Save changes
+     *
+     * @return bool
+     */
+    public function save()
+    {
+        $result = true;
+
+        if (!empty($this->changedData)) {
+            foreach ($this->changedData as $scope => $rowData) {
+                foreach ($rowData as $layoutName => $layoutData) {
+                    if (empty($scope) || empty($layoutName)) {
+                        continue;
+                    }
+                    $layoutPath = $this->getLayoutPath($scope, true);
+                    $data = Json::encode($layoutData, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
+
+                    $result &= $this->getFileManager()->putContents(array($layoutPath, $layoutName.'.json'), $data);
+                }
+            }
+        }
+
+        if ($result == true) {
+            $this->clearChanges();
+        }
+
+        return (bool) $result;
+    }
+
+}
@@ -0,0 +1,56 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Portal\Utils;
+
+use \Espo\Entities\Portal;
+
+use \Espo\Core\Utils\Config;
+use \Espo\Core\Utils\Metadata;
+
+class ThemeManager extends \Espo\Core\Utils\ThemeManager
+{
+    public function __construct(Config $config, Metadata $metadata, Portal $portal)
+    {
+        $this->config = $config;
+        $this->metadata = $metadata;
+        $this->portal = $portal;
+    }
+
+    public function getName()
+    {
+        $theme = $this->portal->get('theme');
+        if (!$theme) {
+            $theme = $this->defaultName;
+        }
+        return $theme;
+    }
+}
+
+
@@ -29,11 +29,11 @@

 namespace Espo\Core\Repositories;

-use \Espo\Core\Entities\CategoryTreeItem as Entity;
+use \Espo\ORM\Entity;

 class CategoryTree extends \Espo\Core\ORM\Repositories\RDB
 {
-	public function afterSave(Entity $entity, $options)
+	protected function afterSave(Entity $entity, array $options = array())
 	{
 		parent::afterSave($entity, $options);

@@ -86,7 +86,7 @@ class CategoryTree extends \Espo\Core\ORM\Repositories\RDB
 		}
 	}

-	public function afterRemove(Entity $entity, $options)
+	protected function afterRemove(Entity $entity, array $options = array())
 	{
 		parent::afterRemove($entity, $options);

@@ -0,0 +1,174 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Repositories;
+
+use Espo\ORM\Entity;
+use Espo\Core\Utils\Util;
+
+class Event extends \Espo\Core\ORM\Repositories\RDB
+{
+    protected $reminderDateAttribute = 'dateStart';
+
+    protected function afterRemove(Entity $entity, array $options = array())
+    {
+        $pdo = $this->getEntityManager()->getPDO();
+        $sql = "
+            DELETE FROM `reminder`
+            WHERE
+                entity_id = ".$pdo->quote($entity->id)." AND
+                entity_type = ".$pdo->quote($entity->getEntityType())." AND
+                deleted = 0
+        ";
+        $pdo->query($sql);
+    }
+
+    protected function afterSave(Entity $entity, array $options = array())
+    {
+        parent::afterSave($entity, $options);
+
+        if (
+            $entity->isNew() ||
+            $entity->isAttributeChanged('assignedUserId') ||
+            $entity->isAttributeChanged('usersIds') ||
+            $entity->isAttributeChanged($this->reminderDateAttribute) ||
+            $entity->has('reminders')
+        ) {
+            $pdo = $this->getEntityManager()->getPDO();
+
+            $reminderTypeList = $this->getMetadata()->get('entityDefs.Reminder.fields.type.options');
+
+            if (!$entity->has('reminders')) {
+                $reminderList = $this->getEntityReminderList($entity);
+            } else {
+                $reminderList = $entity->get('reminders');
+            }
+
+            if (!$entity->isNew()) {
+                $sql = "
+                    DELETE FROM `reminder`
+                    WHERE
+                        entity_id = ".$pdo->quote($entity->id)." AND
+                        entity_type = ".$pdo->quote($entity->getEntityType())." AND
+                        deleted = 0
+                ";
+                $pdo->query($sql);
+            }
+
+            if (empty($reminderList) || !is_array($reminderList)) return;
+
+            $entityType = $entity->getEntityType();
+
+            $dateValue = $entity->get($this->reminderDateAttribute);
+
+            if (!$dateValue) {
+                $e = $this->get($entity->id);
+                if ($e) {
+                    $dateValue = $e->get($this->reminderDateAttribute);
+                }
+            }
+
+            if ($entity->hasLinkMultipleField('users')) {
+                $userIdList = $entity->getLinkMultipleIdList('users');
+            } else {
+                $userIdList = [];
+                if ($entity->get('assignedUserId')) {
+                    $userIdList[] = $entity->get('assignedUserId');
+                }
+            }
+
+            if (!$dateValue) return;
+            if (empty($userIdList)) return;
+
+            $dateValueObj = new \DateTime($dateValue);
+            if (!$dateValueObj) return;
+
+            foreach ($reminderList as $item) {
+                $remindAt = clone $dateValueObj;
+                $seconds = intval($item->seconds);
+                $type = $item->type;
+
+                if (!in_array($type , $reminderTypeList)) continue;
+
+                $remindAt->sub(new \DateInterval('PT' . $seconds . 'S'));
+
+                foreach ($userIdList as $userId) {
+                    $id = Util::generateId();
+
+                    $sql = "
+                        INSERT
+                        INTO `reminder`
+                        (id, entity_id, entity_type, `type`, user_id, remind_at, start_at, `seconds`)
+                        VALUES (
+                            ".$pdo->quote($id).",
+                            ".$pdo->quote($entity->id).",
+                            ".$pdo->quote($entityType).",
+                            ".$pdo->quote($type).",
+                            ".$pdo->quote($userId).",
+                            ".$pdo->quote($remindAt->format('Y-m-d H:i:s')).",
+                            ".$pdo->quote($dateValue).",
+                            ".$pdo->quote($seconds)."
+                        )
+                    ";
+                    $pdo->query($sql);
+                }
+            }
+        }
+    }
+
+    public function getEntityReminderList(Entity $entity)
+    {
+        $pdo = $this->getEntityManager()->getPDO();
+        $reminderList = [];
+
+        $sql = "
+            SELECT DISTINCT `seconds`, `type`
+            FROM `reminder`
+            WHERE
+                `entity_type` = ".$pdo->quote($entity->getEntityType())." AND
+                `entity_id` = ".$pdo->quote($entity->id)." AND
+                `deleted` = 0
+            ORDER BY `seconds` ASC
+        ";
+
+        $sth = $pdo->prepare($sql);
+        $sth->execute();
+        $rows = $sth->fetchAll(\PDO::FETCH_ASSOC);
+
+        foreach ($rows as $row) {
+            $o = new \StdClass();
+            $o->seconds = intval($row['seconds']);
+            $o->type = $row['type'];
+            $reminderList[] = $o;
+        }
+
+        return $reminderList;
+    }
+}
+
@@ -43,12 +43,14 @@ class SelectManagerFactory

    private $metadata;

-    public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, $metadata)
+    public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, AclManager $aclManager, Utils\Metadata $metadata, Utils\Config $config)
    {
        $this->entityManager = $entityManager;
        $this->user = $user;
        $this->acl = $acl;
+        $this->aclManager = $aclManager;
        $this->metadata = $metadata;
+        $this->config = $config;
    }

    public function create($entityType)
@@ -68,7 +70,7 @@ class SelectManagerFactory
            }
        }

-        $selectManager = new $className($this->entityManager, $this->user, $this->acl, $this->metadata);
+        $selectManager = new $className($this->entityManager, $this->user, $this->acl, $this->aclManager, $this->metadata, $this->config);
        $selectManager->setEntityType($entityType);

        return $selectManager;
@@ -65,6 +65,13 @@ abstract class Base implements Injectable
        $this->dependencies[] = $name;
    }

+    protected function addDependencyList(array $list)
+    {
+        foreach ($list as $item) {
+            $this->addDependency($item);
+        }
+    }
+
    public function getDependencyList()
    {
        return $this->dependencies;
@@ -0,0 +1,37 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Templates\Controllers;
+
+
+class BasePlus extends \Espo\Core\Controllers\Record
+{
+
+}
+
@@ -0,0 +1,35 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Templates\Controllers;
+
+class Company extends \Espo\Core\Controllers\Record
+{
+
+}
@@ -0,0 +1,36 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Templates\Controllers;
+
+class Event extends \Espo\Core\Controllers\Record
+{
+
+}
+
@@ -0,0 +1,36 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Templates\Entities;
+
+class BasePlus extends \Espo\Core\ORM\Entity
+{
+
+}
+
@@ -0,0 +1,36 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Templates\Entities;
+
+class Company extends \Espo\Core\ORM\Entity
+{
+
+}
+
@@ -0,0 +1,36 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * 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\Templates\Entities;
+
+class Event extends \Espo\Core\ORM\Entity
+{
+
+}
+
@@ -0,0 +1,37 @@
+[
+    {
+        "label": "Overview",
+        "rows": [
+            [
+                {
+                    "name": "name"
+                },
+                {
+                    "name": "website"
+                }
+            ],
+            [
+                {
+                    "name": "emailAddress"
+                },
+                {
+                    "name": "phoneNumber"
+                }
+            ],
+            [
+                {
+                    "name": "billingAddress"
+                },
+                {
+                    "name": "shippingAddress"
+                }
+            ],
+            [
+                {
+                    "name": "description",
+                    "fullWidth": true
+                }
+            ]
+        ]
+    }
+]
@@ -0,0 +1,37 @@
+[
+    {
+        "label": "",
+        "rows": [
+            [
+                {
+                    "name": "name",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "website",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "emailAddress",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "phoneNumber",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "billingAddressCountry",
+                    "fullWidth": true
+                }
+            ]
+        ]
+    }
+]
@@ -0,0 +1,43 @@
+[
+    {
+        "label": "Overview",
+        "rows": [
+            [
+                {
+                    "name": "name"
+                },
+                {
+                    "name": "parent"
+                }
+            ],
+            [
+                {
+                    "name": "status"
+                },
+                false
+            ],
+            [
+                {
+                    "name": "dateStart"
+                },
+                {
+                    "name": "dateEnd"
+                }
+            ],
+            [
+                {
+                    "name": "duration"
+                },
+                {
+                    "name": "reminders"
+                }
+            ],
+            [
+                {
+                    "name": "description",
+                    "fullWidth": true
+                }
+            ]
+        ]
+    }
+]
@@ -0,0 +1,49 @@
+[
+    {
+        "label": "",
+        "rows": [
+            [
+                {
+                    "name": "name",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "status",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "dateStart",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "duration",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "dateEnd",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "parent",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "description",
+                    "fullWidth": true
+                }
+            ]
+        ]
+    }
+]
@@ -0,0 +1,33 @@
+[
+    {
+        "label": "Overview",
+        "rows": [
+            [
+                {
+                    "name": "name"
+                },
+                false
+            ],
+            [
+                {
+                    "name": "emailAddress"
+                },
+                {
+                    "name": "phoneNumber"
+                }
+            ],
+            [
+                {
+                    "name": "address"
+                },
+                false
+            ],
+            [
+                {
+                    "name": "description",
+                    "fullWidth": true
+                }
+            ]
+        ]
+    }
+]
@@ -0,0 +1,25 @@
+[
+    {
+        "label": "",
+        "rows": [
+            [
+                {
+                    "name": "name",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "emailAddress",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "phoneNumber",
+                    "fullWidth": true
+                }
+            ]
+        ]
+    }
+]
--- a/Show More
+++ b/Show More