Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

cleanup
fix filter style
2015-05-13 13:40:35 +03:00 · 2015-05-13 12:18:40 +03:00 · 2015-05-13 12:07:46 +03:00 · 2015-05-13 11:53:55 +03:00 · 2015-05-13 11:53:42 +03:00 · 2015-05-13 11:27:48 +03:00
1426 changed files with 43374 additions and 15676 deletions
@@ -4,7 +4,6 @@
 /data/preferences/*
 /data/.backup/*
 /data/config.php
-/custom
 /build
 /node_modules
 /client
@@ -14,3 +13,4 @@
 /tests/testData/cache/*
 composer.phar
 vendor/
+/custom/Espo/Custom/*
@@ -1,54 +1,74 @@
+/************************************************************************
+ * 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/.
+ ************************************************************************/
 module.exports = function (grunt) {

    var jsFilesToMinify = [
-                    'client/lib/jquery-2.0.2.min.js',
-                    'client/lib/underscore-min.js',
-                    'client/lib/backbone-min.js',
-                    'client/lib/handlebars.js',
-                    'client/lib/base64.js',
-                    'client/lib/jquery-ui.min.js',
-                    'client/lib/moment.min.js',
-                    'client/lib/moment-timezone-with-data.min.js',
-                    'client/lib/jquery.timepicker.min.js',
-                    'client/lib/jquery.autocomplete.js',
-                    'client/lib/bootstrap.min.js',
-                    'client/lib/bootstrap-datepicker.js',
-                    'client/lib/bull.min.js',                    
-                    'client/src/namespace.js',
-                    'client/src/exceptions.js',
-                    'client/src/app.js',
-                    'client/src/utils.js',
-                    'client/src/storage.js',
-                    'client/src/loader.js',
-                    'client/src/pre-loader.js',
-                    'client/src/ui.js',
-                    'client/src/acl.js',
-                    'client/src/model.js',
-                    'client/src/model-offline.js',
-                    'client/src/metadata.js',
-                    'client/src/language.js',
-                    'client/src/cache.js',
-                    'client/src/controller.js',
-                    'client/src/router.js',
-                    'client/src/date-time.js',
-                    'client/src/field-manager.js',
-                    'client/src/search-manager.js',
-                    'client/src/collection.js',
-                    'client/src/multi-collection.js',
-                    'client/src/view-helper.js',
-                    'client/src/layout-manager.js',
-                    'client/src/model-factory.js',
-                    'client/src/collection-factory.js',
-                    'client/src/models/settings.js',
-                    'client/src/models/user.js',
-                    'client/src/models/preferences.js',
-                    'client/src/controllers/base.js',
-                    'client/src/view.js',
+        'client/lib/jquery-2.0.2.min.js',
+        'client/lib/underscore-min.js',
+        'client/lib/backbone-min.js',
+        'client/lib/handlebars.js',
+        'client/lib/base64.js',
+        'client/lib/jquery-ui.min.js',
+        'client/lib/moment.min.js',
+        'client/lib/moment-timezone-with-data.min.js',
+        'client/lib/jquery.timepicker.min.js',
+        'client/lib/jquery.autocomplete.js',
+        'client/lib/bootstrap.min.js',
+        'client/lib/bootstrap-datepicker.js',
+        'client/lib/bull.min.js',
+        'client/src/namespace.js',
+        'client/src/exceptions.js',
+        'client/src/app.js',
+        'client/src/utils.js',
+        'client/src/storage.js',
+        'client/src/loader.js',
+        'client/src/pre-loader.js',
+        'client/src/ui.js',
+        'client/src/acl.js',
+        'client/src/model.js',
+        'client/src/model-offline.js',
+        'client/src/metadata.js',
+        'client/src/language.js',
+        'client/src/cache.js',
+        'client/src/controller.js',
+        'client/src/router.js',
+        'client/src/date-time.js',
+        'client/src/field-manager.js',
+        'client/src/search-manager.js',
+        'client/src/collection.js',
+        'client/src/multi-collection.js',
+        'client/src/view-helper.js',
+        'client/src/layout-manager.js',
+        'client/src/model-factory.js',
+        'client/src/collection-factory.js',
+        'client/src/models/settings.js',
+        'client/src/models/user.js',
+        'client/src/models/preferences.js',
+        'client/src/controllers/base.js',
+        'client/src/view.js',
    ];
-    
+
    grunt.initConfig({
        pkg: grunt.file.readJSON('package.json'),
-        
+
        mkdir: {
            tmp: {
                options: {
@@ -106,6 +126,8 @@ module.exports = function (grunt) {
                    'modules/**',
                    'img/**',
                    'css/**',
+                    'sounds/**',
+                    'custom/**'
                ],
                dest: 'build/tmp/client',
            },
@@ -119,7 +141,7 @@ module.exports = function (grunt) {
                cwd: 'frontend/client/lib',
                src: '**',
                dest: 'build/tmp/client/lib/',
-            },            
+            },
            backend: {
                expand: true,
                dot: true,
@@ -133,6 +155,8 @@ module.exports = function (grunt) {
                    'bootstrap.php',
                    'cron.php',
                    'rebuild.php',
+                    'clear_cache.php',
+                    'upgrade.php',
                    'index.php',
                    'LICENSE.txt',
                    '.htaccess',
@@ -152,7 +176,7 @@ module.exports = function (grunt) {
            options: {
                mode: '755'
            },
-            php: {            
+            php: {
                options: {
                    mode: '644'
                },
@@ -160,7 +184,7 @@ module.exports = function (grunt) {
                    'build/EspoCRM-<%= pkg.version %>/**/*.php',
                    'build/EspoCRM-<%= pkg.version %>/**/*.json',
                    'build/EspoCRM-<%= pkg.version %>/**/*.config',
-                    'build/EspoCRM-<%= pkg.version %>/**/.htaccess',                    
+                    'build/EspoCRM-<%= pkg.version %>/**/.htaccess',
                    'build/EspoCRM-<%= pkg.version %>/client/**/*.js',
                    'build/EspoCRM-<%= pkg.version %>/client/**/*.css',
                    'build/EspoCRM-<%= pkg.version %>/client/**/*.tpl',
@@ -230,7 +254,7 @@ module.exports = function (grunt) {
        'clean:start',
        'mkdir:tmp',
        'less',
-        'cssmin',        
+        'cssmin',
        'uglify',
        'copy:frontendFolders',
        'copy:frontendHtml',
@@ -240,6 +264,6 @@ module.exports = function (grunt) {
        'copy:final',
        'chmod',
        'clean:final',
-    ]);        
+    ]);

 };
@@ -2,10 +2,17 @@

 <a href='http://www.espocrm.com'>EspoCRM is an Open Source CRM</a> (Customer Relationship Management) software that allows you to see, enter and evaluate all your company relationships regardless of the type. People, companies or opportunities - all in an easy and intuitive interface.

-It's a web application with a frontend designed as a single page application based on backbone.js and a RESTful backend written in PHP.
+It's a web application with a frontend designed as a single page application based on backbone.js and a REST API backend written in PHP.

 Download the latest release from our [website](http://www.espocrm.com).

+### Requirements
+
+* PHP 5.4 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).
@@ -25,7 +32,7 @@ If your repository is accessible via a web server then you can run EspoCRM by ur

 ### How to build

-You need to have nodejs installed.
+You need to have nodejs and Grunt CLI installed.

 1. Change to the project's root directory.
 2. Install project dependencies with `npm install`.
@@ -33,6 +40,21 @@ You need to have nodejs installed.

 The build will be created in the `build` directory.

+### How to make translation
+
+Build po file with command:
+`node po.js en_EN`
+(specify needed language instead of en_EN)
+
+After that tranlate the generated po file.
+
+Build json files from the translated po file:
+
+1. Put your po file espocrm-en_EN.po to the `build` directory
+2. Run `node lang.js en_EN`
+
+The files will be created in build directory.
+
 ### License

 EspoCRM is published under the GNU GPLv3 [license](https://raw.githubusercontent.com/espocrm/espocrm/master/LICENSE.txt).
@@ -1,4 +1,24 @@
-<?php
+<?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/.
+ ************************************************************************/

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

@@ -0,0 +1,72 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Acl;
+
+use \Espo\Entities\User;
+use \Espo\ORM\Entity;
+
+class Email extends \Espo\Core\Acl\Base
+{
+
+    public function checkEntityRead(User $user, Entity $entity, $data)
+    {
+        if ($this->checkEntity($user, $entity, $data, 'read')) {
+            return true;
+        }
+
+        if ($data === false) {
+            return false;
+        }
+        if (is_array($data)) {
+            if (empty($data['read']) || $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(User $user, Entity $entity)
+    {
+        if ($entity->has('assignedUserId')) {
+            if ($user->id === $entity->get('assignedUserId')) {
+                return true;
+            }
+        }
+
+        if ($user->id === $entity->get('createdById')) {
+            return true;
+        }
+
+        return false;
+    }
+
+}
+
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -72,7 +72,7 @@ class Admin extends \Espo\Core\Controllers\Base
    {
        $upgradeManager = new \Espo\Core\UpgradeManager($this->getContainer());

-        $upgradeManager->install($data['id']);
+        $upgradeManager->install($data);

        return true;
    }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -18,33 +18,36 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Controllers;

 use \Espo\Core\Exceptions\BadRequest;

-class App extends \Espo\Core\Controllers\Record
+class App extends \Espo\Core\Controllers\Base
 {
    public function actionUser()
-    {        
+    {
+        $preferences = $this->getPreferences()->toArray();
+        unset($preferences['smtpPassword']);
+
        return array(
            'user' => $this->getUser()->toArray(),
-            'acl' => $this->getAcl()->toArray(),
-            'preferences' => $this->getPreferences()->toArray(),
+            'acl' => $this->getAcl()->getMap(),
+            'preferences' => $preferences,
            'token' => $this->getUser()->get('token')
-        );    
+        );
    }
-    
+
    public function actionDestroyAuthToken($params, $data)
-    {        
-        $token = $data['token'];        
+    {
+        $token = $data['token'];
        if (empty($token)) {
            throw new BadRequest();
        }

        $auth = new \Espo\Core\Utils\Auth($this->getContainer());
-        return $auth->destroyAuthToken($token);        
+        return $auth->destroyAuthToken($token);
    }
 }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -18,7 +18,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Controllers;

@@ -29,19 +29,19 @@ use \Espo\Core\Exceptions\Error;
 class Email extends \Espo\Core\Controllers\Record
 {
    public function actionGetCopiedAttachments($params, $data, $request)
-    {        
+    {
        $id = $request->get('id');
-        
+
        return $this->getRecordService()->getCopiedAttachments($id);
    }
-    
+
    public function actionSendTestEmail($params, $data, $request)
    {
        if (!$request->isPost()) {
            throw new BadRequest();
        }
-        
-        if (empty($data['password'])) {
+
+        if (is_null($data['password'])) {
            if ($data['type'] == 'preferences') {
                if (!$this->getUser()->isAdmin() && $data['id'] != $this->getUser()->id) {
                    throw new Forbidden();
@@ -50,7 +50,7 @@ class Email extends \Espo\Core\Controllers\Record
                if (!$preferences) {
                    throw new Error();
                }
-                
+
                $data['password'] = $this->getContainer()->get('crypt')->decrypt($preferences->get('smtpPassword'));
            } else {
                if (!$this->getUser()->isAdmin()) {
@@ -59,8 +59,29 @@ class Email extends \Espo\Core\Controllers\Record
                $data['password'] = $this->getConfig()->get('smtpPassword');
            }
        }
-        
+
        return $this->getRecordService()->sendTestEmail($data);
    }
+
+    public function actionMarkAsRead($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+        if (empty($data['ids']) || !is_array($data['ids'])) {
+            throw new BadRequest();
+        }
+        $ids = $data['ids'];
+
+        return $this->getRecordService()->markAsReadByIds($ids);
+    }
+
+    public function actionMarkAllAsRead($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+        return $this->getRecordService()->markAllAsRead();
+    }
 }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -18,20 +18,20 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Controllers;

 use \Espo\Core\Exceptions\Forbidden;

 class EmailAccount extends \Espo\Core\Controllers\Record
-{    
+{
    public function actionGetFolders($params, $data, $request)
-    {        
+    {
        return $this->getRecordService()->getFolders(array(
            'host' => $request->get('host'),
            'port' => $request->get('port'),
-            'ssl' => $request->get('ssl'),
+            'ssl' => $request->get('ssl') === 'true',
            'username' => $request->get('username'),
            'password' => $request->get('password'),
            'id' => $request->get('id')
@@ -44,5 +44,27 @@ class EmailAccount extends \Espo\Core\Controllers\Record
            throw new Forbidden();
        }
    }
+
+    public function actionTestConnection($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+
+        if (is_null($data['password'])) {
+            $emailAccount = $this->getEntityManager()->getEntity('EmailAccount', $data['id']);
+            if (!$emailAccount) {
+                throw new Error();
+            }
+
+            if ($emailAccount->get('assignedUserId') != $this->getUser()->id && !$this->getUser()->isAdmin()) {
+                throw new Forbidden();
+            }
+
+            $data['password'] = $this->getContainer()->get('crypt')->decrypt($emailAccount->get('password'));
+        }
+
+        return $this->getRecordService()->testConnection($data);
+    }
 }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -0,0 +1,237 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Controllers;
+
+use \Espo\Core\Exceptions\BadRequest;
+use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\Error;
+
+class EntityManager extends \Espo\Core\Controllers\Base
+{
+    protected function checkControllerAccess()
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+    }
+
+    public function actionCreateEntity($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+
+        if (empty($data['name']) || empty($data['type'])) {
+            throw new BadRequest();
+        }
+
+        $name = $data['name'];
+        $type = $data['type'];
+
+        $name = filter_var($name, \FILTER_SANITIZE_STRING);
+        $type = filter_var($type, \FILTER_SANITIZE_STRING);
+
+        $params = array();
+
+        if (!empty($data['labelSingular'])) {
+            $params['labelSingular'] = $data['labelSingular'];
+        }
+        if (!empty($data['labelPlural'])) {
+            $params['labelPlural'] = $data['labelPlural'];
+        }
+        if (!empty($data['stream'])) {
+            $params['stream'] = $data['stream'];
+        }
+        if (!empty($data['sortBy'])) {
+            $params['sortBy'] = $data['sortBy'];
+        }
+        if (!empty($data['sortDirection'])) {
+            $params['asc'] = $data['sortDirection'] === 'asc';
+        }
+
+        $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();
+
+            $this->getContainer()->get('dataManager')->rebuild();
+        } else {
+            throw new Error();
+        }
+
+        return true;
+    }
+
+    public function actionUpdateEntity($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+        if (empty($data['name'])) {
+            throw new BadRequest();
+        }
+        $name = $data['name'];
+        $name = filter_var($name, \FILTER_SANITIZE_STRING);
+
+        if (!empty($data['sortDirection'])) {
+            $data['asc'] = $data['sortDirection'] === 'asc';
+        }
+
+        $result = $this->getContainer()->get('entityManagerUtil')->update($name, $data);
+
+        if ($result) {
+            $this->getContainer()->get('dataManager')->clearCache();
+        } else {
+            throw new Error();
+        }
+
+        return true;
+    }
+
+    public function actionRemoveEntity($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+
+        if (empty($data['name'])) {
+            throw new BadRequest();
+        }
+        $name = $data['name'];
+        $name = filter_var($name, \FILTER_SANITIZE_STRING);
+
+        $result = $this->getContainer()->get('entityManagerUtil')->delete($name);
+
+        if ($result) {
+            $tabList = $this->getConfig()->get('tabList', []);
+            if (($key = array_search($name, $tabList)) !== false) {
+                unset($tabList[$key]);
+                $tabList = array_values($tabList);
+            }
+            $this->getConfig()->set('tabList', $tabList);
+            $this->getConfig()->save();
+
+            $this->getContainer()->get('dataManager')->clearCache();
+        } else {
+            throw new Error();
+        }
+
+        return true;
+    }
+
+    public function actionCreateLink($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+
+        $paramList = [
+        	'entity',
+        	'entityForeign',
+        	'link',
+        	'linkForeign',
+        	'label',
+        	'labelForeign',
+        	'linkType'
+        ];
+
+        $d = array();
+        foreach ($paramList as $item) {
+        	if (empty($data[$item])) {
+        		throw new BadRequest();
+        	}
+        	$d[$item] = filter_var($data[$item], \FILTER_SANITIZE_STRING);
+        }
+
+        $result = $this->getContainer()->get('entityManagerUtil')->createLink($d);
+
+        if ($result) {
+            $this->getContainer()->get('dataManager')->rebuild();
+        } else {
+            throw new Error();
+        }
+
+        return true;
+    }
+
+    public function actionUpdateLink($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+
+        $paramList = [
+        	'entity',
+        	'entityForeign',
+        	'link',
+        	'linkForeign',
+        	'label',
+        	'labelForeign'
+        ];
+
+        $d = array();
+        foreach ($paramList as $item) {
+        	$d[$item] = filter_var($data[$item], \FILTER_SANITIZE_STRING);
+        }
+
+        $result = $this->getContainer()->get('entityManagerUtil')->updateLink($d);
+
+        if ($result) {
+            $this->getContainer()->get('dataManager')->clearCache();
+        } else {
+            throw new Error();
+        }
+
+        return true;
+    }
+
+    public function actionRemoveLink($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+
+        $paramList = [
+        	'entity',
+        	'link',
+        ];
+        $d = array();
+        foreach ($paramList as $item) {
+        	$d[$item] = filter_var($data[$item], \FILTER_SANITIZE_STRING);
+        }
+
+        $result = $this->getContainer()->get('entityManagerUtil')->deleteLink($d);
+
+        if ($result) {
+            $this->getContainer()->get('dataManager')->clearCache();
+        } else {
+            throw new Error();
+        }
+
+        return true;
+    }
+}
+
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -61,7 +61,7 @@ class Extension extends \Espo\Core\Controllers\Record

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

-        $manager->install($data['id']);
+        $manager->install($data);

        return true;
    }
@@ -74,7 +74,7 @@ class Extension extends \Espo\Core\Controllers\Record

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

-        $manager->uninstall($data['id']);
+        $manager->uninstall($data);

        return true;
    }
@@ -103,7 +103,7 @@ class Extension extends \Espo\Core\Controllers\Record
    {
        $manager = new \Espo\Core\ExtensionManager($this->getContainer());

-        $manager->delete($params['id']);
+        $manager->delete($params);

        return true;
    }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -28,10 +28,10 @@ use \Espo\Core\Exceptions\Forbidden;
 class ExternalAccount extends \Espo\Core\Controllers\Record
 {
    public static $defaultAction = 'list';
-    
+
    public function actionList($params, $data, $request)
    {
-        $integrations = $this->getEntityManager()->getRepository('Integration')->find();    
+        $integrations = $this->getEntityManager()->getRepository('Integration')->find();
        $arr = array();
        foreach ($integrations as $entity) {
            if ($entity->get('enabled') && $this->getMetadata()->get('integrations.' . $entity->id .'.allowUserAccounts')) {                
@@ -44,22 +44,22 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
            'list' => $arr
        );
    }
-    
+
    public function actionGetOAuth2Info($params, $data, $request)
    {
        $id = $request->get('id');
        list($integration, $userId) = explode('__', $id);
-        
+

        if ($this->getUser()->id != $userId) {
            throw new Forbidden();
-        }        
-        
+        }
+
        $entity = $this->getEntityManager()->getEntity('Integration', $integration);
        if ($entity) {
            return array(
                'clientId' => $entity->get('clientId'),
-                'redirectUri' => $this->getConfig()->get('siteUrl') . '/oauthcallback',
+                'redirectUri' => $this->getConfig()->get('siteUrl') . '?entryPoint=oauthCallback',
                'isConnected' => $this->getRecordService()->ping($integration, $userId)
            );
        }
@@ -67,57 +67,57 @@ class ExternalAccount extends \Espo\Core\Controllers\Record

    public function actionRead($params, $data, $request)
    {
-        list($integration, $userId) = explode('__', $params['id']);        
+        list($integration, $userId) = explode('__', $params['id']);

        if ($this->getUser()->id != $userId) {
            throw new Forbidden();
-        }        
-        
-        $entity = $this->getEntityManager()->getEntity('ExternalAccount', $params['id']);        
+        }
+
+        $entity = $this->getEntityManager()->getEntity('ExternalAccount', $params['id']);
        return $entity->toArray();
    }
-    
+
    public function actionUpdate($params, $data)
    {
        return $this->actionPatch($params, $data);
    }
-    
+
    public function actionPatch($params, $data)
    {
        list($integration, $userId) = explode('__', $params['id']);
-        
+

        if ($this->getUser()->id != $userId) {
            throw new Forbidden();
        }
-        
+
        if (isset($data['enabled']) && !$data['enabled']) {
            $data['data'] = null;
-        }        
-        
+        }
+
        $entity = $this->getEntityManager()->getEntity('ExternalAccount', $params['id']);
        $entity->set($data);
        $this->getEntityManager()->saveEntity($entity);
-        
-        return $entity->toArray();        
+
+        return $entity->toArray();
    }
-    
+
    public function actionAuthorizationCode($params, $data, $request)
    {
        if (!$request->isPost()) {
            throw new Error('Bad HTTP method type.');
-        }        
-        
+        }
+
        $id = $data['id'];
        $code = $data['code'];
-        
-        list($integration, $userId) = explode('__', $id);        
+
+        list($integration, $userId) = explode('__', $id);

        if ($this->getUser()->id != $userId) {
            throw new Forbidden();
        }
-        
-        $service = $this->getRecordService();        
+
+        $service = $this->getRecordService();
        return $service->authorizationCode($integration, $userId, $code);
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -18,50 +18,94 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Controllers;

 use Espo\Core\Utils as Utils;
 use \Espo\Core\Exceptions\Error;
 use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\BadRequest;
+
+class Import extends \Espo\Core\Controllers\Record
+{
+    protected function checkControllerAccess()
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+    }
+
+    public function actionPatch($params, $data)
+    {
+        throw new BadRequest();
+    }
+
+    public function actionUpdate($params, $data)
+    {
+        throw new BadRequest();
+    }
+
+    public function actionMassUpdate($params, $data, $request)
+    {
+        throw new BadRequest();
+    }
+
+    public function actionCreateLink($params, $data)
+    {
+        throw new BadRequest();
+    }
+
+    public function actionRemoveLink($params, $data)
+    {
+        throw new BadRequest();
+    }

-class Import extends \Espo\Core\Controllers\Base
-{    
-    
    protected function getFileManager()
    {
        return $this->getContainer()->get('fileManager');
    }
-    
+
    protected function getEntityManager()
    {
        return $this->getContainer()->get('entityManager');
    }
-    
+
    public function actionUploadFile($params, $data)
-    {    
+    {
        $contents = $data;
-        
+
        $attachment = $this->getEntityManager()->getEntity('Attachment');
        $attachment->set('type', 'text/csv');
-        $attachment->set('role', 'Import File');        
+        $attachment->set('role', 'Import File');
+        $attachment->set('name', 'import-file.csv');
        $this->getEntityManager()->saveEntity($attachment);
-        
+
        $this->getFileManager()->putContents('data/upload/' . $attachment->id, $contents);
-        
+
        return array(
            'attachmentId' => $attachment->id
        );
    }
-    
+
    public function actionRevert($params, $data)
-    {            
-        return $this->getService('Import')->revert($data['entityType'], $data['idsToRemove']);
+    {
+        if (empty($data['id'])) {
+            throw new BadRequest();
+        }
+        return $this->getService('Import')->revert($data['id']);
    }
-    
+
+    public function actionRemoveDuplicates($params, $data)
+    {
+        if (empty($data['id'])) {
+            throw new BadRequest();
+        }
+        return $this->getService('Import')->removeDuplicates($data['id']);
+    }
+
    public function actionCreate($params, $data)
-    {   
+    {
        $importParams = array(
            'headerRow' => $data['headerRow'],
            'fieldDelimiter' => $data['fieldDelimiter'],
@@ -74,13 +118,13 @@ class Import extends \Espo\Core\Controllers\Base
            'defaultValues' => $data['defaultValues'],
            'action' => $data['action'],
        );
-        
+
        $attachmentId = $data['attachmentId'];
-        
+
        if (!$this->getAcl()->check($data['entityType'], 'edit')) {
            throw new Forbidden();
        }
-        
+
        return $this->getService('Import')->import($data['entityType'], $data['fields'], $attachmentId, $importParams);
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -18,9 +18,9 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/

-namespace Espo\Modules\Crm\Controllers;
+namespace Espo\Controllers;

 class InboundEmail extends \Espo\Core\Controllers\Record
 {
@@ -30,18 +30,34 @@ class InboundEmail extends \Espo\Core\Controllers\Record
            throw new Forbidden();
        }
    }
-    
+
    public function actionGetFolders($params, $data, $request)
-    {        
+    {
        return $this->getRecordService()->getFolders(array(
            'host' => $request->get('host'),
            'port' => $request->get('port'),
-            'ssl' => $request->get('ssl'),
+            'ssl' => $request->get('ssl') === 'true',
            'username' => $request->get('username'),
            'password' => $request->get('password'),
            'id' => $request->get('id')
        ));
+    }

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

 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -33,7 +33,7 @@ class Layout extends \Espo\Core\Controllers\Base
    {
        $data = $this->getContainer()->get('layout')->get($params['scope'], $params['name']);
        if (empty($data)) {
-            throw new NotFound("Layout " . $params['scope'] . ":" . $params['name'] . ' is not found');
+            throw new NotFound("Layout " . $params['scope'] . ":" . $params['name'] . ' is not found.');
        }
        return $data;
    }
@@ -43,16 +43,18 @@ class Layout extends \Espo\Core\Controllers\Base
        if (!$this->getUser()->isAdmin()) {
            throw new Forbidden();
        }
-        
-        $result = $this->getContainer()->get('layout')->set($data, $params['scope'], $params['name']);
+
+        $layoutManager = $this->getContainer()->get('layout');
+        $layoutManager->set($data, $params['scope'], $params['name']);
+        $result = $layoutManager->save();

        if ($result === false) {
-            throw new Error("Error while saving layout");
+            throw new Error("Error while saving layout.");
        }

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

-        return $this->getContainer()->get('layout')->get($params['scope'], $params['name']);
+        return $layoutManager->get($params['scope'], $params['name']);
    }

    public function actionPatch($params, $data)
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -18,7 +18,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Controllers;

@@ -28,22 +28,22 @@ use \Espo\Core\Exceptions\BadRequest;
 use \Espo\Core\Exceptions\NotFound;

 class Preferences extends \Espo\Core\Controllers\Base
-{    
+{
    protected function getPreferences()
    {
        return $this->getContainer()->get('preferences');
    }
-    
+
    protected function getEntityManager()
    {
        return $this->getContainer()->get('entityManager');
    }
-    
+
    protected function getCrypt()
    {
        return $this->getContainer()->get('crypt');
    }
-    
+
    protected function handleUserAccess($userId)
    {
        if (!$this->getUser()->isAdmin()) {
@@ -52,7 +52,7 @@ class Preferences extends \Espo\Core\Controllers\Base
            }
        }
    }
-    
+
    public function actionDelete($params, $data)
    {
        $userId = $params['id'];
@@ -60,38 +60,38 @@ class Preferences extends \Espo\Core\Controllers\Base
            throw new BadRequest();
        }
        $this->handleUserAccess($userId);
-        
-        return $this->getEntityManager()->getRepository('Preferences')->resetToDefaults($userId);        
+
+        return $this->getEntityManager()->getRepository('Preferences')->resetToDefaults($userId);
    }
-    
+
    public function actionPatch($params, $data)
    {
        return $this->actionUpdate($params, $data);
-    }    
+    }

    public function actionUpdate($params, $data)
    {
        $userId = $params['id'];
        $this->handleUserAccess($userId);
-        
+
        if (array_key_exists('smtpPassword', $data)) {
            $data['smtpPassword'] = $this->getCrypt()->encrypt($data['smtpPassword']);
        }
-        
-        $user = $this->getEntityManager()->getEntity('User', $userId);        
+
+        $user = $this->getEntityManager()->getEntity('User', $userId);

        $entity = $this->getEntityManager()->getEntity('Preferences', $userId);
-        
-        if ($entity) {
+
+        if ($entity && $user) {
            $entity->set($data);
            $this->getEntityManager()->saveEntity($entity);
-            
-            $entity->set('smtpEmailAddress', $user->get('emailAddress'));            
+
+            $entity->set('smtpEmailAddress', $user->get('emailAddress'));
            $entity->set('name', $user->get('name'));
-            
+
            $entity->clear('smtpPassword');
-            
-            return $entity->toArray();        
+
+            return $entity->toArray();
        }
        throw new Error();
    }
@@ -101,18 +101,19 @@ class Preferences extends \Espo\Core\Controllers\Base
        $userId = $params['id'];
        $this->handleUserAccess($userId);

-        $entity = $this->getEntityManager()->getEntity('Preferences', $userId);        
+        $entity = $this->getEntityManager()->getEntity('Preferences', $userId);
        $user = $this->getEntityManager()->getEntity('User', $userId);
-        
+
+        if (!$entity || !$user) {
+            throw new NotFound();
+        }
+
        $entity->set('smtpEmailAddress', $user->get('emailAddress'));
        $entity->set('name', $user->get('name'));
-        
+
        $entity->clear('smtpPassword');
-        
-        if ($entity) {
-            return $entity->toArray();        
-        }
-        throw new NotFound();
+
+        return $entity->toArray();
    }
 }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -57,6 +57,10 @@ class Settings extends \Espo\Core\Controllers\Base
            throw new Forbidden();
        }

+        if (isset($data['useCache']) && $data['useCache'] != $this->getConfig()->get('useCache')) {
+            $this->getContainer()->get('dataManager')->clearCache();
+        }
+
        $this->getConfig()->setData($data, $this->getUser()->isAdmin());
        $result = $this->getConfig()->save();
        if ($result === false) {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -18,40 +18,84 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Controllers;

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

 class User extends \Espo\Core\Controllers\Record
-{    
+{
    public function actionAcl($params, $data, $request)
-    {        
+    {
        $userId = $request->get('id');
        if (empty($userId)) {
            throw new Error();
        }
-        
+
        if (!$this->getUser()->isAdmin() && $this->getUser()->id != $userId) {
            throw new Forbidden();
        }
-        
+
        $user = $this->getEntityManager()->getEntity('User', $userId);
        if (empty($user)) {
            throw new NotFound();
        }
-        
-        $acl = new \Espo\Core\Acl($user, $this->getConfig(), $this->getContainer()->get('fileManager'), $this->getMetadata());
-        
-        return $acl->toArray();                    
+
+        return $this->getAclManager()->getMap($user);
    }
-    
-    public function actionChangeOwnPassword($params, $data)
+
+    public function actionChangeOwnPassword($params, $data, $request)
    {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
        return $this->getService('User')->changePassword($this->getUser()->id, $data['password']);
    }
+
+    public function actionChangePasswordByRequest($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+        if (empty($data['requestId']) || empty($data['password'])) {
+            throw new BadRequest();
+        }
+
+        $p = $this->getEntityManager()->getRepository('PasswordChangeRequest')->where(array(
+            'requestId' => $data['requestId']
+        ))->findOne();
+
+        if (!$p) {
+            throw new Forbidden();
+        }
+        $userId = $p->get('userId');
+        if (!$userId) {
+            throw new Error();
+        }
+
+        $this->getEntityManager()->removeEntity($p);
+
+        return $this->getService('User')->changePassword($userId, $data['password']);
+    }
+
+    public function actionPasswordChangeRequest($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'];
+
+        return $this->getService('User')->passwordChangeRequest($userName, $emailAddress);
+    }
 }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -22,260 +22,61 @@

 namespace Espo\Core;

-use \Espo\Core\Exceptions\Error;
-
-use \Espo\ORM\Entity;
-
 class Acl
 {
-    private $data = array();
+    private $user;

-    private $cacheFile;
+    private $aclManager;

-    private $actionList = array('read', 'edit', 'delete');
-
-    private $levelList = array('all', 'team', 'own', 'no');
-
-    protected $fileManager;
-
-    protected $metadata;
-
-    public function __construct(\Espo\Entities\User $user, $config = null, $fileManager = null, $metadata = null)
+    public function __construct(AclManager $aclManager, \Espo\Entities\User $user)
    {
+        $this->aclManager = $aclManager;
        $this->user = $user;
-
-        $this->metadata = $metadata;
-
-        if (!$this->user->isFetched()) {
-            throw new Error();
-        }
-
-        $this->user->loadLinkMultipleField('teams');
-
-        if ($fileManager) {
-            $this->fileManager = $fileManager;
-        }
-
-        $this->cacheFile = 'data/cache/application/acl/' . $user->id . '.php';
-
-        if ($config && $config->get('useCache') && file_exists($this->cacheFile)) {
-            $cached = include $this->cacheFile;
-            $this->data = $cached;
-            $this->initSolid();
-        } else {
-            $this->load();
-            $this->initSolid();
-            if ($config && $fileManager && $config->get('useCache')) {
-                $this->buildCache();
-            }
-        }
-
    }

-    public function checkScope($scope, $action = null, $isOwner = null, $inTeam = null, $entity = null)
+    protected function getAclManager()
    {
-        if (array_key_exists($scope, $this->data)) {
-            if ($this->data[$scope] === false) {
-                return false;
-            }
-            if ($this->data[$scope] === true) {
-                return true;
-            }
-            if (!is_null($action)) {
-                if (array_key_exists($action, $this->data[$scope])) {
-                    $value = $this->data[$scope][$action];
-
-                    if ($value === 'all' || $value === true) {
-                        return true;
-                    }
-
-                    if (!$value || $value === 'no') {
-                        return false;
-                    }
-
-                    if (is_null($isOwner)) {
-                        return true;
-                    }
-
-                    if ($isOwner) {
-                        if ($value === 'own' || $value === 'team') {
-                            return true;
-                        }
-                    }
-                    if ($inTeam === null && $entity) {
-                        $inTeam = $this->checkInTeam($entity);
-                    }
-
-                    if ($inTeam) {
-                        if ($value === 'team') {
-                            return true;
-                        }
-                    }
-
-                    return false;
-                }
-            }
-            return true;
-        }
-        return true;
+        return $this->aclManager;
    }

-    public function toArray()
+    protected function getUser()
    {
-        return $this->data;
+        return $this->user;
+    }
+
+    public function getMap()
+    {
+        return $this->getAclManager()->getMap($this->getUser());
    }

    public function getLevel($scope, $action)
    {
-        if ($this->user->isAdmin()) {
-            return 'all';
-        }
-        if (array_key_exists($scope, $this->data)) {
-            if (array_key_exists($action, $this->data[$scope])) {
-                return $this->data[$scope][$action];
-            }
-        }
-        return false;
+        return $this->getAclManager()->getLevel($this->getUser(), $scope, $action);
    }

-    public function check($subject, $action = null, $isOwner = null, $inTeam = null)
+    public function get($permission)
    {
-        if ($this->user->isAdmin()) {
-            return true;
-        }
-        if (is_string($subject)) {
-            return $this->checkScope($subject, $action, $isOwner, $inTeam);
-        } else {
-            $entity = $subject;
-            if ($entity instanceof Entity) {
-                $entityName = $entity->getEntityName();
-                return $this->checkScope($entityName, $action, $this->checkIsOwner($entity), $inTeam, $entity);
-            }
-        }
+        return $this->getAclManager()->get($this->getUser(), $permission);
    }

    public function checkReadOnlyTeam($scope)
    {
-        if (isset($this->data[$scope]) && isset($this->data[$scope]['read'])) {
-            return $this->data[$scope]['read'] === 'team';
-        }
-        return false;
+        return $this->getAclManager()->checkReadOnlyTeam($this->getUser(), $scope);
    }

    public function checkReadOnlyOwn($scope)
    {
-        if ($this->user->isAdmin()) {
-            return false;
-        }
-        if (isset($this->data[$scope]) && isset($this->data[$scope]['read'])) {
-            return $this->data[$scope]['read'] === 'own';
-        }
-        return false;
+        return $this->getAclManager()->checkReadOnlyOwn($this->getUser(), $scope);
    }

-    public function checkIsOwner($entity)
+    public function check($subject, $action = null, $isOwner = null, $inTeam = null)
    {
-        if ($this->user->isAdmin()) {
-            return false;
-        }
-        $userId = $this->user->id;
-        if ($userId === $entity->get('assignedUserId') || $userId === $entity->get('createdById')) {
-            return true;
-        }
-        return false;
+        return $this->getAclManager()->check($this->getUser(), $subject, $action, $isOwner, $inTeam) ;
    }

-    public function checkInTeam($entity)
+    public function checkScope($scope, $action = null, $isOwner = null, $inTeam = null, $entity = null)
    {
-        $userTeamIds = $this->user->get('teamsIds');
-
-        if (!$entity->hasRelation('teams') || !$entity->hasField('teamsIds')) {
-            return false;
-        }
-
-        if (!$entity->has('teamsIds')) {
-            $entity->loadLinkMultipleField('teams');
-        }
-
-        $teamIds = $entity->get('teamsIds');
-
-        if (empty($teamIds)) {
-            return false;
-        }
-
-        foreach ($userTeamIds as $id) {
-            if (in_array($id, $teamIds)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private function load()
-    {
-        $aclTables = array();
-
-        $userRoles = $this->user->get('roles');
-
-        foreach ($userRoles as $role) {
-            $aclTables[] = json_decode($role->get('data'));
-        }
-
-        $teams = $this->user->get('teams');
-        foreach ($teams as $team) {
-            $teamRoles = $team->get('roles');
-            foreach ($teamRoles as $role) {
-                $aclTables[] = json_decode($role->get('data'));
-            }
-        }
-
-        $this->data = $this->merge($aclTables);
-    }
-
-    private function initSolid()
-    {
-        $data = $this->metadata->get('app.acl.solid', array());
-
-        foreach ($data as $entityName => $item) {
-            $this->data[$entityName] = $item;
-        }
-    }
-
-    private function merge($tables)
-    {
-        $data = array();
-        foreach ($tables as $table) {
-            foreach ($table as $scope => $row) {
-                if ($row == false) {
-                    if (!isset($data[$scope])) {
-                        $data[$scope] = false;
-                    }
-                } else {
-                    if (!isset($data[$scope])) {
-                        $data[$scope] = array();
-                    }
-                    if ($data[$scope] == false) {
-                        $data[$scope] = array();
-                    }
-                    foreach ($row as $action => $level) {
-                        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;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return $data;
-    }
-
-    private function buildCache()
-    {
-        $contents = '<' . '?'. 'php return ' .  var_export($this->data, true)  . ';';
-        $this->fileManager->putContents($this->cacheFile, $contents);
+        return $this->getAclManager()->checkScope($this->getUser(), $subject, $action, $isOwner, $inTeam, $entity) ;
    }
 }

@@ -0,0 +1,223 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Acl;
+
+use \Espo\Core\Interfaces\Injectable;
+
+use \Espo\Entities\User;
+use \Espo\ORM\Entity;
+
+class Base implements Injectable
+{
+    protected $dependencies = array(
+        'config',
+        'entityManager',
+        'aclManager'
+    );
+
+    protected $injections = array();
+
+    public function inject($name, $object)
+    {
+        $this->injections[$name] = $object;
+    }
+
+    public function __construct()
+    {
+        $this->init();
+    }
+
+    protected function init()
+    {
+    }
+
+    protected function getInjection($name)
+    {
+        return $this->injections[$name];
+    }
+
+    protected function addDependency($name)
+    {
+        $this->dependencies[] = $name;
+    }
+
+    public function getDependencyList()
+    {
+        return $this->dependencies;
+    }
+
+    protected function getConfig()
+    {
+        return $this->getInjection('config');
+    }
+
+    protected function getEntityManager()
+    {
+        return $this->getInjection('entityManager');
+    }
+
+    protected function getAclManager()
+    {
+        return $this->getInjection('aclManager');
+    }
+
+    public function checkReadOnlyTeam(User $user, $scope, $data)
+    {
+        if (empty($data) || !is_array($data) || !isset($data['read'])) {
+            return false;
+        }
+        return $data['read'] === 'team';
+    }
+
+    public function checkReadOnlyOwn(User $user, $scope, $data)
+    {
+        if (empty($data) || !is_array($data) || !isset($data['read'])) {
+            return false;
+        }
+        return $data['read'] === 'own';
+    }
+
+    public function checkEntity(User $user, Entity $entity, $data, $action)
+    {
+        return $this->checkScope($user, $data, $entity->getEntityType(), $action, null, null, $entity);
+    }
+
+    public function checkScope(User $user, $data, $scope, $action = null, $isOwner = null, $inTeam = null, Entity $entity = null)
+    {
+        if (is_null($data)) {
+            return true;
+        }
+        if ($data === false) {
+            return false;
+        }
+        if ($data === true) {
+            return true;
+        }
+
+        if (!is_null($action)) {
+            if (array_key_exists($action, $data)) {
+                $value = $data[$action];
+
+                if ($value === 'all' || $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 === 'team') {
+                        return true;
+                    }
+                }
+                if (is_null($inTeam) && $entity) {
+                    $inTeam = $this->checkInTeam($user, $entity);
+                }
+
+                if ($inTeam) {
+                    if ($value === 'team') {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public function checkIsOwner(User $user, Entity $entity)
+    {
+        if ($entity->has('assignedUserId')) {
+            if ($user->id === $entity->get('assignedUserId')) {
+                return true;
+            }
+        }
+        if ($entity->has('createdById')) {
+            if ($user->id === $entity->get('createdById')) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public function checkInTeam(User $user, Entity $entity)
+    {
+        $userTeamIds = $user->get('teamsIds');
+
+        if (!$entity->hasRelation('teams') || !$entity->hasField('teamsIds')) {
+            return false;
+        }
+
+        if (!$entity->has('teamsIds')) {
+            $entity->loadLinkMultipleField('teams');
+        }
+
+        $teamIds = $entity->get('teamsIds');
+
+        if (empty($teamIds)) {
+            return false;
+        }
+
+        foreach ($userTeamIds as $id) {
+            if (in_array($id, $teamIds)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    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')) {
+                            return true;
+                        } else {
+                            if (!$entity->get('assignedUserId')) {
+                                return true;
+                            }
+                            if ($entity->get('assignedUserId') == $entity->get('createdById')) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return $result;
+    }
+}
+
@@ -0,0 +1,239 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Acl;
+
+use \Espo\Core\Exceptions\Error;
+
+use \Espo\ORM\Entity;
+
+class Table
+{
+    private $data = array(
+        'table' => array()
+    );
+
+    private $cacheFile;
+
+    private $actionList = array('read', 'edit', 'delete');
+
+    private $levelList = array('all', 'team', 'own', 'no');
+
+    protected $fileManager;
+
+    protected $metadata;
+
+    public function __construct(\Espo\Entities\User $user, $config = null, $fileManager = null, $metadata = null)
+    {
+        $this->user = $user;
+
+        $this->metadata = $metadata;
+
+        if (!$this->user->isFetched()) {
+            throw new Error();
+        }
+
+        $this->user->loadLinkMultipleField('teams');
+
+        if ($fileManager) {
+            $this->fileManager = $fileManager;
+        }
+
+        $this->cacheFile = 'data/cache/application/acl/' . $user->id . '.php';
+
+        if ($config && $config->get('useCache') && file_exists($this->cacheFile)) {
+            $cached = include $this->cacheFile;
+            $this->data = $cached;
+            $this->initSolid();
+        } else {
+            $this->load();
+            $this->initSolid();
+            if ($config && $fileManager && $config->get('useCache')) {
+                $this->buildCache();
+            }
+        }
+    }
+
+    public function getMap()
+    {
+        return $this->data;
+    }
+
+    public function getScopeData($scope)
+    {
+        if (array_key_exists($scope, $this->data['table'])) {
+            return $this->data['table'][$scope];
+        }
+        return null;
+    }
+
+    public function get($permission)
+    {
+        if ($permission == 'table') {
+            return null;
+        }
+
+        if (array_key_exists($permission, $this->data)) {
+            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];
+            }
+        }
+        return false;
+    }
+
+    private function load()
+    {
+        $aclTables = [];
+        $assignmentPermissionList = [];
+
+        $userRoles = $this->user->get('roles');
+
+        foreach ($userRoles as $role) {
+            $aclTables[] = $role->get('data');
+            $assignmentPermissionList[] = $role->get('assignmentPermission');
+        }
+
+        $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');
+            }
+        }
+
+        $this->data['table'] = $this->merge($aclTables);
+        $this->data['assignmentPermission'] = $this->mergeValues($assignmentPermissionList, 'all');
+    }
+
+    private function initSolid()
+    {
+        if (!$this->metadata) {
+            return;
+        }
+
+        $data = $this->metadata->get('app.acl.solid', array());
+
+        foreach ($data as $entityType => $item) {
+            $this->data['table'][$entityType] = $item;
+        }
+    }
+
+    private function mergeValues(array $list, $defaultValue)
+    {
+        $result = null;
+        foreach ($list as $level) {
+            if ($level != 'not-set') {
+                if (is_null($result)) {
+                    $result = $level;
+                    continue;
+                }
+                if (array_search($result, $this->levelList) > array_search($level, $this->levelList)) {
+                    $result = $level;
+                }
+            }
+        }
+        if (is_null($result)) {
+            $result = $defaultValue;
+        }
+        return $result;
+    }
+
+    private function getScopeList()
+    {
+        $scopeList = [];
+        $scopes = $this->metadata->get('scopes');
+        foreach ($scopes as $scope => $d) {
+        	if (!empty($d['acl'])) {
+        		$scopeList[] = $scope;
+        	}
+        }
+        return $scopeList;
+    }
+
+    private function merge($tables)
+    {
+        $data = array();
+        $scopeList = $this->getScopeList();
+
+        foreach ($tables as $table) {
+            foreach ($scopeList as $scope) {
+            	if (!isset($table->$scope)) {
+            		continue;
+            	}
+            	$row = $table->$scope;
+
+                if ($row == false) {
+                    if (!isset($data[$scope])) {
+                        $data[$scope] = false;
+                    }
+                } else if ($row === true) {
+                    $data[$scope] = true;
+                } else {
+                    if (!isset($data[$scope])) {
+                        $data[$scope] = array();
+                    }
+                    if ($data[$scope] == false) {
+                        $data[$scope] = array();
+                    }
+
+                    if (is_array($row) || $row instanceof \stdClass) {
+                        foreach ($row as $action => $level) {
+                            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;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        foreach ($scopeList as $scope) {
+        	if (!array_key_exists($scope, $data)) {
+        		$aclType = $this->metadata->get('scopes.' . $scope . '.acl');
+        		if (!empty($aclType) && ($aclType === true || $aclType === 'record')) {
+	        		$data[$scope] = $this->metadata->get('app.acl.recordDefault');
+        		}
+        	}
+        }
+        return $data;
+    }
+
+    private function buildCache()
+    {
+        $contents = '<' . '?'. 'php return ' .  var_export($this->data, true)  . ';';
+        $this->fileManager->putContents($this->cacheFile, $contents);
+    }
+}
+
@@ -0,0 +1,181 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core;
+
+use \Espo\Core\Exceptions\Error;
+
+use \Espo\ORM\Entity;
+use \Espo\Entities\User;
+use \Espo\Core\Utils\Util;
+
+class AclManager
+{
+    private $container;
+
+    private $metadata;
+
+    private $implementationHashMap = array();
+
+    private $tableHashMap = array();
+
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+        $this->metadata = $container->get('metadata');
+    }
+
+    protected function getContainer()
+    {
+        return $this->container;
+    }
+
+    public function getImplementation($scope)
+    {
+        if (empty($this->implementationHashMap[$scope])) {
+            $normalizedName = Util::normilizeClassName($scope);
+
+            $className = '\\Espo\\Custom\\Acl\\' . $normalizedName;
+            if (!class_exists($className)) {
+                $moduleName = $this->metadata->getScopeModuleName($scope);
+                if ($moduleName) {
+                    $className = '\\Espo\\Modules\\' . $moduleName . '\\Acl\\' . $normalizedName;
+                } else {
+                    $className = '\\Espo\\Acl\\' . $normalizedName;
+                }
+                if (!class_exists($className)) {
+                    $className = '\\Espo\\Core\\Acl\\Base';
+                }
+            }
+
+            if (class_exists($className)) {
+                $acl = new $className();
+                $dependencies = $acl->getDependencyList();
+                foreach ($dependencies as $name) {
+                    $acl->inject($name, $this->container->get($name));
+                }
+                $this->implementationHashMap[$scope] = $acl;
+            } else {
+                throw new Error();
+            }
+        }
+
+        return $this->implementationHashMap[$scope];
+    }
+
+    protected function getTable(User $user)
+    {
+        $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');
+
+            $this->tableHashMap[$key] = new \Espo\Core\Acl\Table($user, $config, $fileManager, $metadata);
+        }
+
+        return $this->tableHashMap[$key];
+    }
+
+    public function getMap(User $user)
+    {
+        return $this->getTable($user)->getMap();
+    }
+
+    public function getLevel(User $user, $scope, $action)
+    {
+        if ($user->isAdmin()) {
+            return 'all';
+        }
+        return $this->getTable($user)->getLevel($scope, $action);
+    }
+
+    public function get(User $user, $permission)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+        $this->getTable($user)->get($permission);
+    }
+
+    public function checkReadOnlyTeam(User $user, $scope)
+    {
+        if ($user->isAdmin()) {
+            return false;
+        }
+        $data = $this->getTable($user)->getScopeData($scope);
+        return $this->getImplementation($scope)->checkReadOnlyTeam($user, $scope, $data);
+    }
+
+    public function checkReadOnlyOwn(User $user, $scope)
+    {
+        if ($user->isAdmin()) {
+            return false;
+        }
+        $data = $this->getTable($user)->getScopeData($scope);
+        return $this->getImplementation($scope)->checkReadOnlyOwn($user, $scope, $data);
+    }
+
+    public function check(User $user, $subject, $action = null, $isOwner = null, $inTeam = null)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+        if (is_string($subject)) {
+            return $this->checkScope($user, $subject, $action, $isOwner, $inTeam);
+        } 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)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+        $data = $this->getTable($user)->getScopeData($entity->getEntityType());
+        return $this->getImplementation($scope)->checkEntity($user, $entity, $data, $action);
+    }
+
+    public function checkScope(User $user, $scope, $action = null, $isOwner = null, $inTeam = null, $entity = null)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+        $data = $this->getTable($user)->getScopeData($scope);
+        return $this->getImplementation($scope)->checkScope($user, $data, $scope, $action, $isOwner, $inTeam, $entity);
+    }
+}
+
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -43,6 +43,8 @@ class Application
        date_default_timezone_set('UTC');

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

    public function getSlim()
@@ -88,6 +90,7 @@ class Application
        $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('{{runScript}}', 'app.start();' , $html);
        echo $html;
        exit;
    }
@@ -135,6 +138,12 @@ class Application
        $dataManager->rebuild();
    }

+    public function runClearCache()
+    {
+        $dataManager = $this->getContainer()->get('dataManager');
+        $dataManager->clearCache();
+    }
+
    public function isInstalled()
    {
        $config = $this->getContainer()->get('config');
@@ -151,7 +160,11 @@ class Application
        $container = $this->getContainer();
        $slim = $this->getSlim();

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

        $apiAuth = new \Espo\Core\Utils\Api\Auth($auth);
        $this->getSlim()->add($apiAuth);
@@ -215,7 +228,6 @@ class Application
        });
    }

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

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -51,9 +51,16 @@ class Container
            $obj = $this->$loadMethod();
            $this->data[$name] = $obj;
        } else {
-            $className = '\Espo\Custom\Core\Loaders\\'.ucfirst($name);
-            if (!class_exists($className)) {
-                $className = '\Espo\Core\Loaders\\'.ucfirst($name);
+
+            try {
+                $className = $this->get('metadata')->get('app.loaders.' . ucfirst($name));
+            } catch (\Exception $e) {}
+
+            if (!isset($className) || !class_exists($className)) {
+                $className = '\Espo\Custom\Core\Loaders\\'.ucfirst($name);
+                if (!class_exists($className)) {
+                    $className = '\Espo\Core\Loaders\\'.ucfirst($name);
+                }
            }

            if (class_exists($className)) {
@@ -64,7 +71,7 @@ class Container

        return null;
    }
-    
+
    protected function getServiceClassName($name, $default)
    {
        $metadata = $this->get('metadata');
@@ -72,6 +79,28 @@ class Container
        return $className;
    }

+    protected function loadLog()
+    {
+        $logConfig = $this->get('config')->get('logger');
+
+        $log = new \Espo\Core\Utils\Log('Espo');
+
+        $levelCode = $log->getLevelCode($logConfig['level']);
+
+        if ($logConfig['isRotate']) {
+            $handler = new \Espo\Core\Utils\Log\Monolog\Handler\RotatingFileHandler($logConfig['path'], $logConfig['maxRotateFiles'], $levelCode);
+        } else {
+            $handler = new \Espo\Core\Utils\Log\Monolog\Handler\StreamHandler($logConfig['path'], $levelCode);
+        }
+        $log->pushHandler($handler);
+
+        $errorHandler = new \Monolog\ErrorHandler($log);
+        $errorHandler->registerExceptionHandler(null, false);
+        $errorHandler->registerErrorHandler(array(), false);
+
+        return $log;
+    }
+
    protected function loadContainer()
    {
        return $this;
@@ -165,14 +194,20 @@ class Container
        );
    }

+    private function loadAclManager()
+    {
+        $className = $this->getServiceClassName('acl', '\\Espo\\Core\\AclManager');
+        return new $className(
+            $this->get('container')
+        );
+    }
+
    private function loadAcl()
    {
        $className = $this->getServiceClassName('acl', '\\Espo\\Core\\Acl');
        return new $className(
-            $this->get('user'),
-            $this->get('config'),
-            $this->get('fileManager'),
-            $this->get('metadata')
+            $this->get('aclManager'),
+            $this->get('user')
        );
    }

@@ -204,7 +239,7 @@ class Container
            $this->get('preferences')
        );
    }
-    
+
    private function loadCrypt()
    {
        return new \Espo\Core\Utils\Crypt(
@@ -214,7 +249,7 @@ class Container

    private function loadScheduledJob()
    {
-        return new \Espo\Core\Cron\ScheduledJob(
+        return new \Espo\Core\Utils\ScheduledJob(
            $this
        );
    }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -90,6 +90,11 @@ abstract class Base
        return $this->container->get('acl');
    }

+    protected function getAclManager()
+    {
+        return $this->container->get('aclManager');
+    }
+
    protected function getConfig()
    {
        return $this->container->get('config');
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -25,6 +25,7 @@ namespace Espo\Core\Controllers;
 use \Espo\Core\Exceptions\Error;
 use \Espo\Core\Exceptions\Forbidden;
 use \Espo\Core\Exceptions\NotFound;
+use \Espo\Core\Exceptions\BadRequest;
 use \Espo\Core\Utils\Util;

 class Record extends Base
@@ -33,6 +34,8 @@ class Record extends Base

    public static $defaultAction = 'list';

+    protected $defaultRecordServiceName = 'Record';
+
    protected function getEntityManager()
    {
        return $this->getContainer()->get('entityManager');
@@ -47,7 +50,7 @@ class Record extends Base
        if ($this->getServiceFactory()->checkExists($name)) {
            $service = $this->getServiceFactory()->create($name);
        } else {
-            $service = $this->getServiceFactory()->create('Record');
+            $service = $this->getServiceFactory()->create($this->defaultRecordServiceName);
            $service->setEntityName($name);
        }

@@ -193,9 +196,17 @@ class Record extends Base

        $ids = $request->get('ids');
        $where = $request->get('where');
+        $byWhere = $request->get('byWhere');
+
+        $params = array();
+        if ($byWhere) {
+            $params['where'] = $where;
+        } else {
+            $params['ids'] = $ids;
+        }

        return array(
-            'id' => $this->getRecordService()->export($ids, $where)
+            'id' => $this->getRecordService()->export($params)
        );
    }

@@ -204,12 +215,20 @@ class Record extends Base
        if (!$this->getAcl()->check($this->name, 'edit')) {
            throw new Forbidden();
        }
+        if (empty($data['attributes'])) {
+            throw new BadRequest();
+        }
+
+        $params = array();
+        if (array_key_exists('where', $data) && !empty($data['byWhere'])) {
+            $params['where'] = json_decode(json_encode($data['where']), true);
+        } else if (array_key_exists('ids', $data)) {
+            $params['ids'] = $data['ids'];
+        }

-        $ids = $data['ids'];
-        $where = $data['where'];
        $attributes = $data['attributes'];

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

        return $idsUpdated;
    }
@@ -220,37 +239,56 @@ class Record extends Base
            throw new Forbidden();
        }

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

-        $idsRemoved = $this->getRecordService()->massRemove($ids, $where);
+        $idsRemoved = $this->getRecordService()->massRemove($params);

        return $idsRemoved;
    }

    public function actionCreateLink($params, $data)
    {
+        if (empty($params['id']) || empty($params['link'])) {
+            throw BadRequest();
+        }
+
        $id = $params['id'];
        $link = $params['link'];

-        $foreignIds = array();
-        if (isset($data['id'])) {
-            $foreignIds[] = $data['id'];
-        }
-        if (isset($data['ids']) && is_array($data['ids'])) {
-            foreach ($data['ids'] as $foreignId) {
-                $foreignIds[] = $foreignId;
+        if (!empty($data['massRelate'])) {
+            if (!is_array($data['where'])) {
+                throw new BadRequest();
+            }
+            $where = json_decode(json_encode($data['where']), true);
+            return $this->getRecordService()->linkEntityMass($id, $link, $where);
+        } else {
+            $foreignIds = array();
+            if (isset($data['id'])) {
+                $foreignIds[] = $data['id'];
+            }
+            if (isset($data['ids']) && is_array($data['ids'])) {
+                foreach ($data['ids'] as $foreignId) {
+                    $foreignIds[] = $foreignId;
+                }
            }
-        }

-        $result = false;
-        foreach ($foreignIds as $foreignId) {
-            if ($this->getRecordService()->linkEntity($id, $link, $foreignId)) {
-                $result = $result || true;
+            $result = false;
+            foreach ($foreignIds as $foreignId) {
+                if ($this->getRecordService()->linkEntity($id, $link, $foreignId)) {
+                    $result = true;
+                }
+            }
+            if ($result) {
+                return true;
            }
-        }
-        if ($result) {
-            return true;
        }

        throw new Error();
@@ -261,6 +299,10 @@ class Record extends Base
        $id = $params['id'];
        $link = $params['link'];

+        if (empty($params['id']) || empty($params['link'])) {
+            throw BadRequest();
+        }
+
        $foreignIds = array();
        if (isset($data['id'])) {
            $foreignIds[] = $data['id'];
@@ -301,5 +343,24 @@ class Record extends Base
        $id = $params['id'];
        return $this->getRecordService()->unfollow($id);
    }
+
+    public function actionMerge($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+
+        if (empty($data['targetId']) || empty($data['sourceIds']) || !is_array($data['sourceIds'])) {
+            throw new BadRequest();
+        }
+        $targetId = $data['targetId'];
+        $sourceIds = $data['sourceIds'];
+
+        if (!$this->getAcl()->check($this->name, 'edit')) {
+            throw new Forbidden();
+        }
+
+        return $this->getRecordService()->merge($targetId, $sourceIds);
+    }
 }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -20,33 +20,38 @@
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
 ************************************************************************/

-namespace Espo\Core\Loaders;
+namespace Espo\Core\Controllers;

-use Espo\Core\Utils,
-    Espo\Core\Utils\Log\Monolog\Handler;
+use \Espo\Core\Exceptions\Error;
+use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\NotFound;
+use \Espo\Core\Exceptions\BadRequest;
+use \Espo\Core\Utils\Util;

-class Log extends Base
+class RecordTree extends Record
 {
-    public function load()
+
+    public static $defaultAction = 'list';
+
+    protected $defaultRecordServiceName = 'RecordTree';
+
+    public function actionListTree($params, $data, $request)
    {
-        $logConfig = $this->getContainer()->get('config')->get('logger');
-
-        $log = new Utils\Log('Espo');
-
-        $levelCode = $log->getLevelCode($logConfig['level']);
-
-        if ($logConfig['isRotate']) {
-            $handler = new Handler\RotatingFileHandler($logConfig['path'], $logConfig['maxRotateFiles'], $levelCode);
-        } else {
-            $handler = new Handler\StreamHandler($logConfig['path'], $levelCode);
+        if (!$this->getAcl()->check($this->name, 'read')) {
+            throw new Forbidden();
        }
-        $log->pushHandler($handler);

-        $errorHandler = new \Monolog\ErrorHandler($log);
-        $errorHandler->registerExceptionHandler(null, false);
-        $errorHandler->registerErrorHandler(array(), false);
+        $where = $request->get('where');
+        $parentId = $request->get('parentId');
+        $maxDepth = $request->get('maxDepth');

-        return $log;
+        $collection = $this->getRecordService()->getTree($parentId, array(
+            'where' => $where
+        ), 0, $maxDepth);
+        return array(
+            'list' => $collection->toArray(),
+            'path' => $this->getRecordService()->getTreeItemPath($parentId)
+        );
    }
 }

@@ -1,67 +0,0 @@
-<?php
-/************************************************************************
- * This file is part of EspoCRM.
- *
- * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  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/.
- ************************************************************************/
-
-namespace Espo\Core\Cron;
-
-use Espo\Core\Utils\Json,
-    Espo\Core\Exceptions\NotFound;
-
-class Service
-{
-    private $serviceFactory;
-
-    public function __construct(\Espo\Core\ServiceFactory $serviceFactory)
-    {
-        $this->serviceFactory = $serviceFactory;
-    }
-
-    protected function getServiceFactory()
-    {
-        return $this->serviceFactory;
-    }
-
-
-
-    public function run($job)
-    {
-        $serviceName = $job['service_name'];
-
-        if (!$this->getServiceFactory()->checkExists($serviceName)) {
-            throw new NotFound();
-        }
-
-        $service = $this->getServiceFactory()->create($serviceName);
-        $serviceMethod = $job['method'];
-
-        if (!method_exists($service, $serviceMethod)) {
-            throw new NotFound();
-        }
-
-        $data = $job['data'];
-        if (Json::isJSON($data)) {
-            $data = Json::decode($data, true);
-        }
-
-        $service->$serviceMethod($data);
-    }
-
-}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -22,17 +22,18 @@

 namespace Espo\Core;

+use \PDO;
+use Espo\Core\Utils\Json;
+use Espo\Core\Exceptions\NotFound;
+
 class CronManager
 {
    private $container;
    private $config;
    private $fileManager;
+    private $entityManager;

-    private $scheduledJobCron;
-    private $serviceCron;
-
-    private $jobService;
-    private $scheduledJobService;
+    private $scheduledJobUtil;

    const PENDING = 'Pending';
    const RUNNING = 'Running';
@@ -41,19 +42,18 @@ class CronManager

    protected $lastRunTime = 'data/cache/application/cronLastRunTime.php';

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

        $this->config = $this->container->get('config');
        $this->fileManager = $this->container->get('fileManager');
+        $this->entityManager = $this->container->get('entityManager');
+        $this->serviceFactory = $this->container->get('serviceFactory');

-        $this->scheduledJobCron = $this->container->get('scheduledJob');
-        $this->serviceCron = new \Espo\Core\Cron\Service( $this->container->get('serviceFactory'));
-
-        $this->jobService = $this->container->get('serviceFactory')->create('job');
-        $this->scheduledJobService = $this->container->get('serviceFactory')->create('scheduledJob');
+        $this->scheduledJobUtil = $this->container->get('scheduledJob');
+        $this->cronJob = new \Espo\Core\Utils\Cron\Job($this->config, $this->entityManager);
+        $this->cronScheduledJob = new \Espo\Core\Utils\Cron\ScheduledJob($this->config, $this->entityManager);
    }

    protected function getContainer()
@@ -71,32 +71,38 @@ class CronManager
        return $this->fileManager;
    }

-    protected function getJobService()
+    protected function getEntityManager()
    {
-        return $this->jobService;
+        return $this->entityManager;
    }

-    protected function getScheduledJobService()
+    protected function getServiceFactory()
    {
-        return $this->scheduledJobService;
+        return $this->serviceFactory;
    }

-    protected function getScheduledJobCron()
+    protected function getScheduledJobUtil()
    {
-        return $this->scheduledJobCron;
+        return $this->scheduledJobUtil;
    }

-    protected function getServiceCron()
+    protected function getCronJob()
    {
-        return $this->serviceCron;
+        return $this->cronJob;
    }

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

    protected function getLastRunTime()
    {
-        $lastRunTime = $this->getFileManager()->getContents($this->lastRunTime);
-        if (!is_int($lastRunTime)) {
-            $lastRunTime = time() - (intval($this->getConfig()->get('cron.minExecutionTime')) + 60);
+        $lastRunData = $this->getFileManager()->getPhpContents($this->lastRunTime);
+
+        $lastRunTime = time() - intval($this->getConfig()->get('cron.minExecutionTime')) - 1;
+        if (is_array($lastRunData) && !empty($lastRunData['time'])) {
+            $lastRunTime = $lastRunData['time'];
        }

        return $lastRunTime;
@@ -104,7 +110,10 @@ class CronManager

    protected function setLastRunTime($time)
    {
-        return $this->getFileManager()->putContentsPHP($this->lastRunTime, $time);
+        $data = array(
+            'time' => $time,
+        );
+        return $this->getFileManager()->putPhpContents($this->lastRunTime, $data);
    }

    protected function checkLastRunTime()
@@ -120,65 +129,143 @@ class CronManager
        return false;
    }

-
+    /**
+     * Run Cron
+     *
+     * @return void
+     */
    public function run()
    {
        if (!$this->checkLastRunTime()) {
-            $GLOBALS['log']->info('Cron Manager: Stop cron running, too frequency execution');
-            return; //stop cron running, too frequency execution
+            $GLOBALS['log']->info('CronManager: Stop cron running, too frequent execution.');
+            return;
        }

        $this->setLastRunTime(time());

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

-        $pendingJobs = $this->getJobService()->getPendingJobs();
+        $pendingJobs = $cronJob->getPendingJobs();

        foreach ($pendingJobs as $job) {

-            $this->getJobService()->updateEntity($job['id'], array(
-                'status' => self::RUNNING,
-            ));
+            $jobEntity = $entityManager->getEntity('Job', $job['id']);
+
+            if (!isset($jobEntity)) {
+                $GLOBALS['log']->error('CronManager: empty Job entity ['.$job['id'].'].');
+                continue;
+            }
+
+            $jobEntity->set('status', self::RUNNING);
+            $entityManager->saveEntity($jobEntity);

            $isSuccess = true;

            try {
                if (!empty($job['scheduled_job_id'])) {
-                    $this->getScheduledJobCron()->run($job);
+                    $this->runScheduledJob($job);
                } else {
-                    $this->getServiceCron()->run($job);
+                    $this->runService($job);
                }
            } catch (\Exception $e) {
                $isSuccess = false;
-                $GLOBALS['log']->error('Failed job running, job ['.$job['id'].']. Error Details: '.$e->getMessage());
+                $GLOBALS['log']->error('CronManager: Failed job running, job ['.$job['id'].']. Error Details: '.$e->getMessage());
            }

            $status = $isSuccess ? self::SUCCESS : self::FAILED;

-            $this->getJobService()->updateEntity($job['id'], array(
-                'status' => $status,
-            ));
+            $jobEntity->set('status', $status);
+            $entityManager->saveEntity($jobEntity);

            //set status in the schedulerJobLog
            if (!empty($job['scheduled_job_id'])) {
-                $this->getScheduledJobService()->addLogRecord($job['scheduled_job_id'], $status);
+                $cronScheduledJob->addLogRecord($job['scheduled_job_id'], $status);
            }
        }
+    }

+    /**
+     * Run Scheduled Job
+     *
+     * @param  array  $job
+     *
+     * @return void
+     */
+    protected function runScheduledJob(array $job)
+    {
+        $jobName = $job['method'];
+
+        $className = $this->getScheduledJobUtil()->get($jobName);
+        if ($className === false) {
+            throw new NotFound();
+        }
+
+        $jobClass = new $className($this->container);
+        $method = $this->getScheduledJobUtil()->getMethodName();
+        if (!method_exists($jobClass, $method)) {
+            throw new NotFound();
+        }
+
+        $jobClass->$method();
+    }
+
+    /**
+     * Run Service
+     *
+     * @param  array  $job
+     *
+     * @return void
+     */
+    protected function runService(array $job)
+    {
+        $serviceName = $job['service_name'];
+
+        if (!$this->getServiceFactory()->checkExists($serviceName)) {
+            throw new NotFound();
+        }
+
+        $service = $this->getServiceFactory()->create($serviceName);
+        $serviceMethod = $job['method'];
+
+        if (!method_exists($service, $serviceMethod)) {
+            throw new NotFound();
+        }
+
+        $data = $job['data'];
+        if (Json::isJSON($data)) {
+            $data = Json::decode($data, true);
+        }
+
+        $service->$serviceMethod($data);
    }

    /**
     * Check scheduled jobs and create related jobs
-     * @return array List of created Jobs
+     *
+     * @return array  List of created Jobs
     */
    protected function createJobsFromScheduledJobs()
    {
-        $activeScheduledJobs = $this->getScheduledJobService()->getActiveJobs();
+        $entityManager = $this->getEntityManager();
+
+        $activeScheduledJobs = $this->getCronScheduledJob()->getActiveJobs();
+
+        $cronJob = $this->getCronJob();
+        $runningScheduledJobs = $cronJob->getActiveJobs('scheduled_job_id', self::RUNNING, PDO::FETCH_COLUMN);

        $createdJobs = array();
        foreach ($activeScheduledJobs as $scheduledJob) {

+            if (in_array($scheduledJob['id'], $runningScheduledJobs)) {
+                continue;
+            }
+
            $scheduling = $scheduledJob['scheduling'];

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

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

-            $existsJob = $this->getJobService()->getJobByScheduledJob($scheduledJob['id'], $prevDate);
+            $existsJob = $cronJob->getJobByScheduledJob($scheduledJob['id'], $prevDate);

            if (!isset($existsJob) || empty($existsJob)) {
-                //create a job
-                $data = array(
+                //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'],
-                );
-                $createdJobs[] = $this->getJobService()->createEntity($data);
+                ));
+                $jobEntityId = $entityManager->saveEntity($jobEntity);
+                if (!empty($jobEntityId)) {
+                    $createdJobs[] = $jobEntityId;
+                }
            }
        }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -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/.
+ ************************************************************************/
+
+namespace Espo\Core\Entities;
+
+class CategoryTreeItem extends \Espo\Core\ORM\Entity
+{
+    public function toArray()
+    {
+        $data = parent::toArray();
+        $childList = $this->get('childList');
+        if (is_null($childList)) {
+            $data['childList'] = null;
+        } else {
+            $arr = [];
+            foreach ($childList as $entity) {
+                $arr[] = $entity->toArray();
+            }
+            $data['childList'] = $arr;
+        }
+        return $data;
+    }
+}
+
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -18,18 +18,16 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Core\Entities;

 class Person extends \Espo\Core\ORM\Entity
 {
-    public static $person = true;
-    
    public function _setLastName($value)
    {
        $this->setValue('lastName', $value);
-        
+
        $firstName = $this->get('firstName');
        if (empty($firstName)) {
            $this->setValue('name', $value);
@@ -37,11 +35,11 @@ class Person extends \Espo\Core\ORM\Entity
            $this->setValue('name', $firstName . ' ' . $value);
        }
    }
-    
+
    public function _setFirstName($value)
    {
        $this->setValue('firstName', $value);
-        
+
        $lastName = $this->get('lastName');
        if (empty($lastName)) {
            $this->setValue('name', $value);
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -18,7 +18,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Core\EntryPoints;

@@ -29,50 +29,50 @@ use \Espo\Core\Exceptions\Forbidden;
 abstract class Base
 {
    private $container;
-    
+
    public static $authRequired = true;
-    
+
    protected function getContainer()
    {
        return $this->container;
    }
-    
+
    protected function getUser()
    {
        return $this->getContainer()->get('user');
    }
-    
+
    protected function getAcl()
    {
        return $this->getContainer()->get('acl');
    }
-    
+
    protected function getEntityManager()
    {
        return $this->getContainer()->get('entityManager');
    }
-    
+
    protected function getServiceFactory()
    {
        return $this->getContainer()->get('serviceFactory');
-    }    
-    
+    }
+
    protected function getConfig()
    {
        return $this->getContainer()->get('config');
    }
-    
+
    protected function getMetadata()
    {
        return $this->getContainer()->get('metadata');
-    }    
-    
+    }
+
    public function __construct(Container $container)
    {
        $this->container = $container;
    }
-    
-    abstract public function run();    
+
+    abstract public function run();

 }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -28,7 +28,6 @@ class ExtensionManager extends Upgrades\Base

    protected $params = array(
        'packagePath' => 'data/upload/extensions',
-
        'backupPath' => 'data/.backup/extensions',

        'scriptNames' => array(
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -29,33 +29,33 @@ use \Espo\Core\Exceptions\NotFound;
 class ClientManager
 {
    protected $entityManager;
-    
+
    protected $metadata;
-    
+
    protected $clientMap = array();
-    
+
    public function __construct($entityManager, $metadata, $config)
    {
        $this->entityManager = $entityManager;
        $this->metadata = $metadata;
        $this->config = $config;
    }
-    
+
    protected function getMetadata()
    {
        return $this->metadata;
    }
-    
+
    protected function getEntityManager()
    {
        return $this->entityManager;
    }
-    
+
    protected function getConfig()
    {
        return $this->config;
    }
-    
+
    public function storeAccessToken($hash, $data)
    {
        if (!empty($this->clientMap[$hash]) && !empty($this->clientMap[$hash]['externalAccountEntity'])) {
@@ -64,37 +64,37 @@ class ClientManager
            $externalAccountEntity->set('tokenType', $data['tokenType']);
            $this->getEntityManager()->saveEntity($externalAccountEntity);
        }
-    } 
-    
+    }
+
    public function create($integration, $userId)
    {
-        $authMethod = $this->getMetadata()->get("integrations.{$integration}.authMethod");        
-        $methodName = 'create' . ucfirst($authMethod);        
-        return $this->$methodName($integration, $userId);        
+        $authMethod = $this->getMetadata()->get("integrations.{$integration}.authMethod");
+        $methodName = 'create' . ucfirst($authMethod);
+        return $this->$methodName($integration, $userId);
    }
-    
+
    protected function createOAuth2($integration, $userId)
-    {        
+    {
        $integrationEntity = $this->getEntityManager()->getEntity('Integration', $integration);
        $externalAccountEntity = $this->getEntityManager()->getEntity('ExternalAccount', $integration . '__' . $userId);
-        
+
        $className = $this->getMetadata()->get("integrations.{$integration}.clientClassName");
-        
-        $redirectUri = $this->getConfig()->get('siteUrl') . '/oauthcallback'; // TODO move to client class
-        
+
+        $redirectUri = $this->getConfig()->get('siteUrl') . '?entryPoint=oauthCallback'; // TODO move to client class
+
        if (!$externalAccountEntity) {
            throw new Error("External Account {$integration} not found for {$userId}");
        }
-        
+
        if (!$integrationEntity->get('enabled')) {
            return null;
-        }        
+        }
        if (!$externalAccountEntity->get('enabled')) {
            return null;
-        }        
-        
-        $oauth2Client = new \Espo\Core\ExternalAccount\OAuth2\Client();        
-                
+        }
+
+        $oauth2Client = new \Espo\Core\ExternalAccount\OAuth2\Client();
+
        $client = new $className($oauth2Client, array(
            'endpoint' => $this->getMetadata()->get("integrations.{$integration}.params.endpoint"),
            'tokenEndpoint' => $this->getMetadata()->get("integrations.{$integration}.params.tokenEndpoint"),
@@ -105,12 +105,12 @@ class ClientManager
            'refreshToken' => $externalAccountEntity->get('refreshToken'),
            'tokenType' => $externalAccountEntity->get('tokenType'),
        ), $this);
-        
+
        $this->addToClientMap($client, $integrationEntity, $externalAccountEntity, $userId);
-        
-        return $client;        
+
+        return $client;
    }
-    
+
    protected function addToClientMap($client, $integrationEntity, $externalAccountEntity, $userId)
    {
        $this->clientMap[spl_object_hash($client)] = array(
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -29,9 +29,9 @@ use \Espo\Core\ExternalAccount\OAuth2\Client;
 abstract class OAuth2Abstract implements IClient
 {
    protected $client = null;
-    
+
    protected $manager = null;
-    
+
    protected $paramList = array(
        'endpoint',
        'tokenEndpoint',
@@ -42,33 +42,33 @@ abstract class OAuth2Abstract implements IClient
        'refreshToken',
        'redirectUri',
    );
-    
+
    protected $clientId = null;
-    
+
    protected $clientSecret = null;
-    
+
    protected $accessToken = null;
-    
+
    protected $refreshToken = null;
-    
+
    protected $redirectUri = null;
-    
+
    public function __construct($client, array $params = array(), $manager = null)
    {
        $this->client = $client;

        $this->setParams($params);
-        
+
        $this->manager = $manager;
    }
-    
+
    public function getParam($name)
    {
        if (in_array($name, $this->paramList)) {
            return $this->$name;
        }
    }
-    
+
    public function setParam($name, $value)
    {
        if (in_array($name, $this->paramList)) {
@@ -79,7 +79,7 @@ abstract class OAuth2Abstract implements IClient
            $this->$name = $value;
        }
    }
-    
+
    public function setParams(array $params)
    {
        foreach ($this->paramList as $name) {
@@ -88,42 +88,41 @@ abstract class OAuth2Abstract implements IClient
            }
        }
    }
-    
+
    protected function afterTokenRefreshed($data)
    {
        if ($this->manager) {
            $this->manager->storeAccessToken(spl_object_hash($this), $data);
        }
    }
-    
+
    public function getAccessTokenFromAuthorizationCode($code)
    {
        $r = $this->client->getAccessToken($this->getParam('tokenEndpoint'), Client::GRANT_TYPE_AUTHORIZATION_CODE, array(
            'code' => $code,
            'redirect_uri' => $this->getParam('redirectUri')
        ));
-        
-        
+
        if ($r['code'] == 200) {
            $data = array();
            if (!empty($r['result'])) {
                $data['accessToken'] = $r['result']['access_token'];
                $data['tokenType'] = $r['result']['token_type'];
-                $data['refreshToken'] = $r['result']['refresh_token'];        
+                $data['refreshToken'] = $r['result']['refresh_token'];
            }
            return $data;
        }
        return null;
    }
-    
+
    abstract protected function getPingUrl();
-    
+
    public function ping()
    {
        if (empty($this->accessToken) || empty($this->clientId) || empty($this->clientSecret)) {
            return false;
        }
-        
+
        $url = $this->getPingUrl();

        try {
@@ -133,35 +132,48 @@ abstract class OAuth2Abstract implements IClient
            return false;
        }
    }
-    
-    public function request($url, $params = array(), $httpMethod = Client::HTTP_METHOD_GET, $allowRenew = true)
+
+    public function request($url, $params = null, $httpMethod = Client::HTTP_METHOD_GET, $contentType = null, $allowRenew = true)
    {
-        $r = $this->client->request($url, $params, $httpMethod);
-        
+        $httpHeaders = array();
+        if (!empty($contentType)) {
+            $httpHeaders['Content-Type'] = $contentType;
+            switch ($contentType) {
+                case Client::CONTENT_TYPE_MULTIPART_FORM_DATA:
+                    $httpHeaders['Content-Length'] = strlen($params);
+                    break;
+                case Client::CONTENT_TYPE_APPLICATION_JSON:
+                    $httpHeaders['Content-Length'] = strlen($params);
+                    break;
+            }
+        }
+
+        $r = $this->client->request($url, $params, $httpMethod, $httpHeaders);
+
        $code = null;
        if (!empty($r['code'])) {
            $code = $r['code'];
-        }        
-        
-        if ($code == 200) {
+        }
+
+        if ($code >= 200 && $code < 300) {
            return $r['result'];
        } else {
            $handledData = $this->handleErrorResponse($r);
-            
+
            if ($allowRenew && is_array($handledData)) {
                if ($handledData['action'] == 'refreshToken') {
-                    if ($this->refreshToken()) {                
-                        return $this->request($url, $params, $httpMethod, false);                        
+                    if ($this->refreshToken()) {
+                        return $this->request($url, $params, $httpMethod, $contentType, false);
                    }
                } else if ($handledData['action'] == 'renew') {
-                    return $this->request($url, $params, $httpMethod, false);    
+                    return $this->request($url, $params, $httpMethod, $contentType, false);
                }
            }
        }
-        
+
        throw new Error("Error after requesting {$httpMethod} {$url}.", $code);
    }
-    
+
    protected function refreshToken()
    {
        if (!empty($this->refreshToken)) {
@@ -183,11 +195,11 @@ abstract class OAuth2Abstract implements IClient
            }
        }
    }
-    
+
    protected function handleErrorResponse($r)
    {
        if ($r['code'] == 401 && !empty($r['result'])) {
-            $result = $r['result'];            
+            $result = $r['result'];
            if (strpos($r['header'], 'error=invalid_token') !== false) {
                return array(
                    'action' => 'refreshToken'
@@ -198,7 +210,7 @@ abstract class OAuth2Abstract implements IClient
                );
            }
        } else if ($r['code'] == 400 && !empty($r['result'])) {
-            if ($r['result']['error'] == 'invalid_token') {                
+            if ($r['result']['error'] == 'invalid_token') {
                return array(
                    'action' => 'refreshToken'
                );
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -32,8 +32,9 @@ class Client
    const TOKEN_TYPE_BEARER = 'Bearer';
    const TOKEN_TYPE_OAUTH = 'OAuth';

-    const CONTENT_TYPE_APPLICATION = 0;
-    const CONTENT_TYPE_MULTIPART = 1;
+    const CONTENT_TYPE_APPLICATION_X_WWW_FORM_URLENENCODED = 'application/x-www-form-urlencoded';
+    const CONTENT_TYPE_MULTIPART_FORM_DATA = 'multipart/form-data';
+    const CONTENT_TYPE_APPLICATION_JSON = 'application/json';

    const HTTP_METHOD_GET = 'GET';
    const HTTP_METHOD_POST = 'POST';
@@ -118,7 +119,7 @@ class Client
        $this->accessTokenSecret = $accessTokenSecret;
    }

-    public function request($url, $params = array(), $httpMethod = self::HTTP_METHOD_GET, array $httpHeaders = array(), $contentType = self::CONTENT_TYPE_MULTIPART)
+    public function request($url, $params = null, $httpMethod = self::HTTP_METHOD_GET, array $httpHeaders = array())
    {
        if ($this->accessToken) {
            switch ($this->tokenType) {
@@ -137,10 +138,10 @@ class Client
            }
        }

-        return $this->execute($url, $params, $httpMethod, $httpHeaders, $contentType);
+        return $this->execute($url, $params, $httpMethod, $httpHeaders);
    }

-    private function execute($url, $params = array(), $httpMethod, array $httpHeaders = array(), $contentType = self::CONTENT_TYPE_MULTIPART)
+    private function execute($url, $params = null, $httpMethod, array $httpHeaders = array())
    {
        $curlOptions = array(
            CURLOPT_RETURNTRANSFER => true,
@@ -153,8 +154,10 @@ class Client
                $curlOptions[CURLOPT_POST] = true;
            case self::HTTP_METHOD_PUT:
            case self::HTTP_METHOD_PATCH:
-                if (self::CONTENT_TYPE_APPLICATION === $contentType) {
+                if (is_array($params)) {
                    $postFields = http_build_query($params, null, '&');
+                } else {
+                    $postFields = $params;
                }
                $curlOptions[CURLOPT_POSTFIELDS] = $postFields;
                break;
@@ -165,7 +168,9 @@ class Client
                if (strpos($url, '?') === false) {
                    $url .= '?';
                }
-                $url .= http_build_query($params, null, '&');
+                if (is_array($params)) {
+                    $url .= http_build_query($params, null, '&');
+                }
                break;
            default:
                break;
@@ -228,7 +233,7 @@ class Client
        $params['grant_type'] = $grantType;

        $httpHeaders = array();
-        switch ($this->clientAuth) {
+        switch ($this->tokenType) {
            case self::AUTH_TYPE_URI:
            case self::AUTH_TYPE_FORM:
                $params['client_id'] = $this->clientId;
@@ -242,7 +247,7 @@ class Client
                throw new \Exception();
        }

-        return $this->execute($url, $params, self::HTTP_METHOD_POST, $httpHeaders, self::CONTENT_TYPE_APPLICATION);
+        return $this->execute($url, $params, self::HTTP_METHOD_POST, $httpHeaders);
    }
 }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -73,7 +73,7 @@ class HookManager
    protected function loadHooks()
    {
        if ($this->getConfig()->get('useCache') && file_exists($this->cacheFile)) {
-            $this->data = $this->getFileManager()->getContents($this->cacheFile);
+            $this->data = $this->getFileManager()->getPhpContents($this->cacheFile);
            return;
        }

@@ -83,20 +83,20 @@ class HookManager

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

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

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

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

        if (!empty($this->data[$scope])) {
@@ -106,7 +106,7 @@ class HookManager
                        $this->hooks[$className] = $this->createHookByClassName($className);
                    }
                    $hook = $this->hooks[$className];
-                    $hook->$hookName($injection);
+                    $hook->$hookName($injection, $options);
                }
            }
        }
@@ -170,7 +170,9 @@ class HookManager
                            $sortedHookList = array_merge($sortedHookList, $hookDetails);
                        }

-                        $hooks[$scopeName][$hookName] = isset($hooks[$scopeName][$hookName]) ? array_merge($hooks[$scopeName][$hookName], $sortedHookList) : $sortedHookList;
+                        $normalizedScopeName = Util::normilizeScopeName($scopeName);
+
+                        $hooks[$normalizedScopeName][$hookName] = isset($hooks[$normalizedScopeName][$hookName]) ? array_merge($hooks[$normalizedScopeName][$hookName], $sortedHookList) : $sortedHookList;
                    }
                }
            }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -24,7 +24,7 @@ namespace Espo\Core\Hooks;

 use \Espo\Core\Interfaces\Injectable;

-class Base implements Injectable
+abstract class Base implements Injectable
 {
    protected $dependencies = array(
        'entityManager',
@@ -52,6 +52,11 @@ class Base implements Injectable
        return $this->dependencies;
    }

+    protected function addDependency($name)
+    {
+        $this->dependencies[] = $name;
+    }
+
    protected function getInjection($name)
    {
        return $this->injections[$name];
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -24,7 +24,6 @@ namespace Espo\Core\Jobs;

 use \Espo\Core\Container;

-
 abstract class Base
 {
    private $container;
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -36,6 +36,8 @@ class EntityManager extends Base
            'password' => $config->get('database.password'),
            'metadata' => $this->getContainer()->get('metadata')->getOrmMetadata(),
            'repositoryFactoryClassName' => '\\Espo\\Core\\ORM\\RepositoryFactory',
+            'driver' => $config->get('database.driver'),
+            'platform' => $config->get('database.platform')
        );

        $entityManager = new \Espo\Core\ORM\EntityManager($params);
@@ -0,0 +1,38 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Loaders;
+
+class EntityManagerUtil extends Base
+{
+    public function load()
+    {
+        $entityManager = new \Espo\Core\Utils\EntityManager(
+            $this->getContainer()->get('metadata'),
+            $this->getContainer()->get('language'),
+            $this->getContainer()->get('fileManager')
+        );
+
+        return $entityManager;
+    }
+}
+
@@ -1,92 +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/.
+ ************************************************************************/

 namespace Espo\Core\Mail;

 use \Zend\Mime\Mime as Mime;

+use \Espo\ORM\Entity;
+
 class Importer
-{    
+{
    private $entityManager;
-    
+
    private $fileManager;
-    
-    public function __construct($entityManager, $fileManager)
+
+    private $config;
+
+    public function __construct($entityManager, $fileManager, $config)
    {
        $this->entityManager = $entityManager;
        $this->fileManager = $fileManager;
+        $this->config = $config;
    }
-    
+
    protected function getEntityManager()
    {
        return $this->entityManager;
    }
-    
+    protected function getConfig()
+    {
+        return $this->config;
+    }
+
    protected function getFileManager()
    {
        return $this->fileManager;
    }
-    
+
    public function importMessage($message, $userId, $teamsIds = array())
    {
        try {
            $email = $this->getEntityManager()->getEntity('Email');
-            
+
            $subject = $message->subject;
            if ($subject !== '0' && empty($subject)) {
-                $subject = '--empty--';
+                $subject = '(No Subject)';
            }
-            
-            $email->set('isHtml', false);        
+
+            $email->set('isHtml', false);
            $email->set('name', $subject);
            $email->set('status', 'Archived');
-            $email->set('attachmentsIds', array());            
+            $email->set('attachmentsIds', array());
            $email->set('assignedUserId', $userId);
            $email->set('teamsIds', $teamsIds);
-            
-            $fromArr = $this->getAddressListFromMessage($message, 'from');            
+
+            $fromArr = $this->getAddressListFromMessage($message, 'from');
            if (isset($message->from)) {
-                $email->set('fromName', $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');
+
            $email->set('from', $fromArr[0]);
-            $email->set('to', implode(';', $this->getAddressListFromMessage($message, 'to')));        
-            $email->set('cc', implode(';', $this->getAddressListFromMessage($message, 'cc')));
-            
-            if (isset($message->messageId) && !empty($message->messageId)) { 
+            $email->set('to', implode(';', $toArr));
+            $email->set('cc', implode(';', $ccArr));
+
+            if (isset($message->messageId) && !empty($message->messageId)) {
                $email->set('messageId', $message->messageId);
                if (isset($message->deliveredTo)) {
                    $email->set('messageIdInternal', $message->messageId . '-' . $message->deliveredTo);
                }
            }
-            
-            if ($this->checkIsDuplicate($email)) {
+
+            if ($duplicate = $this->findDuplicate($email)) {
+            	$duplicate->loadLinkMultipleField('users');
+            	$usersIds = $duplicate->get('usersIds');
+            	$usersIds[] = $userId;
+            	$duplicate->set('usersIds', $usersIds);
+            	$this->getEntityManager()->saveEntity($duplicate);
+
+                if (!empty($teamsIds)) {
+                    foreach ($teamsIds as $teamId) {
+                        $this->getEntityManager()->getRepository('Email')->relate($duplicate, 'teams', $teamId);
+                    }
+                }
                return false;
-            }            
+            }

            if (isset($message->date)) {
                $dt = new \DateTime($message->date);
                if ($dt) {
-                    $dateSent = $dt->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d H:i:s');        
+                    $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);
                if ($dt) {
-                    $deliveryDate = $dt->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d H:i:s');        
+                    $deliveryDate = $dt->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d H:i:s');
                    $email->set('deliveryDate', $deliveryDate);
                }
            }
-            
+
            $inlineIds = array();
-    
-            if ($message->isMultipart()) {                
+
+            if ($message->isMultipart()) {
                foreach (new \RecursiveIteratorIterator($message) as $part) {
                    $this->importPartDataToEmail($email, $part, $inlineIds);
-                }            
+                }
            } else {
-                $this->importPartDataToEmail($email, $message, $inlineIds);
+                $this->importPartDataToEmail($email, $message, $inlineIds, 'text/plain');
            }
-            
+
            $body = $email->get('body');
            if (!empty($body)) {
                foreach ($inlineIds as $cid => $attachmentId) {
@@ -95,30 +144,96 @@ class Importer
                $email->set('body', $body);
            }

+            $parentFound = false;
+
+            if (isset($message->references) && !empty($message->references)) {
+                $reference = str_replace(array('/', '@'), " ", trim($message->references, '<>'));
+                $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)) {
+                        $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 (!empty($toArr)) {
+                        $parentFound = $this->findParent($email, $toArr[0]);
+                    }
+                }
+            }
+
            $this->getEntityManager()->saveEntity($email);
-            
+
            return $email;
-                    
+
        } catch (\Exception $e) {}
    }
-    
-    protected function checkIsDuplicate($email)
+
+    protected function findParent(Entity $email, $emailAddress)
    {
-        if ($email->get('messageIdInternal')) {
+        $contact = $this->getEntityManager()->getRepository('Contact')->where(array(
+            'emailAddress' => $emailAddress
+        ))->findOne();
+        if ($contact) {
+            if (!$this->getConfig()->get('b2cMode')) {
+                if ($contact->get('accountId')) {
+                    $email->set('parentType', 'Account');
+                    $email->set('parentId', $contact->get('accountId'));
+                    return true;
+                }
+            } else {
+                $email->set('parentType', 'Contact');
+                $email->set('parentId', $contact->id);
+                return true;
+            }
+        } else {
+            $account = $this->getEntityManager()->getRepository('Account')->where(array(
+                'emailAddress' => $emailAddress
+            ))->findOne();
+            if ($account) {
+                $email->set('parentType', 'Account');
+                $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;
+	            }
+	       	}
+        }
+    }
+
+    protected function findDuplicate(Entity $email)
+    {
+        if ($email->get('messageId')) {
            $duplicate = $this->getEntityManager()->getRepository('Email')->where(array(
-                'messageIdInternal' => $email->get('messageIdInternal')
+                'messageId' => $email->get('messageId')
            ))->findOne();
            if ($duplicate) {
-                return true;
+                return $duplicate;
            }
        }
    }
-    
+
    protected function getAddressListFromMessage($message, $type)
    {
        $addressList = array();
        if (isset($message->$type)) {
-            
+
            $list = $message->getHeader($type)->getAddressList();
            foreach ($list as $address) {
                $addressList[] = $address->getEmail();
@@ -126,82 +241,107 @@ class Importer
        }
        return $addressList;
    }
-    
-    protected function importPartDataToEmail(\Espo\Entities\Email $email, $part, &$inlineIds = array())
-    {        
+
+    protected function importPartDataToEmail(\Espo\Entities\Email $email, $part, &$inlineIds = array(), $defaultContentType = null)
+    {
        try {
-            $type = strtok($part->contentType, ';');
-            $encoding = null;
-            
-            switch ($type) {
-                case 'text/plain':                    
-                    $content = $this->getContentFromPart($part);                
-                    if (!$email->get('body')) {                
-                        $email->set('body', $content);
-                    }
-                    $email->set('bodyPlain', $content);
-                    break;
-                case 'text/html':
-                    $content = $this->getContentFromPart($part);
-                    $email->set('body', $content);
-                    $email->set('isHtml', true);
-                    break;
-                default:
-                    $content = $part->getContent();                    
-                    $disposition = null;
-                    
-                    $fileName = null;
-                    $contentId = null;
-                            
-                    if (isset($part->ContentDisposition)) {                
-                        if (strpos($part->ContentDisposition, 'attachment') === 0) {
-                            if (preg_match('/filename="?([^"]+)"?/i', $part->ContentDisposition, $m)) {
-                                $fileName = $m[1];
-                                $disposition = 'attachment';
-                            }                            
-                        } else if (strpos($part->ContentDisposition, 'inline') === 0) {
-                            $contentId = trim($part->contentID, '<>');
-                            $fileName = $contentId;
-                            $disposition = 'inline';
-                        }                        
-                    }
-                    
-                    if (isset($part->contentTransferEncoding)) {
-                        $encoding = strtolower($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;
-                    }        
+            $type = null;
+
+            if ($part->getHeaders() && isset($part->contentType)) {
+                $type = strtok($part->contentType, ';');
            }
-        } catch (\Exception $e) {}        
+
+            if (empty($type)) {
+                if (!empty($defaultContentType)) {
+                    $type = $defaultContentType;
+                } else {
+                    return;
+                }
+            }
+
+            $encoding = null;
+
+            $isAttachment = true;
+
+            if ($type == 'text/plain' || $type == 'text/html') {
+
+                $isAttachment = false;
+                $content = $this->getContentFromPart($part);
+                if ($type == 'text/plain') {
+                    if ($email->get('bodyPlain')) {
+                        $isAttachment = true;
+                    } else {
+                        $email->set('bodyPlain', $content);
+                        if (!$email->get('body')) {
+                            $email->set('body', $content);
+                        }
+                    }
+                } else if ($type == 'text/html') {
+                    if ($email->get('isHtml')) {
+                        $isAttachment = true;
+                    } else {
+                        $email->set('body', $content);
+                        $email->set('isHtml', true);
+                    }
+                }
+            }
+
+            if ($isAttachment) {
+                $content = $part->getContent();
+                $disposition = null;
+
+                $fileName = null;
+                $contentId = null;
+
+                if (isset($part->ContentDisposition)) {
+                    if (strpos($part->ContentDisposition, 'attachment') === 0) {
+                        if (preg_match('/filename="?([^"]+)"?/i', $part->ContentDisposition, $m)) {
+                            $fileName = $m[1];
+                            $disposition = 'attachment';
+                        }
+                    } else if (strpos($part->ContentDisposition, 'inline') === 0) {
+                        $contentId = trim($part->contentID, '<>');
+                        $fileName = $contentId;
+                        $disposition = 'inline';
+                    }
+                }
+
+                if (isset($part->contentTransferEncoding)) {
+                    $encoding = strtolower($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 getContentFromPart($part)
    {
        if ($part instanceof \Zend\Mime\Part) {
@@ -211,20 +351,20 @@ class Importer
            }
        } else {
            $content = $part->getContent();
-            
+
            $encoding = null;
-            
+
            if (isset($part->contentTransferEncoding)) {
                $cteHeader = $part->getHeader('Content-Transfer-Encoding');
                $encoding = strtolower($cteHeader->getTransferEncoding());
            }
-            
+
            if ($encoding == 'base64') {
                $content = base64_decode($content);
            }
-            
-            $charset = 'UTF-8';            
-            
+
+            $charset = 'UTF-8';
+
            if (isset($part->contentType)) {
                $ctHeader = $part->getHeader('Content-Type');
                $charsetParamValue = $ctHeader->getParameter('charset');
@@ -232,17 +372,17 @@ class Importer
                    $charset = strtoupper($charsetParamValue);
                }
            }
-            
-            if ($charset !== 'UTF-8') {
-                $content = mb_convert_encoding($content, 'UTF-8', $charset);
-            }            
-            
+
            if (isset($part->contentTransferEncoding)) {
-                $cteHeader = $part->getHeader('Content-Transfer-Encoding');            
-                if ($cteHeader->getTransferEncoding() == 'quoted-printable') {                    
+                $cteHeader = $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;
    }
@@ -0,0 +1,46 @@
+<?php
+
+namespace Espo\Core\Mail\Mail;
+
+use ArrayIterator;
+use Countable;
+use Iterator;
+use Traversable;
+use Zend\Loader\PluginClassLocator;
+
+class Headers extends \Zend\Mail\Headers
+{
+    public static function fromString($string, $EOL = self::EOL)
+    {
+        $headers     = new static();
+        $currentLine = '';
+
+        // iterate the header lines, some might be continuations
+        foreach (explode($EOL, $string) as $line) {
+            // check if a header name is present
+            if (preg_match('/^(?P<name>[\x21-\x39\x3B-\x7E]+):.*$/', $line, $matches)) {
+                if ($currentLine) {
+                    // a header name was present, then store the current complete line
+                    $headers->addHeaderLine($currentLine);
+                }
+                $currentLine = trim($line);
+            } elseif (preg_match('/^\s+.*$/', $line, $matches)) {
+                // continuation: append to current line
+                $currentLine .= $line;
+            } elseif (preg_match('/^\s*$/', $line)) {
+                // empty line indicates end of headers
+                break;
+            } else {
+                // Line does not match header format!
+                throw new Exception\RuntimeException(sprintf(
+                    'Line "%s"does not match header format!',
+                    $line
+                ));
+            }
+        }
+        if ($currentLine) {
+            $headers->addHeaderLine($currentLine);
+        }
+        return $headers;
+    }
+}
@@ -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/.
+ ************************************************************************/
+
+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;
+        return $this->protocol->search(array('UID ' . $uid . ':*'));
+    }
+
+    public function getIdsFromDate($date)
+    {
+        return $this->protocol->search(array('SINCE "' . $date . '"'));
+    }
+
+}
+
@@ -0,0 +1,155 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Mail\Mail\Storage;
+
+use Espo\Core\Mail\Mail\Headers;
+use Zend\Mail\Header\HeaderInterface;
+use Zend\Mime;
+use Zend\Mail\Storage\Exception;
+use Zend\Mail\Storage\AbstractStorage;
+
+class Message extends \Zend\Mail\Storage\Message
+{
+    public function __construct(array $params)
+    {
+        if (isset($params['file'])) {
+            if (!is_resource($params['file'])) {
+                ErrorHandler::start();
+                $params['raw'] = file_get_contents($params['file']);
+                $error = ErrorHandler::stop();
+                if ($params['raw'] === false) {
+                    throw new Exception\RuntimeException('could not open file', 0, $error);
+                }
+            } else {
+                $params['raw'] = stream_get_contents($params['file']);
+            }
+        }
+
+        if (!empty($params['flags'])) {
+            // set key and value to the same value for easy lookup
+            $this->flags = array_combine($params['flags'], $params['flags']);
+        }
+
+        if (isset($params['handler'])) {
+            if (!$params['handler'] instanceof AbstractStorage) {
+                throw new Exception\InvalidArgumentException('handler is not a valid mail handler');
+            }
+            if (!isset($params['id'])) {
+                throw new Exception\InvalidArgumentException('need a message id with a handler');
+            }
+
+            $this->mail       = $params['handler'];
+            $this->messageNum = $params['id'];
+        }
+
+        $params['strict'] = isset($params['strict']) ? $params['strict'] : false;
+
+        if (isset($params['raw'])) {
+            self::splitMessage($params['raw'], $this->headers, $this->content, Mime\Mime::LINEEND, $params['strict']);
+        } elseif (isset($params['headers'])) {
+            if (is_array($params['headers'])) {
+                $this->headers = new Headers();
+                $this->headers->addHeaders($params['headers']);
+            } else {
+                if ($params['headers'] instanceof \Zend\Mail\Headers) {
+                    $this->headers = $params['headers'];
+                } else {
+                    if (empty($params['noToplines'])) {
+                        self::splitMessage($params['headers'], $this->headers, $this->topLines);
+                    } else {
+                        $this->headers = Headers::fromString($params['headers']);
+                    }
+                }
+            }
+
+            if (isset($params['content'])) {
+                $this->content = $params['content'];
+            }
+        }
+    }
+
+    public function __isset($name)
+    {
+        $headers = $this->getHeaders();
+        if (empty($headers) || !is_object($headers)) {
+            return false;
+        }
+        return $this->getHeaders()->has($name);
+    }
+
+    public function isMultipart()
+    {
+        if (!isset($this->contentType)) {
+            return false;
+        }
+
+        try {
+            return stripos($this->contentType, 'multipart/') === 0;
+        } catch (Exception\ExceptionInterface $e) {
+            return false;
+        }
+    }
+
+    public static function splitMessage($message, &$headers, &$body, $EOL = Mime\Mime::LINEEND, $strict = false)
+    {
+        if ($message instanceof Headers) {
+            $message = $message->toString();
+        }
+        // check for valid header at first line
+        $firstline = strtok($message, "\n");
+        if (!preg_match('%^[^\s]+[^:]*:%', $firstline)) {
+            $headers = array();
+            // TODO: we're ignoring \r for now - is this function fast enough and is it safe to assume noone needs \r?
+            $body = str_replace(array("\r", "\n"), array('', $EOL), $message);
+            return;
+        }
+
+        // see @ZF2-372, pops the first line off a message if it doesn't contain a header
+        if (!$strict) {
+            $parts = explode(':', $firstline, 2);
+            if (count($parts) != 2) {
+                $message = substr($message, strpos($message, $EOL)+1);
+            }
+        }
+
+        // find an empty line between headers and body
+        // default is set new line
+        if (strpos($message, $EOL . $EOL)) {
+            list($headers, $body) = explode($EOL . $EOL, $message, 2);
+        // next is the standard new line
+        } elseif ($EOL != "\r\n" && strpos($message, "\r\n\r\n")) {
+            list($headers, $body) = explode("\r\n\r\n", $message, 2);
+        // next is the other "standard" new line
+        } elseif ($EOL != "\n" && strpos($message, "\n\n")) {
+            list($headers, $body) = explode("\n\n", $message, 2);
+        // at last resort find anything that looks like a new line
+        } else {
+            ErrorHandler::start(E_NOTICE|E_WARNING);
+            list($headers, $body) = preg_split("%([\r\n]+)\\1%U", $message, 2);
+            ErrorHandler::stop();
+        }
+
+        $headers = Headers::fromString($headers, $EOL);
+    }
+}
+
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -68,7 +68,7 @@ class Sender
        $this->params = $params;

        $this->transport = new SmtpTransport();
-        
+
        $opts = array(
            'name' => 'admin',
            'host' => $params['server'],
@@ -83,14 +83,14 @@ class Sender
        if ($params['security']) {
            $opts['connection_config']['ssl'] = strtolower($params['security']);
        }
-        
+
        if (in_array('fromName', $params)) {
            $this->params['fromName'] = $params['fromName'];
        }
        if (in_array('fromAddress', $params)) {
            $this->params['fromAddress'] = $params['fromAddress'];
        }
-        
+
        $options = new SmtpOptions($opts);
        $this->transport->setOptions($options);

@@ -160,10 +160,10 @@ class Sender
            } else {
                $fromName = $config->get('outboundEmailFromName');
            }
-            
+
            $message->addFrom($fromAddress, $fromName);
        }
-        
+
        if (!empty($params['replyToAddress'])) {
            $replyToName = null;
            if (!empty($params['replyToName'])) {
@@ -203,7 +203,6 @@ class Sender
        }

        $attachmentPartList = array();
-
        $attachmentCollection = $email->get('attachments');
        $attachmentInlineCollection = $email->getInlineAttachments();

@@ -220,7 +219,7 @@ class Sender
                $attachmentPartList[] = $attachment;
            }
        }
-        
+
        if (!empty($attachmentInlineCollection)) {
            foreach ($attachmentInlineCollection as $a) {
                $fileName = 'data/upload/' . $a->id;
@@ -239,12 +238,12 @@ class Sender
        $message->setSubject($email->get('name'));

        $body = new MimeMessage();
-        
+
        $textPart = new MimePart($email->getBodyPlainForSending());
        $textPart->type = 'text/plain';
        $textPart->encoding = Mime::ENCODING_QUOTEDPRINTABLE;
        $textPart->charset = 'utf-8';
-        
+
        if ($email->get('isHtml')) {
            $htmlPart = new MimePart($email->getBodyForSending());
            $htmlPart->encoding = Mime::ENCODING_QUOTEDPRINTABLE;
@@ -285,9 +284,19 @@ class Sender

        $message->setBody($body);

-        if ($message->getHeaders()->has('content-type')) {
+        if ($messageType == 'text/plain') {
+            if ($message->getHeaders()->has('content-type')) {
+                $message->getHeaders()->removeHeader('content-type');
+            }
+            $message->getHeaders()->addHeaderLine('Content-Type', 'text/plain; charset=UTF-8');
+        } else {
+            if (!$message->getHeaders()->has('content-type')) {
+                $contentTypeHeader = new \Zend\Mail\Header\ContentType();
+                $message->getHeaders()->addHeader($contentTypeHeader);
+            }
            $message->getHeaders()->get('content-type')->setType($messageType);
        }
+
        $message->setEncoding('UTF-8');

        try {
@@ -305,7 +314,7 @@ class Sender

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

-            $email->set('messageId', $messageId);
+            $email->set('messageId', '<' . $messageId . '>');
            $email->set('status', 'Sent');
            $email->set('dateSent', date("Y-m-d H:i:s"));
        } catch (\Exception $e) {
@@ -1,19 +0,0 @@
-<?php
-
-namespace Espo\Core\Mail\Storage;
-
-class Imap extends \Zend\Mail\Storage\Imap
-{    
-    public function getIdsFromUID($uid)
-    {
-        $uid = intval($uid) + 1;
-        return $this->protocol->search(array('UID ' . $uid . ':*'));
-    }
-    
-    public function getIdsFromDate($date)
-    {        
-        return $this->protocol->search(array('SINCE "' . $date . '"'));
-    }
-    
-}
-
@@ -0,0 +1,103 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Notificators;
+
+use \Espo\Core\Interfaces\Injectable;
+
+use \Espo\ORM\Entity;
+
+class Base implements Injectable
+{
+    protected $dependencies = array(
+        'user',
+        'entityManager',
+    );
+
+    protected $injections = array();
+
+    public static $order = 9;
+
+    public function __construct()
+    {
+        $this->init();
+    }
+
+    protected function init()
+    {
+    }
+
+    protected function addDependency($name)
+    {
+        $this->dependencies[] = $name;
+    }
+
+    public function getDependencyList()
+    {
+        return $this->dependencies;
+    }
+
+    protected function getInjection($name)
+    {
+        return $this->injections[$name];
+    }
+
+    public function inject($name, $object)
+    {
+        $this->injections[$name] = $object;
+    }
+
+    protected function getEntityManager()
+    {
+        return $this->injections['entityManager'];
+    }
+
+    protected function getUser()
+    {
+        return $this->injections['user'];
+    }
+
+    public function process(Entity $entity)
+    {
+        if ($entity->has('assignedUserId') && $entity->get('assignedUserId')) {
+            $assignedUserId = $entity->get('assignedUserId');
+            if ($assignedUserId != $this->getUser()->id && $entity->isFieldChanged('assignedUserId')) {
+                $notification = $this->getEntityManager()->getEntity('Notification');
+                $notification->set(array(
+                    'type' => 'Assign',
+                    'userId' => $assignedUserId,
+                    'data' => array(
+                        'entityType' => $entity->getEntityType(),
+                        'entityId' => $entity->id,
+                        'entityName' => $entity->get('name'),
+                        'isNew' => $entity->isNew(),
+                        'userId' => $this->getUser()->id,
+                        'userName' => $this->getUser()->get('name')
+                    )
+                ));
+                $this->getEntityManager()->saveEntity($notification);
+            }
+        }
+    }
+
+}
+
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -41,17 +41,20 @@ class Entity extends \Espo\ORM\Entity
                $columnsData = new \stdClass();
            }

-            foreach ($collection as $e) {
-                $id = $e->id;
-                $ids[] = $id;
-                $names->$id = $e->get('name');
-                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');
+                    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);
            if (!empty($columns)) {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -32,14 +32,14 @@ use \Espo\Core\Interfaces\Injectable;

 class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 {
-    public static $mapperClassName = '\\Espo\\Core\\ORM\\DB\\MysqlMapper';
-
    protected $dependencies = array(
        'metadata'
    );

    protected $injections = array();

+    private $restoreData = null;
+
    public function inject($name, $object)
    {
        $this->injections[$name] = $object;
@@ -81,6 +81,9 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable

        foreach ($defs['fields'] as $field => $d) {
            if (isset($d['type']) && $d['type'] == 'currency') {
+                if (!empty($d['notStorable'])) {
+                    continue;
+                }
                if (empty($params['customJoin'])) {
                    $params['customJoin'] = '';
                }
@@ -137,49 +140,67 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
        }
    }

-    protected function beforeRemove(Entity $entity)
+    protected function beforeRemove(Entity $entity, array $options = array())
    {
-        parent::beforeRemove($entity);
-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeRemove', $entity);
+        parent::beforeRemove($entity, $options);
+        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeRemove', $entity, $options);
+
+        $nowString = date('Y-m-d H:i:s', time());
+        if ($entity->hasField('modifiedAt')) {
+            $entity->set('modifiedAt', $nowString);
+        }
+        if ($entity->hasField('modifiedById')) {
+            $entity->set('modifiedById', $this->getEntityManager()->getUser()->id);
+        }
    }

-    protected function afterRemove(Entity $entity)
+    protected function afterRemove(Entity $entity, array $options = array())
    {
-        parent::afterRemove($entity);
-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'afterRemove', $entity);
+        parent::afterRemove($entity, $options);
+        $this->getEntityManager()->getHookManager()->process($this->entityName, 'afterRemove', $entity, $options);
    }

-    public function remove(Entity $entity)
+    public function remove(Entity $entity, array $options = array())
    {
-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeRemove', $entity);
+        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeRemove', $entity, $options);

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

-    protected function beforeSave(Entity $entity)
+    protected function beforeSave(Entity $entity, array $options = array())
    {
-        parent::beforeSave($entity);
-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeSave', $entity);
+        parent::beforeSave($entity, $options);
+
+        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeSave', $entity, $options);
    }

-    protected function afterSave(Entity $entity)
+    protected function afterSave(Entity $entity, array $options = array())
    {
-        parent::afterSave($entity);
-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'afterSave', $entity);
+        if (!empty($this->restoreData)) {
+            $entity->set($this->restoreData);
+            $this->restoreData = null;
+        }
+        parent::afterSave($entity, $options);
+
+        $this->handleEmailAddressSave($entity);
+        $this->handlePhoneNumberSave($entity);
+        $this->handleSpecifiedRelations($entity);
+
+        $this->getEntityManager()->getHookManager()->process($this->entityName, 'afterSave', $entity, $options);
    }

-    public function save(Entity $entity)
+    public function save(Entity $entity, array $options = array())
    {
        $nowString = date('Y-m-d H:i:s', time());
        $restoreData = array();

        if ($entity->isNew()) {
            if (!$entity->has('id')) {
-                $entity->set('id', uniqid());
+                $entity->set('id', Util::generateId());
            }

            if ($entity->hasField('createdAt')) {
@@ -200,11 +221,13 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
            }
            $entity->clear('modifiedById');
        } else {
-            if ($entity->hasField('modifiedAt')) {
-                $entity->set('modifiedAt', $nowString);
-            }
-            if ($entity->hasField('modifiedById')) {
-                $entity->set('modifiedById', $this->entityManager->getUser()->id);
+            if (empty($options['silent'])) {
+                if ($entity->hasField('modifiedAt')) {
+                    $entity->set('modifiedAt', $nowString);
+                }
+                if ($entity->hasField('modifiedById')) {
+                    $entity->set('modifiedById', $this->entityManager->getUser()->id);
+                }
            }

            if ($entity->has('createdById')) {
@@ -216,13 +239,9 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
            $entity->clear('createdById');
            $entity->clear('createdAt');
        }
-        $result = parent::save($entity);
+        $this->restoreData = $restoreData;

-        $entity->set($restoreData);
-
-        $this->handleEmailAddressSave($entity);
-        $this->handlePhoneNumberSave($entity);
-        $this->handleSpecifiedRelations($entity);
+        $result = parent::save($entity, $options);

        return $result;
    }
@@ -247,8 +266,22 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
        foreach ($entity->getRelations() as $name => $defs) {
            if (in_array($defs['type'], $relationTypes)) {
                $fieldName = $name . 'Ids';
-                if ($entity->has($fieldName)) {
-                    $specifiedIds = $entity->get($fieldName);
+                $columnsFieldsName = $name . 'Columns';
+
+                if ($entity->has($fieldName) || $entity->has($columnsFieldsName)) {
+
+                    if ($this->getMetadata()->get("entityDefs." . $entity->getEntityType() . ".fields.{$name}.noSave")) {
+                        continue;
+                    }
+
+                    if ($entity->has($fieldName)) {
+                        $specifiedIds = $entity->get($fieldName);
+                    } else {
+                        $specifiedIds = array();
+                        foreach ($entity->get($columnsFieldsName) as $id => $d) {
+                            $specifiedIds[] = $id;
+                        }
+                    }
                    if (is_array($specifiedIds)) {
                        $toRemoveIds = array();
                        $existingIds = array();
@@ -256,25 +289,36 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
                        $existingColumnsData = new \stdClass();

                        $defs = array();
-                        $columns = $this->getMetadata()->get("entityDefs." . $entity->getEntityName() . ".fields.{$name}.columns");
+                        $columns = $this->getMetadata()->get("entityDefs." . $entity->getEntityType() . ".fields.{$name}.columns");
                        if (!empty($columns)) {
-                            $columnData = $entity->get($name . 'Columns');
+                            $columnData = $entity->get($columnsFieldsName);
                            $defs['additionalColumns'] = $columns;
-
                        }

-                        foreach ($entity->get($name, $defs) as $foreignEntity) {
-                            $existingIds[] = $foreignEntity->id;
-                            if (!empty($columns)) {
-                                $data = new \stdClass();
-                                foreach ($columns as $columnName => $columnField) {
-                                    $foreignId = $foreignEntity->id;
-                                    $data->$columnName = $foreignEntity->get($columnField);
+                        $foreignCollection = $entity->get($name, $defs);
+                        if ($foreignCollection) {
+                            foreach ($foreignCollection as $foreignEntity) {
+                                $existingIds[] = $foreignEntity->id;
+                                if (!empty($columns)) {
+                                    $data = new \stdClass();
+                                    foreach ($columns as $columnName => $columnField) {
+                                        $foreignId = $foreignEntity->id;
+                                        $data->$columnName = $foreignEntity->get($columnField);
+                                    }
+                                    $existingColumnsData->$foreignId = $data;
+                                    $entity->setFetched($columnsFieldsName, $existingColumnsData);
                                }
-                                $existingColumnsData->$foreignId = $data;
-                            }

+                            }
                        }
+
+                        if ($entity->has($fieldName)) {
+                            $entity->setFetched($fieldName, $existingIds);
+                        }
+                        if ($entity->has($columnsFieldsName) && !empty($columns)) {
+                            $entity->setFetched($columnsFieldsName, $existingColumnsData);
+                        }
+
                        foreach ($existingIds as $id) {
                            if (!in_array($id, $specifiedIds)) {
                                $toRemoveIds[] = $id;
@@ -288,10 +332,12 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
                                }
                            }
                        }
+
+
                        foreach ($specifiedIds as $id) {
                            if (!in_array($id, $existingIds)) {
                                $data = null;
-                                if (!empty($columns)) {
+                                if (!empty($columns) && isset($columnData->$id)) {
                                    $data = $columnData->$id;
                                }
                                $this->relate($entity, $name, $id, $data);
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -0,0 +1,95 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Repositories;
+
+use \Espo\Core\Entities\CategoryTreeItem as Entity;
+
+class CategoryTree extends \Espo\Core\ORM\Repositories\RDB
+{
+	public function afterSave(Entity $entity, $options)
+	{
+		parent::afterSave($entity, $options);
+
+		$pdo = $this->getEntityManager()->getPDO();
+		$query = $this->getEntityManager()->getQuery();
+
+		$parentId = $entity->get('parentId');
+		$pathsTableName = $query->toDb($entity->getEntityType() . 'Path');
+
+		if ($entity->isNew()) {
+			if ($parentId) {
+				$sql = "
+					INSERT INTO `".$pathsTableName."` (ascendor_id, descendor_id)
+						SELECT ascendor_id, ".$pdo->quote($entity->id)."
+						FROM `".$pathsTableName."`
+						WHERE descendor_id = ".$pdo->quote($parentId)."
+						UNION ALL
+						SELECT ".$pdo->quote($entity->id).", ".$pdo->quote($entity->id)."
+				";
+			} else {
+				$sql = "
+					INSERT INTO `".$pathsTableName."` (ascendor_id, descendor_id)
+					VALUES
+					(".$pdo->quote($entity->id).", ".$pdo->quote($entity->id).")
+				";
+			}
+			$pdo->query($sql);
+		} else {
+			if ($entity->isFieldChanged('parentId')) {
+				$sql = "
+					DELETE a FROM `".$pathsTableName."` AS a
+					JOIN `".$pathsTableName."` AS d ON a.descendor_id = d.descendor_id
+					LEFT JOIN `".$pathsTableName."` AS x ON x.ascendor_id = d.ascendor_id AND x.descendor_id = a.ascendor_id
+					WHERE d.ascendor_id = ".$pdo->quote($entity->id)." AND x.ascendor_id IS NULL
+				";
+				$pdo->query($sql);
+				if (!empty($parentId)) {
+					$sql = "
+						INSERT INTO `".$pathsTableName."` (ascendor_id, descendor_id)
+							SELECT supertree.ascendor_id, subtree.descendor_id
+							FROM `".$pathsTableName."` AS supertree
+							JOIN `".$pathsTableName."` AS subtree
+							WHERE
+								subtree.ascendor_id = ".$pdo->quote($entity->id)." AND
+								supertree.descendor_id = ".$pdo->quote($parentId)."
+					";
+					$pdo->query($sql);
+				}
+			}
+		}
+	}
+
+	public function afterRemove(Entity $entity, $options)
+	{
+		parent::afterRemove($entity, $options);
+
+		$pdo = $this->getEntityManager()->getPDO();
+		$query = $this->getEntityManager()->getQuery();
+
+		$pathsTableName = $query->toDb($entity->getEntityType() . 'Path');
+
+		$sql = "DELETE FROM `".$pathsTableName."` WHERE descendor_id = ".$pdo->quote($entity->id)."";
+		$pdo->query($sql);
+	}
+}
+
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -18,7 +18,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Core;

@@ -29,11 +29,11 @@ use \Espo\Core\Utils\Util;
 class SelectManagerFactory
 {
    private $entityManager;
-    
+
    private $user;
-    
+
    private $acl;
-    
+
    private $metadata;

    public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, $metadata)
@@ -43,26 +43,28 @@ class SelectManagerFactory
        $this->acl = $acl;
        $this->metadata = $metadata;
    }
-    
-    public function create($entityName)
+
+    public function create($entityType)
    {
-        $className = '\\Espo\\Custom\\SelectManagers\\' . Util::normilizeClassName($entityName);
+        $normalizedName = Util::normilizeClassName($entityType);
+
+        $className = '\\Espo\\Custom\\SelectManagers\\' . $normalizedName;
        if (!class_exists($className)) {
-            $moduleName = $this->metadata->getScopeModuleName($entityName);
+            $moduleName = $this->metadata->getScopeModuleName($entityType);
            if ($moduleName) {
-                $className = '\\Espo\\Modules\\' . $moduleName . '\\SelectManagers\\' . Util::normilizeClassName($entityName);
+                $className = '\\Espo\\Modules\\' . $moduleName . '\\SelectManagers\\' . $normalizedName;
            } else {
-                $className = '\\Espo\\SelectManagers\\' . Util::normilizeClassName($entityName);
-            }        
+                $className = '\\Espo\\SelectManagers\\' . $normalizedName;
+            }
            if (!class_exists($className)) {
                $className = '\\Espo\\Core\\SelectManagers\\Base';
            }
        }
-        
+
        $selectManager = new $className($this->entityManager, $this->user, $this->acl, $this->metadata);
-        $selectManager->setEntityName($entityName);
-                
+        $selectManager->setEntityType($entityType);
+
        return $selectManager;
-    }    
+    }
 }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -36,10 +36,14 @@ class Base

    protected $entityManager;

-    protected $entityName;
+    protected $entityType;

    protected $metadata;

+    private $seed = null;
+
+    private $userTimeZone = null;
+
    const MIN_LENGTH_FOR_CONTENT_SEARCH = 4;

    public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, $metadata)
@@ -47,12 +51,28 @@ class Base
        $this->entityManager = $entityManager;
        $this->user = $user;
        $this->acl = $acl;
+
        $this->metadata = $metadata;
    }

-    public function setEntityName($entityName)
+    protected function getEntityManager()
    {
-        $this->entityName = $entityName;
+        return $this->entityManager;
+    }
+
+    protected function getUser()
+    {
+        return $this->user;
+    }
+
+    public function setEntityType($entityType)
+    {
+        $this->entityType = $entityType;
+    }
+
+    protected function getEntityType()
+    {
+        return $this->entityType;
    }

    protected function limit($params, &$result)
@@ -69,7 +89,7 @@ class Base
    {
        if (!empty($params['sortBy'])) {
            $result['orderBy'] = $params['sortBy'];
-            $type = $this->metadata->get("entityDefs.{$this->entityName}.fields." . $result['orderBy'] . ".type");
+            $type = $this->metadata->get("entityDefs.{$this->entityType}.fields." . $result['orderBy'] . ".type");
            if ($type == 'link') {
                $result['orderBy'] .= 'Name';
            } else if ($type == 'linkParent') {
@@ -87,7 +107,37 @@ class Base

    protected function getTextFilterFields()
    {
-        return $this->metadata->get("entityDefs.{$this->entityName}.collection.textFilterFields", array('name'));
+        return $this->metadata->get("entityDefs.{$this->entityType}.collection.textFilterFields", array('name'));
+    }
+
+    protected function getSeed()
+    {
+        if (empty($this->seed)) {
+            $this->seed = $this->entityManager->getEntity($this->entityType);
+        }
+        return $this->seed;
+    }
+
+    protected function textFilter($value, &$result)
+    {
+        $fieldDefs = $this->getSeed()->getFields();
+        $fieldList = $this->getTextFilterFields();
+        $d = array();
+
+        foreach ($fieldList as $field) {
+            if (
+                strlen($item['value']) >= self::MIN_LENGTH_FOR_CONTENT_SEARCH
+                &&
+                !empty($fieldDefs[$field]['type']) && $fieldDefs[$field]['type'] == 'text'
+            ) {
+                $d[$field . '*'] = '%' . $value . '%';
+            } else {
+                $d[$field . '*'] = $value . '%';
+            }
+        }
+        $result['whereClause'][] = array(
+            'OR' => $d
+        );
    }

    protected function where($params, &$result)
@@ -96,40 +146,28 @@ class Base
            $where = array();

            foreach ($params['where'] as $item) {
-                if ($item['type'] == 'boolFilters' && !empty($item['value']) && is_array($item['value'])) {
+                if ($item['type'] == 'bool' && !empty($item['value']) && is_array($item['value'])) {
                    foreach ($item['value'] as $filter) {
                        $p = $this->getBoolFilterWhere($filter);
                        if (!empty($p)) {
                            $params['where'][] = $p;
                        }
+                        $this->boolFilter($filter, $result);
                    }
                } else if ($item['type'] == 'textFilter' && !empty($item['value'])) {
                    if (!empty($item['value'])) {
-                        if (empty($result['whereClause'])) {
-                            $result['whereClause'] = array();
-                        }
-                        $fieldDefs = $this->entityManager->getEntity($this->entityName)->getFields();
-                        $fieldList = $this->getTextFilterFields();
-                        $d = array();
-                        foreach ($fieldList as $field) {
-                            if (
-                                strlen($item['value']) >= self::MIN_LENGTH_FOR_CONTENT_SEARCH
-                                &&
-                                !empty($fieldDefs[$field]['type']) && $fieldDefs[$field]['type'] == 'text'
-                            ) {
-                                $d[$field . '*'] = '%' . $item['value'] . '%';
-                            } else {
-                                $d[$field . '*'] = $item['value'] . '%';
-                            }
-                        }
-                        $where['OR'] = $d;
+                        $this->textFilter($item['value'], $result);
                    }
+                } else if ($item['type'] == 'primary' && !empty($item['value'])) {
+                    $this->primaryFilter($item['value'], $result);
                }
            }

            $linkedWith = array();
-            $ignoreList = array('linkedWith', 'boolFilters');
-            foreach    ($params['where'] as $item) {
+            $inCategory = array();
+
+            $ignoreList = ['linkedWith', 'inCategory', 'bool', 'primary'];
+            foreach ($params['where'] as $item) {
                if (!in_array($item['type'], $ignoreList)) {
                    $part = $this->getWherePart($item);
                    if (!empty($part)) {
@@ -138,44 +176,121 @@ class Base
                } else {
                    if ($item['type'] == 'linkedWith' && !empty($item['value'])) {
                        $linkedWith[$item['field']] = $item['value'];
+                    } else if ($item['type'] == 'inCategory' && !empty($item['value'])) {
+                        $inCategory[$item['field']] = $item['value'];
                    }
                }
            }

+            $result['whereClause'] = array_merge($result['whereClause'], $where);
+
            if (!empty($linkedWith)) {
-                $joins = array();
+                $this->handleLinkedWith($linkedWith, $result);
+            }
+            if (!empty($inCategory)) {
+                $this->handleInCategory($inCategory, $result);
+            }
+        }
+    }

-                $part = array();
-                foreach ($linkedWith as $link => $ids) {
-                    $joins[] = $link;
-                    $defs = $this->entityManager->getMetadata()->get($this->entityName);
-
-                    $entityName = $defs['relations'][$link]['entity'];
-                    if ($entityName) {
-                        $part[$entityName . '.id'] = $ids;
-                    }
-                }
-
-                if (!empty($part)) {
-                    $where[] = $part;
-                }
-                $result['joins'] = $joins;
-                $result['distinct'] = true;
+    protected function handleLinkedWith($linkedWith, &$result)
+    {
+        $joins = [];

+        $part = array();
+        foreach ($linkedWith as $link => $idsValue) {
+            if (is_array($idsValue) && count($idsValue) == 1) {
+                $idsValue = $idsValue[0];
            }

-            $result['whereClause'] = $where;
+            $relDefs = $this->getSeed()->getRelations();
+
+            if (!empty($relDefs[$link])) {
+                $defs = $relDefs[$link];
+                if ($defs['type'] == 'manyMany') {
+                    $joins[] = $link;
+                    if (!empty($defs['relationName']) && !empty($defs['midKeys'])) {
+                        $key = $defs['midKeys'][1];
+                        $relationName = lcfirst($defs['relationName']);
+                        $part[$relationName . '.' . $key] = $idsValue;
+                    }
+                } else if ($defs['type'] == 'belongsTo') {
+                    if (!empty($defs['key'])) {
+                        $key = $defs['key'];
+                        $part[$key] = $idsValue;
+                    }
+                }
+            }
        }
+
+        if (!empty($part)) {
+            $result['whereClause'][] = $part;
+        }
+        $result['joins'] = array_merge($result['joins'], $joins);
+        $result['distinct'] = true;
+    }
+
+    protected function handleInCategory($inCategory, &$result)
+    {
+        $joins = [];
+
+        $part = array();
+
+        $query = $this->getEntityManager()->getQuery();
+
+        $tableName = $query->toDb($this->getSeed()->getEntityType());
+
+        foreach ($inCategory as $link => $val) {
+
+            $relDefs = $this->getSeed()->getRelations();
+
+            if (!empty($relDefs[$link])) {
+                $defs = $relDefs[$link];
+
+                $foreignEntity = $defs['entity'];
+                if (empty($foreignEntity)) {
+                    continue;
+                }
+
+                $pathName = lcfirst($query->sanitize($foreignEntity . 'Path'));
+
+                if ($defs['type'] == 'manyMany') {
+
+                    if (!empty($defs['relationName']) && !empty($defs['midKeys'])) {
+                        $result['distinct'] = true;
+                        $result['joins'][] = $link;
+                        $key = $defs['midKeys'][1];
+
+                        $relationName = lcfirst($defs['relationName']);
+
+                        $result['customJoin'] .= "
+                            JOIN " . $query->toDb($pathName) . " AS `{$pathName}` ON {$pathName}.descendor_id = ".$query->sanitize($relationName) . "." . $query->toDb($key) . "
+                        ";
+                        $part[$pathName . '.ascendorId'] = $val;
+                    }
+                } else if ($defs['type'] == 'belongsTo') {
+                    if (!empty($defs['key'])) {
+                        $key = $defs['key'];
+                        $result['customJoin'] .= "
+                            JOIN " . $query->toDb($pathName) . " AS `{$pathName}` ON {$pathName}.descendor_id = {$tableName}." . $query->toDb($key) . "
+                        ";
+                        $part[$pathName . '.ascendorId'] = $val;
+                    }
+                }
+            }
+        }
+
+
+        if (!empty($part)) {
+            $result['whereClause'][] = $part;
+        }
+
    }

    protected function q($params, &$result)
    {
        if (!empty($params['q'])) {
-            if (empty($result['whereClause'])) {
-                $result['whereClause'] = array();
-            }
-
-            $fieldDefs = $this->entityManager->getEntity($this->entityName)->getFields();
+            $fieldDefs = $this->getSeed()->getFields();

            $value = $params['q'];

@@ -193,39 +308,49 @@ class Base
                }
            }

-            $result['whereClause']['OR'] = $d;
+            $result['whereClause'][] = array(
+                'OR' => $d
+            );
        }
    }

    protected function access(&$result)
    {
-        if ($this->acl->checkReadOnlyOwn($this->entityName)) {
-
-            if (!array_key_exists('whereClause', $result)) {
-                $result['whereClause'] = array();
-            }
-            $result['whereClause']['assignedUserId'] = $this->user->id;
+        if ($this->acl->checkReadOnlyOwn($this->entityType)) {
+            $this->accessOnlyOwn($result);
        }
-        if (!$this->user->isAdmin() && $this->acl->checkReadOnlyTeam($this->entityName)) {
-            if (!array_key_exists('whereClause', $result)) {
-                $result['whereClause'] = array();
-            }
-            $result['distinct'] = true;
-            if (!array_key_exists('joins', $result)) {
-                $result['joins'] = array();
-            }
-            if (!in_array('teams', $result['joins'])) {
-                $result['leftJoins'][] = 'teams';
-            }
-
-            $result['whereClause']['OR'] = array(
-                'Team.id' => $this->user->get('teamsIds'),
-                'assignedUserId' => $this->user->id
-            );
-            //$result['whereClause']['Team.id'] = $this->user->get('teamsIds');
+        if (!$this->user->isAdmin() && $this->acl->checkReadOnlyTeam($this->entityType)) {
+            $this->accessOnlyTeam($result);
        }
    }

+    protected function accessOnlyOwn(&$result)
+    {
+        if (!$this->getSeed()->hasField('assignedUserId')) {
+            return;
+        }
+        $result['whereClause'][] = array(
+            'assignedUserId' => $this->getUser()->id
+        );
+    }
+
+    protected function accessOnlyTeam(&$result)
+    {
+        if (!$this->getSeed()->hasField('teamsIds')) {
+            return;
+        }
+        $result['distinct'] = true;
+        if (!in_array('teams', $result['joins'])) {
+            $result['leftJoins'][] = 'teams';
+        }
+        $result['whereClause'][] = array(
+            'OR' => array(
+                'teams.id' => $this->user->get('teamsIds'),
+                'assignedUserId' => $this->getUser()->id
+            )
+        );
+    }
+
    public function getAclParams()
    {
        $result = array();
@@ -235,7 +360,12 @@ class Base

    public function getSelectParams(array $params, $withAcl = false)
    {
-        $result = array();
+        $result = array(
+            'joins' => [],
+            'leftJoins' => [],
+            'whereClause' => [],
+            'customJoin' => ''
+        );

        $this->order($params, $result);
        $this->limit($params, $result);
@@ -249,10 +379,121 @@ class Base
        return $result;
    }

+    protected function getUserTimeZone()
+    {
+        if (empty($this->userTimeZone)) {
+            $preferences = $this->getEntityManager()->getEntity('Preferences', $this->getUser()->id);
+            $timeZone = $preferences->get('timeZone');
+            $this->userTimeZone = $timeZone;
+        }
+
+        return $this->userTimeZone;
+    }
+
+    protected function convertDateTimeWhere($item)
+    {
+        $format = 'Y-m-d H:i:s';
+
+        $value = null;
+        $timeZone = 'UTC';
+
+        if (empty($item['field'])) {
+            return null;
+        }
+        if (empty($item['type'])) {
+            return null;
+        }
+        if (!empty($item['value'])) {
+            $value = $item['value'];
+        }
+        if (!empty($item['timeZone'])) {
+            $timeZone = $item['timeZone'];
+        }
+        $type = $item['type'];
+        $field = $item['field'];
+
+        if (empty($value) && in_array($type, array('on', 'before', 'after'))) {
+            return null;
+        }
+
+        $where = array();
+        $where['field'] = $field;
+
+        $dt = new \DateTime('now', new \DateTimeZone($timeZone));
+
+        switch ($type) {
+            case 'today':
+                $where['type'] = 'between';
+                $dt->setTime(0, 0, 0);
+                $dt->setTimezone(new \DateTimeZone('UTC'));
+                $from = $dt->format($format);
+                $dt->modify('+1 day');
+                $to = $dt->format($format);
+                $where['value'] = [$from, $to];
+                break;
+            case 'past':
+                $where['type'] = 'before';
+                $dt->setTimezone(new \DateTimeZone('UTC'));
+                $where['value'] = $dt->format($format);
+                break;
+            case 'future':
+                $where['type'] = 'after';
+                $dt->setTimezone(new \DateTimeZone('UTC'));
+                $where['value'] = $dt->format($format);
+                break;
+            case 'on':
+                $where['type'] = 'between';
+
+                $dt = new \DateTime($value, new \DateTimeZone($timeZone));
+                $dt->setTimezone(new \DateTimeZone('UTC'));
+                $from = $dt->format($format);
+
+                $dt->modify('+1 day');
+                $to = $dt->format($format);
+                $where['value'] = [$from, $to];
+                break;
+            case 'before':
+                $where['type'] = 'before';
+                $dt = new \DateTime($value, new \DateTimeZone($timeZone));
+                $dt->setTimezone(new \DateTimeZone('UTC'));
+                $where['value'] = $dt->format($format);
+                break;
+            case 'after':
+                $where['type'] = 'after';
+                $dt = new \DateTime($value, new \DateTimeZone($timeZone));
+                $dt->setTimezone(new \DateTimeZone('UTC'));
+                $where['value'] = $dt->format($format);
+                break;
+            case 'between':
+                $where['type'] = 'between';
+                if (is_array($value)) {
+                    $dt = new \DateTime($value[0], new \DateTimeZone($timeZone));
+                    $dt->setTimezone(new \DateTimeZone('UTC'));
+                    $from = $dt->format($format);
+
+                    $dt = new \DateTime($value[1], new \DateTimeZone($timeZone));
+                    $dt->setTimezone(new \DateTimeZone('UTC'));
+                    $to = $dt->format($format);
+
+                    $where['value'] = [$from, $to];
+                }
+               break;
+            default:
+                $where['type'] = $type;
+        }
+        $result = $this->getWherePart($where);
+
+        return $result;
+    }
+
    protected function getWherePart($item)
    {
        $part = array();

+        if (!empty($item['dateTime'])) {
+            return $this->convertDateTimeWhere($item);
+        }
+
        if (!empty($item['type'])) {
            switch ($item['type']) {
                case 'or':
@@ -263,7 +504,7 @@ class Base
                            $a = $this->getWherePart($i);
                            foreach ($a as $left => $right) {
                                if (!empty($right)) {
-                                    $arr[$left] = $right;
+                                    $arr[] = array($left => $right);
                                }
                            }
                        }
@@ -277,6 +518,12 @@ class Base
                case 'on':
                    $part[$item['field'] . '='] = $item['value'];
                    break;
+                case 'startsWith':
+                    $part[$item['field'] . '*'] = $item['value'] . '%';
+                    break;
+                case 'contains':
+                    $part[$item['field'] . '*'] = '%' . $item['value'] . '%';
+                    break;
                case 'notEquals':
                case 'notOn':
                    $part[$item['field'] . '!='] = $item['value'];
@@ -301,6 +548,12 @@ class Base
                case 'notIn':
                    $part[$item['field'] . '!='] = $item['value'];
                    break;
+                case 'isNull':
+                    $part[$item['field'] . '='] = null;
+                    break;
+                case 'isNotNull':
+                    $part[$item['field'] . '!='] = null;
+                    break;
                case 'isTrue':
                    $part[$item['field'] . '='] = true;
                    break;
@@ -314,7 +567,7 @@ class Base
                    $part[$item['field'] . '<'] = date('Y-m-d');
                    break;
                case 'future':
-                    $part[$item['field'] . '>'] = date('Y-m-d');
+                    $part[$item['field'] . '>='] = date('Y-m-d');
                    break;
                case 'currentMonth':
                    $dt = new \DateTime();
@@ -381,6 +634,22 @@ class Base
        return $part;
    }

+    protected function boolFilter($filterName, &$result)
+    {
+        $method = 'boolFilter' . ucfirst($filterName);
+        if (method_exists($this, $method)) {
+            $this->$method($result);
+        }
+    }
+
+    protected function primaryFilter($filterName, &$result)
+    {
+        $method = 'filter' . ucfirst($filterName);
+        if (method_exists($this, $method)) {
+            $this->$method($result);
+        }
+    }
+
    protected function getBoolFilterWhere($filterName)
    {
        $method = 'getBoolFilterWhere' . ucfirst($filterName);
@@ -389,13 +658,27 @@ class Base
        }
    }

-    protected function getBoolFilterWhereOnlyMy()
+    protected function boolFilterOnlyMy(&$result)
    {
-        return array(
-            'type' => 'equals',
-            'field' => 'assignedUserId',
-            'value' => $this->user->id,
+        $result['whereClause'][] = array(
+            'assignedUserId' => $this->getUser()->id
        );
    }
+
+    protected function filterFollowed(&$result)
+    {
+        $query = $this->getEntityManager()->getQuery();
+        $result['customJoin'] .= "
+            JOIN subscription ON
+                subscription.entity_type = ".$query->quote($this->getEntityType())." AND
+                subscription.entity_id = ".$query->toDb($this->getEntityType()).".id AND
+                subscription.user_id = ".$query->quote($this->getUser()->id)."
+        ";
+    }
+
+    protected function boolFilterFollowed(&$result)
+    {
+        $this->filterFollowed($result);
+    }
 }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -48,31 +48,6 @@ class ServiceFactory
        $this->container = $container;
    }

-    protected function init()
-    {
-        $config = $this->getContainer()->get('config');
-
-        if (file_exists($this->cacheFile) && $config->get('useCache')) {
-            $this->data = $this->getFileManager()->getContents($this->cacheFile);
-        } else {
-            $this->data = $this->getClassNameHash($this->paths['corePath']);
-
-            foreach ($this->getContainer()->get('metadata')->getModuleList() as $moduleName) {
-                $path = str_replace('{*}', $moduleName, $this->paths['modulePath']);
-                $this->data = array_merge($this->data, $this->getClassNameHash($path));
-            }
-
-            $this->data = array_merge($this->data, $this->getClassNameHash($this->paths['customPath']));
-
-            if ($config->get('useCache')) {
-                $result = $this->getFileManager()->putContentsPHP($this->cacheFile, $this->data);
-                if ($result == false) {
-                    throw new \Espo\Core\Exceptions\Error();
-                }
-            }
-        }
-    }
-
    protected function getFileManager()
    {
        return $this->container->get('fileManager');
@@ -83,15 +58,19 @@ class ServiceFactory
        return $this->container;
    }

+    protected function init()
+    {
+        $classParser = $this->getContainer()->get('classParser');
+        $classParser->setAllowedMethods(null);
+        $this->data = $classParser->getData($this->paths, $this->cacheFile);
+    }
+
    protected function getClassName($name)
    {
-        $name = Util::normilizeClassName($name);
-
        if (!isset($this->data)) {
            $this->init();
        }

-        $name = ucfirst($name);
        if (isset($this->data[$name])) {
            return $this->data[$name];
        }
@@ -127,28 +106,5 @@ class ServiceFactory
        }
        throw new Error("Class '$className' does not exist");
    }
-
-    // TODO delegate to another class
-    protected function getClassNameHash($dirs)
-    {
-        if (is_string($dirs)) {
-            $dirs = (array) $dirs;
-        }
-
-        $data = array();
-
-        foreach ($dirs as $dir) {
-            if (file_exists($dir)) {
-                $fileList = $this->getFileManager()->getFileList($dir, false, '\.php$', true);
-                foreach ($fileList as $file) {
-                    $filePath = Util::concatPath($dir, $file);
-                    $className = Util::getClassName($filePath);
-                    $fileName = $this->getFileManager()->getFileName($filePath);
-                    $data[$fileName] = $className;
-                }
-            }
-        }
-        return $data;
-    }
 }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -53,6 +53,11 @@ abstract class Base implements Injectable
        return $this->injections[$name];
    }

+    protected function addDependency($name)
+    {
+        $this->dependencies[] = $name;
+    }
+
    public function getDependencyList()
    {
        return $this->dependencies;
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * 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
@@ -20,10 +20,11 @@
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
 ************************************************************************/

-namespace Espo\Core\ORM\DB;
+namespace Espo\Core\Templates\Controllers;

-class MysqlMapper extends \Espo\ORM\DB\MysqlMapper
+
+class Base extends \Espo\Core\Controllers\Record
 {
-    protected $returnCollection = false;
+
 }

@@ -0,0 +1,30 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Templates\Controllers;
+
+
+class CategoryTree extends \Espo\Core\Controllers\RecordTree
+{
+
+}
+
@@ -0,0 +1,30 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Templates\Controllers;
+
+
+class Person extends \Espo\Core\Controllers\Record
+{
+
+}
+
@@ -0,0 +1,29 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Templates\Entities;
+
+class Base extends \Espo\Core\ORM\Entity
+{
+
+}
+
@@ -0,0 +1,29 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Templates\Entities;
+
+class CategoryTree extends \Espo\Core\Entities\CategoryTreeItem
+{
+
+}
+
@@ -0,0 +1,29 @@
+<?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/.
+ ************************************************************************/
+
+namespace Espo\Core\Templates\Entities;
+
+class Person extends \Espo\Core\Entities\Person
+{
+
+}
+
@@ -0,0 +1,21 @@
+[
+    {
+        "label": "Overview",
+        "rows": [
+            [
+                {
+                    "name": "name"
+                },
+                {
+                    "name": "order"
+                }
+            ],
+            [
+                false,
+                {
+                    "name": "parent"
+                }
+            ]
+        ]
+    }
+]
@@ -0,0 +1,22 @@
+[
+    {
+        "label": "",
+        "rows": [
+            [
+                {
+                    "name": "name"
+                }
+            ],
+            [
+                {
+                    "name": "order"
+                }
+            ],
+            [
+                {
+                    "name": "parent"
+                }
+            ]
+        ]
+    }
+]
@@ -0,0 +1,3 @@
+[
+    "parent"
+]
@@ -0,0 +1,14 @@
+[
+    {
+        "name": "name",
+        "width": 40,
+        "link": true
+    },
+    {
+        "name": "order",
+        "width": 15
+    },
+    {
+        "name": "parent"
+    }
+]
@@ -0,0 +1,14 @@
+[
+    {
+        "name": "name",
+        "width": 40,
+        "link": true
+    },
+    {
+        "name": "order",
+        "width": 15
+    },
+    {
+        "name": "parent"
+    }
+]
--- a/Show More
+++ b/Show More