fix stream fetched twice

Fix ifAttrNotEmpty failing with boolean attributes

.gitignore

@@ -13,4 +13,4 @@
 /tests/testData/cache/*
 composer.phar
 vendor/
-/custom/Espo/Custom/Resources/*
+/custom/Espo/Custom/*

Gruntfile.js

@@ -17,7 +17,7 @@
  *
  * 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 = [
@@ -65,10 +65,10 @@ module.exports = function (grunt) {
         'client/src/controllers/base.js',
         'client/src/view.js',
     ];
-    
+
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
-        
+
         mkdir: {
             tmp: {
                 options: {
@@ -126,7 +126,8 @@ module.exports = function (grunt) {
                     'modules/**',
                     'img/**',
                     'css/**',
-                    'sounds/**'
+                    'sounds/**',
+                    'custom/**'
                 ],
                 dest: 'build/tmp/client',
             },
@@ -154,6 +155,8 @@ module.exports = function (grunt) {
                     'bootstrap.php',
                     'cron.php',
                     'rebuild.php',
+                    'clear_cache.php',
+                    'upgrade.php',
                     'index.php',
                     'LICENSE.txt',
                     '.htaccess',

README.md

@@ -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).
@@ -33,6 +40,21 @@ You need to have nodejs and Grunt CLI 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).

application/Espo/Acl/Email.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;
+    }
+
+}
+

application/Espo/Controllers/Admin.php

@@ -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;
     }

application/Espo/Controllers/App.php

@@ -31,9 +31,14 @@ class App extends \Espo\Core\Controllers\Base
         $preferences = $this->getPreferences()->toArray();
         unset($preferences['smtpPassword']);
 
+        $user = $this->getUser();
+        if (!$user->has('teamsIds')) {
+            $user->loadLinkMultipleField('teams');
+        }
+
         return array(
-            'user' => $this->getUser()->toArray(),
-            'acl' => $this->getAcl()->toArray(),
+            'user' => $user->toArray(),
+            'acl' => $this->getAcl()->getMap(),
             'preferences' => $preferences,
             'token' => $this->getUser()->get('token')
         );

application/Espo/Controllers/Email.php

@@ -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();
+    }
 }
 

application/Espo/Controllers/EmailAccount.php

@@ -31,7 +31,7 @@ class EmailAccount extends \Espo\Core\Controllers\Record
         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);
+    }
 }
 

application/Espo/Controllers/EntityManager.php

@@ -62,6 +62,12 @@ class EntityManager extends \Espo\Core\Controllers\Base
         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);
 
@@ -90,6 +96,10 @@ class EntityManager extends \Espo\Core\Controllers\Base
         $name = $data['name'];
         $name = filter_var($name, \FILTER_SANITIZE_STRING);
 
+        if (!empty($data['sortDirection'])) {
+            $data['asc'] = $data['sortDirection'] === 'asc';
+        }
+
         $result = $this->getContainer()->get('entityManagerUtil')->update($name, $data);
 
         if ($result) {

application/Espo/Controllers/Import.php

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

application/Espo/Controllers/InboundEmail.php

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

application/Espo/Controllers/Preferences.php

@@ -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();
     }
 }
 

application/Espo/Controllers/User.php

@@ -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;
 
@@ -35,30 +35,31 @@ class User extends \Espo\Core\Controllers\Record
         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 Forbidden();
+            throw new BadRequest();
         }
         if (empty($data['requestId']) || empty($data['password'])) {
             throw new BadRequest();
@@ -86,7 +87,7 @@ class User extends \Espo\Core\Controllers\Record
         if (!$request->isPost()) {
             throw new Forbidden();
         }
-        
+
         if (empty($data['userName']) || empty($data['emailAddress'])) {
             throw new BadRequest();
         }

application/Espo/Core/Acl.php

@@ -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[] = $role->get('data');
-        }
-
-        $teams = $this->user->get('teams');
-        foreach ($teams as $team) {
-            $teamRoles = $team->get('roles');
-            foreach ($teamRoles as $role) {
-                $aclTables[] = $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) ;
     }
 }
 

application/Espo/Core/Acl/Base.php

@@ -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;
+    }
+}
+

application/Espo/Core/Acl/Table.php

@@ -0,0 +1,247 @@
+<?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 = ['read', 'edit', 'delete'];
+
+    private $levelList = ['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 = [];
+        $userPermissionList = [];
+
+        $userRoles = $this->user->get('roles');
+
+        foreach ($userRoles as $role) {
+            $aclTables[] = $role->get('data');
+            $assignmentPermissionList[] = $role->get('assignmentPermission');
+            $userPermissionList[] = $role->get('userPermission');
+        }
+
+        $teams = $this->user->get('teams');
+        foreach ($teams as $team) {
+            $teamRoles = $team->get('roles');
+            foreach ($teamRoles as $role) {
+                $aclTables[] = $role->get('data');
+                $assignmentPermissionList[] = $role->get('assignmentPermission');
+                $userPermissionList[] = $role->get('userPermission');
+            }
+        }
+
+        $this->data['table'] = $this->merge($aclTables);
+
+        $this->data['assignmentPermission'] = $this->mergeValues($assignmentPermissionList, $this->metadata->get('app.acl.valueDefaults.assignmentPermission', 'all'));
+        $this->data['userPermission'] = $this->mergeValues($userPermissionList, $this->metadata->get('app.acl.valueDefaults.userPermission', 'no'));
+    }
+
+    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 ($aclType === true) {
+                    $aclType = 'recordAllTeamOwnNo';
+                }
+        		if (!empty($aclType)) {
+	        		$data[$scope] = $this->metadata->get('app.acl.defaults.' . $aclType, true);
+        		}
+        	}
+        }
+        return $data;
+    }
+
+    private function buildCache()
+    {
+        $contents = '<' . '?'. 'php return ' .  var_export($this->data, true)  . ';';
+        $this->fileManager->putContents($this->cacheFile, $contents);
+    }
+}
+

application/Espo/Core/AclManager.php

@@ -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;
+        }
+        return $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);
+    }
+}
+

application/Espo/Core/Application.php

@@ -105,22 +105,23 @@ class Application
         $container = $this->getContainer();
 
         $slim->get('/', function() {});
+        $slim->post('/', function() {});
 
         $entryPointManager = new \Espo\Core\EntryPointManager($container);
 
-        $auth = $this->getAuth();
-        $apiAuth = new \Espo\Core\Utils\Api\Auth($auth, $entryPointManager->checkAuthRequired($entryPoint), true);
-        $slim->add($apiAuth);
+        try {
+            $auth = $this->getAuth();
+            $apiAuth = new \Espo\Core\Utils\Api\Auth($auth, $entryPointManager->checkAuthRequired($entryPoint), true);
+            $slim->add($apiAuth);
 
-        $slim->hook('slim.before.dispatch', function () use ($entryPoint, $entryPointManager, $container) {
-            try {
+            $slim->hook('slim.before.dispatch', function () use ($entryPoint, $entryPointManager, $container) {
                 $entryPointManager->run($entryPoint);
-            } catch (\Exception $e) {
-                $container->get('output')->processError($e->getMessage(), $e->getCode(), true);
-            }
-        });
+            });
 
-        $slim->run();
+            $slim->run();
+        } catch (\Exception $e) {
+            $container->get('output')->processError($e->getMessage(), $e->getCode(), true);
+        }
     }
 
     public function runCron()
@@ -138,6 +139,12 @@ class Application
         $dataManager->rebuild();
     }
 
+    public function runClearCache()
+    {
+        $dataManager = $this->getContainer()->get('dataManager');
+        $dataManager->clearCache();
+    }
+
     public function isInstalled()
     {
         $config = $this->getContainer()->get('config');

application/Espo/Core/Container.php

@@ -194,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')
         );
     }
 
@@ -230,6 +236,7 @@ class Container
         return new \Espo\Core\Utils\Language(
             $this->get('fileManager'),
             $this->get('config'),
+            $this->get('metadata'),
             $this->get('preferences')
         );
     }

application/Espo/Core/Controllers/Base.php

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

application/Espo/Core/Controllers/Record.php

@@ -34,6 +34,8 @@ class Record extends Base
 
     public static $defaultAction = 'list';
 
+    protected $defaultRecordServiceName = 'Record';
+
     protected function getEntityManager()
     {
         return $this->getContainer()->get('entityManager');
@@ -48,8 +50,8 @@ class Record extends Base
         if ($this->getServiceFactory()->checkExists($name)) {
             $service = $this->getServiceFactory()->create($name);
         } else {
-            $service = $this->getServiceFactory()->create('Record');
-            $service->setEntityName($name);
+            $service = $this->getServiceFactory()->create($this->defaultRecordServiceName);
+            $service->setEntityType($name);
         }
 
         return $service;
@@ -67,13 +69,17 @@ class Record extends Base
         return $entity->toArray();
     }
 
-    public function actionPatch($params, $data)
+    public function actionPatch($params, $data, $request)
     {
-        return $this->actionUpdate($params, $data);
+        return $this->actionUpdate($params, $data, $request);
     }
 
-    public function actionCreate($params, $data)
+    public function actionCreate($params, $data, $request)
     {
+        if (!$request->isPost()) {
+            throw BadRequest();
+        }
+
         if (!$this->getAcl()->check($this->name, 'edit')) {
             throw new Forbidden();
         }
@@ -87,8 +93,12 @@ class Record extends Base
         throw new Error();
     }
 
-    public function actionUpdate($params, $data)
+    public function actionUpdate($params, $data, $request)
     {
+        if (!$request->isPut() && !$request->isPatch()) {
+            throw BadRequest();
+        }
+
         if (!$this->getAcl()->check($this->name, 'edit')) {
             throw new Forbidden();
         }
@@ -133,7 +143,7 @@ class Record extends Base
 
         return array(
             'total' => $result['total'],
-            'list' => $result['collection']->toArray()
+            'list' => isset($result['collection']) ? $result['collection']->toArray() : $result['list']
         );
     }
 
@@ -168,12 +178,16 @@ class Record extends Base
 
         return array(
             'total' => $result['total'],
-            'list' => $result['collection']->toArray()
+            'list' => isset($result['collection']) ? $result['collection']->toArray() : $result['list']
         );
     }
 
-    public function actionDelete($params)
+    public function actionDelete($params, $data, $request)
     {
+        if (!$request->isDelete()) {
+            throw BadRequest();
+        }
+
         $id = $params['id'];
 
         if ($this->getRecordService()->deleteEntity($id)) {
@@ -194,74 +208,128 @@ 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)
         );
     }
 
     public function actionMassUpdate($params, $data, $request)
     {
+        if (!$request->isPut()) {
+            throw new BadRequest();
+        }
+
         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;
     }
 
     public function actionMassDelete($params, $data, $request)
     {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
         if (!$this->getAcl()->check($this->name, 'delete')) {
             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)
+    public function actionCreateLink($params, $data, $request)
     {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+
+        if (empty($params['id']) || empty($params['link'])) {
+            throw new 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();
     }
 
-    public function actionRemoveLink($params, $data)
+    public function actionRemoveLink($params, $data, $request)
     {
+        if (!$request->isDelete()) {
+            throw new BadRequest();
+        }
+
         $id = $params['id'];
         $link = $params['link'];
 
+        if (empty($params['id']) || empty($params['link'])) {
+            throw new BadRequest();
+        }
+
         $foreignIds = array();
         if (isset($data['id'])) {
             $foreignIds[] = $data['id'];
@@ -285,8 +353,11 @@ class Record extends Base
         throw new Error();
     }
 
-    public function actionFollow($params)
+    public function actionFollow($params, $data, $request)
     {
+        if (!$request->isPut()) {
+            throw new BadRequest();
+        }
         if (!$this->getAcl()->check($this->name, 'read')) {
             throw new Forbidden();
         }
@@ -294,8 +365,11 @@ class Record extends Base
         return $this->getRecordService()->follow($id);
     }
 
-    public function actionUnfollow($params)
+    public function actionUnfollow($params, $data, $request)
     {
+        if (!$request->isDelete()) {
+            throw new BadRequest();
+        }
         if (!$this->getAcl()->check($this->name, 'read')) {
             throw new Forbidden();
         }

application/Espo/Core/Controllers/RecordTree.php

@@ -0,0 +1,57 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
+
+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 RecordTree extends Record
+{
+
+    public static $defaultAction = 'list';
+
+    protected $defaultRecordServiceName = 'RecordTree';
+
+    public function actionListTree($params, $data, $request)
+    {
+        if (!$this->getAcl()->check($this->name, 'read')) {
+            throw new Forbidden();
+        }
+
+        $where = $request->get('where');
+        $parentId = $request->get('parentId');
+        $maxDepth = $request->get('maxDepth');
+
+        $collection = $this->getRecordService()->getTree($parentId, array(
+            'where' => $where
+        ), 0, $maxDepth);
+        return array(
+            'list' => $collection->toArray(),
+            'path' => $this->getRecordService()->getTreeItemPath($parentId)
+        );
+    }
+}
+

application/Espo/Core/CronManager.php

@@ -98,9 +98,11 @@ class CronManager
 
     protected function getLastRunTime()
     {
-        $lastRunTime = $this->getFileManager()->getPhpContents($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;
@@ -108,7 +110,10 @@ class CronManager
 
     protected function setLastRunTime($time)
     {
-        return $this->getFileManager()->putPhpContents($this->lastRunTime, $time);
+        $data = array(
+            'time' => $time,
+        );
+        return $this->getFileManager()->putPhpContents($this->lastRunTime, $data);
     }
 
     protected function checkLastRunTime()
@@ -183,7 +188,6 @@ class CronManager
                 $cronScheduledJob->addLogRecord($job['scheduled_job_id'], $status);
             }
         }
-
     }
 
     /**

application/Espo/Core/Entities/CategoryTreeItem.php

@@ -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;
+    }
+}
+

application/Espo/Core/EntryPointManager.php

@@ -28,9 +28,9 @@ use \Espo\Core\Exceptions\NotFound,
 
 class EntryPointManager
 {
-    private $container;    
-    
-    private $fileManager;    
+    private $container;
+
+    private $fileManager;
 
     protected $data = null;
 
@@ -38,7 +38,7 @@ class EntryPointManager
 
     protected $allowedMethods = array(
         'run',
-    );    
+    );
 
     /**
      * @var array - path to entryPoint files
@@ -46,14 +46,14 @@ class EntryPointManager
     private $paths = array(
         'corePath' => 'application/Espo/EntryPoints',
         'modulePath' => 'application/Espo/Modules/{*}/EntryPoints',
-        'customPath' => 'custom/Espo/Custom/EntryPoints',                                              
+        'customPath' => 'custom/Espo/Custom/EntryPoints',
     );
 
 
     public function __construct(\Espo\Core\Container $container)
     {
-        $this->container = $container;        
-        $this->fileManager = $container->get('fileManager');        
+        $this->container = $container;
+        $this->fileManager = $container->get('fileManager');
     }
 
     protected function getContainer()
@@ -69,16 +69,16 @@ class EntryPointManager
     public function checkAuthRequired($name)
     {
         $className = $this->getClassName($name);
-        if ($className === false) {
+        if (!$className) {
             throw new NotFound();
         }
-        return $className::$authRequired;        
+        return $className::$authRequired;
     }
 
-    public function run($name) 
+    public function run($name)
     {
         $className = $this->getClassName($name);
-        if ($className === false) {
+        if (!$className) {
             throw new NotFound();
         }
         $entryPoint = new $className($this->container);
@@ -89,7 +89,7 @@ class EntryPointManager
     protected function getClassName($name)
     {
         $name = Util::normilizeClassName($name);
-        
+
         if (!isset($this->data)) {
             $this->init();
         }
@@ -98,8 +98,8 @@ class EntryPointManager
         if (isset($this->data[$name])) {
             return $this->data[$name];
         }
-        
-        return false; 
+
+        return false;
     }
 
 
@@ -108,8 +108,7 @@ class EntryPointManager
         $classParser = $this->getContainer()->get('classParser');
         $classParser->setAllowedMethods($this->allowedMethods);
         $this->data = $classParser->getData($this->paths, $this->cacheFile);
-    }    
-     
+    }
 
 }
 

application/Espo/Core/EntryPoints/Base.php

@@ -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();
 
 }
 

application/Espo/Core/ExternalAccount/Clients/OAuth2Abstract.php

@@ -155,7 +155,7 @@ abstract class OAuth2Abstract implements IClient
             $code = $r['code'];
         }
 
-        if ($code == 200) {
+        if ($code >= 200 && $code < 300) {
             return $r['result'];
         } else {
             $handledData = $this->handleErrorResponse($r);

application/Espo/Core/ExternalAccount/OAuth2/Client.php

@@ -233,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;

application/Espo/Core/HookManager.php

@@ -93,10 +93,10 @@ class HookManager
         }
     }
 
-    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);
                 }
             }
         }

application/Espo/Core/Hooks/Base.php

@@ -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];

application/Espo/Core/Mail/Importer.php

@@ -62,7 +62,7 @@ class Importer
 
             $subject = $message->subject;
             if ($subject !== '0' && empty($subject)) {
-                $subject = '--empty--';
+                $subject = '(No Subject)';
             }
 
             $email->set('isHtml', false);
@@ -74,7 +74,10 @@ class Importer
 
             $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');
@@ -91,7 +94,18 @@ class Importer
                 }
             }
 
-            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;
             }
 
@@ -101,7 +115,9 @@ class Importer
                     $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) {
@@ -117,7 +133,7 @@ class Importer
                     $this->importPartDataToEmail($email, $part, $inlineIds);
                 }
             } else {
-                $this->importPartDataToEmail($email, $message, $inlineIds);
+                $this->importPartDataToEmail($email, $message, $inlineIds, 'text/plain');
             }
 
             $body = $email->get('body');
@@ -188,18 +204,27 @@ class Importer
                 $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 checkIsDuplicate(Entity $email)
+    protected function findDuplicate(Entity $email)
     {
         if ($email->get('messageId')) {
             $duplicate = $this->getEntityManager()->getRepository('Email')->where(array(
                 'messageId' => $email->get('messageId')
             ))->findOne();
             if ($duplicate) {
-                return true;
+                return $duplicate;
             }
         }
     }
@@ -217,19 +242,29 @@ 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 {
-            if (!$part->getHeaders() || !isset($part->contentType)) {
-                return;
+            $type = null;
+
+            if ($part->getHeaders() && isset($part->contentType)) {
+                $type = strtok($part->contentType, ';');
+            }
+
+            if (empty($type)) {
+                if (!empty($defaultContentType)) {
+                    $type = $defaultContentType;
+                } else {
+                    return;
+                }
             }
 
-            $type = strtok($part->contentType, ';');
             $encoding = null;
 
             $isAttachment = true;
 
             if ($type == 'text/plain' || $type == 'text/html') {
+
                 $isAttachment = false;
                 $content = $this->getContentFromPart($part);
                 if ($type == 'text/plain') {

application/Espo/Core/Mail/Mail/Headers.php

@@ -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;
+    }
+}

application/Espo/Core/Mail/Mail/Storage/Imap.php

@@ -20,11 +20,11 @@
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
  ************************************************************************/
 
-namespace Espo\Core\Mail\Storage;
+namespace Espo\Core\Mail\Mail\Storage;
 
 class Imap extends \Zend\Mail\Storage\Imap
 {
-	protected $messageClass = '\\Espo\\Core\\Mail\\Storage\\Message';
+	protected $messageClass = '\\Espo\\Core\\Mail\\Mail\\Storage\\Message';
 
     public function getIdsFromUID($uid)
     {

application/Espo/Core/Mail/Mail/Storage/Message.php

@@ -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);
+    }
+}
+

application/Espo/Core/Mail/Sender.php

@@ -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,14 @@ class Sender
             } else {
                 $fromName = $config->get('outboundEmailFromName');
             }
-            
+
             $message->addFrom($fromAddress, $fromName);
         }
-        
+
+        if (!$email->get('from')) {
+            $email->set('from', $fromAddress);
+        }
+
         if (!empty($params['replyToAddress'])) {
             $replyToName = null;
             if (!empty($params['replyToName'])) {
@@ -203,7 +207,6 @@ class Sender
         }
 
         $attachmentPartList = array();
-
         $attachmentCollection = $email->get('attachments');
         $attachmentInlineCollection = $email->getInlineAttachments();
 
@@ -220,7 +223,7 @@ class Sender
                 $attachmentPartList[] = $attachment;
             }
         }
-        
+
         if (!empty($attachmentInlineCollection)) {
             foreach ($attachmentInlineCollection as $a) {
                 $fileName = 'data/upload/' . $a->id;
@@ -239,12 +242,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 +288,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 +318,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) {

application/Espo/Core/Notificators/Base.php

@@ -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);
+            }
+        }
+    }
+
+}
+

application/Espo/Core/ORM/Entity.php

@@ -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)) {

application/Espo/Core/ORM/Repositories/RDB.php

@@ -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,10 +140,10 @@ 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')) {
@@ -151,53 +154,51 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
         }
     }
 
-    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);
-
-        $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);
+        parent::beforeSave($entity, $options);
 
-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeSave', $entity);
+        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeSave', $entity, $options);
     }
 
-    protected function afterSave(Entity $entity)
+    protected function afterSave(Entity $entity, array $options = array())
     {
         if (!empty($this->restoreData)) {
             $entity->set($this->restoreData);
             $this->restoreData = null;
         }
-        parent::afterSave($entity);
+        parent::afterSave($entity, $options);
 
         $this->handleEmailAddressSave($entity);
         $this->handlePhoneNumberSave($entity);
         $this->handleSpecifiedRelations($entity);
 
-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'afterSave', $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')) {
@@ -218,11 +219,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')) {
@@ -236,7 +239,7 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
         }
         $this->restoreData = $restoreData;
 
-        $result = parent::save($entity);
+        $result = parent::save($entity, $options);
 
         return $result;
     }
@@ -265,6 +268,10 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 
                 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 {
@@ -280,24 +287,27 @@ 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($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;
-                                $entity->setFetched($columnsFieldsName, $existingColumnsData);
-                            }
 
+                            }
                         }
 
                         if ($entity->has($fieldName)) {
@@ -320,10 +330,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);

application/Espo/Core/Repositories/CategoryTree.php

@@ -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);
+	}
+}
+

application/Espo/Core/SelectManagerFactory.php

@@ -44,13 +44,13 @@ class SelectManagerFactory
         $this->metadata = $metadata;
     }
 
-    public function create($entityName)
+    public function create($entityType)
     {
-        $normalizedName = 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\\' . $normalizedName;
             } else {
@@ -62,7 +62,7 @@ class SelectManagerFactory
         }
 
         $selectManager = new $className($this->entityManager, $this->user, $this->acl, $this->metadata);
-        $selectManager->setEntityName($entityName);
+        $selectManager->setEntityType($entityType);
 
         return $selectManager;
     }

application/Espo/Core/SelectManagers/Base.php

@@ -36,12 +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)
@@ -63,9 +65,14 @@ class Base
         return $this->user;
     }
 
-    public function setEntityName($entityName)
+    public function setEntityType($entityType)
     {
-        $this->entityName = $entityName;
+        $this->entityType = $entityType;
+    }
+
+    protected function getEntityType()
+    {
+        return $this->entityType;
     }
 
     protected function limit($params, &$result)
@@ -82,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') {
@@ -100,13 +107,13 @@ 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->entityName);
+            $this->seed = $this->entityManager->getEntity($this->entityType);
         }
         return $this->seed;
     }
@@ -139,7 +146,7 @@ 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)) {
@@ -151,11 +158,15 @@ class Base
                     if (!empty($item['value'])) {
                         $this->textFilter($item['value'], $result);
                     }
+                } else if ($item['type'] == 'primary' && !empty($item['value'])) {
+                    $this->primaryFilter($item['value'], $result);
                 }
             }
 
             $linkedWith = array();
-            $ignoreList = array('linkedWith', 'boolFilters');
+            $inCategory = array();
+
+            $ignoreList = ['linkedWith', 'inCategory', 'bool', 'primary'];
             foreach ($params['where'] as $item) {
                 if (!in_array($item['type'], $ignoreList)) {
                     $part = $this->getWherePart($item);
@@ -165,51 +176,116 @@ 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'];
                     }
                 }
             }
 
-            if (!empty($linkedWith)) {
-                $joins = array();
-
-                $part = array();
-                foreach ($linkedWith as $link => $idsValue) {
-                    if (is_array($idsValue) && count($idsValue) == 1) {
-                        $idsValue = $idsValue[0];
-                    }
-
-                    $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 = $defs['relationName'];
-                                $part[$relationName . '.' . $key] = $idsValue;
-                            }
-                        } else if ($defs['type'] == 'belongsTo') {
-                            if (!empty($defs['type']['key'])) {
-                                $key = $defs['type']['key'];
-                                $part[$key] = $idsValue;
-                            }
-                        }
-                    }
-                }
-
-                if (!empty($part)) {
-                    $where[] = $part;
-                }
-                $result['joins'] = $joins;
-                $result['distinct'] = true;
-
-            }
-
             $result['whereClause'] = array_merge($result['whereClause'], $where);
+
+            if (!empty($linkedWith)) {
+                $this->handleLinkedWith($linkedWith, $result);
+            }
+            if (!empty($inCategory)) {
+                $this->handleInCategory($inCategory, $result);
+            }
         }
     }
 
+    protected function handleLinkedWith($linkedWith, &$result)
+    {
+        $joins = [];
+
+        $part = array();
+        foreach ($linkedWith as $link => $idsValue) {
+            if (is_array($idsValue) && count($idsValue) == 1) {
+                $idsValue = $idsValue[0];
+            }
+
+            $relDefs = $this->getSeed()->getRelations();
+
+            if (!empty($relDefs[$link])) {
+                $defs = $relDefs[$link];
+                if ($defs['type'] == 'manyMany') {
+                    $joins[] = $link;
+                    if (!empty($defs['midKeys'])) {
+                        $key = $defs['midKeys'][1];
+                        $part[$link . 'Middle.' . $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'])) {
@@ -239,10 +315,10 @@ class Base
 
     protected function access(&$result)
     {
-        if ($this->acl->checkReadOnlyOwn($this->entityName)) {
+        if ($this->acl->checkReadOnlyOwn($this->entityType)) {
             $this->accessOnlyOwn($result);
         }
-        if (!$this->user->isAdmin() && $this->acl->checkReadOnlyTeam($this->entityName)) {
+        if (!$this->user->isAdmin() && $this->acl->checkReadOnlyTeam($this->entityType)) {
             $this->accessOnlyTeam($result);
         }
     }
@@ -268,7 +344,7 @@ class Base
         }
         $result['whereClause'][] = array(
             'OR' => array(
-                'Team.id' => $this->user->get('teamsIds'),
+                'teams.id' => $this->user->get('teamsIds'),
                 'assignedUserId' => $this->getUser()->id
             )
         );
@@ -284,9 +360,10 @@ class Base
     public function getSelectParams(array $params, $withAcl = false)
     {
         $result = array(
-            'joins' => array(),
-            'leftJoins' => array(),
-            'whereClause' => array()
+            'joins' => [],
+            'leftJoins' => [],
+            'whereClause' => [],
+            'customJoin' => ''
         );
 
         $this->order($params, $result);
@@ -301,10 +378,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':
@@ -329,6 +517,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'];
@@ -353,6 +547,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;
@@ -366,7 +566,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();
@@ -441,6 +641,14 @@ class Base
         }
     }
 
+    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);
@@ -455,5 +663,21 @@ class Base
             '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);
+    }
 }
 

application/Espo/Core/Services/Base.php

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

application/Espo/Core/Templates/Controllers/CategoryTree.php

@@ -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
+{
+
+}
+

application/Espo/Core/Templates/Entities/CategoryTree.php

@@ -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
+{
+
+}
+

application/Espo/Core/Templates/Layouts/CategoryTree/detail.json

@@ -0,0 +1,21 @@
+[
+    {
+        "label": "Overview",
+        "rows": [
+            [
+                {
+                    "name": "name"
+                },
+                {
+                    "name": "order"
+                }
+            ],
+            [
+                false,
+                {
+                    "name": "parent"
+                }
+            ]
+        ]
+    }
+]

application/Espo/Core/Templates/Layouts/CategoryTree/detailSmall.json

@@ -0,0 +1,22 @@
+[
+    {
+        "label": "",
+        "rows": [
+            [
+                {
+                    "name": "name"
+                }
+            ],
+            [
+                {
+                    "name": "order"
+                }
+            ],
+            [
+                {
+                    "name": "parent"
+                }
+            ]
+        ]
+    }
+]

application/Espo/Core/Templates/Layouts/CategoryTree/filters.json

@@ -0,0 +1,3 @@
+[
+    "parent"
+]

application/Espo/Core/Templates/Layouts/CategoryTree/list.json

@@ -0,0 +1,14 @@
+[
+    {
+        "name": "name",
+        "width": 40,
+        "link": true
+    },
+    {
+        "name": "order",
+        "width": 15
+    },
+    {
+        "name": "parent"
+    }
+]

application/Espo/Core/Templates/Layouts/CategoryTree/listSmall.json

@@ -0,0 +1,14 @@
+[
+    {
+        "name": "name",
+        "width": 40,
+        "link": true
+    },
+    {
+        "name": "order",
+        "width": 15
+    },
+    {
+        "name": "parent"
+    }
+]

application/Espo/Core/Templates/Layouts/CategoryTree/massUpdate.json

@@ -0,0 +1,3 @@
+[
+
+]

application/Espo/Core/Templates/Layouts/CategoryTree/relationships.json

@@ -0,0 +1,3 @@
+[
+    "children"
+]

application/Espo/Core/Templates/Metadata/Base/clientDefs.json

@@ -1,4 +1,4 @@
 {
    "controller": "Controllers.Record",
-   "boolFilters": ["onlyMy"]
+   "boolFilterList": ["onlyMy"]
 }

application/Espo/Core/Templates/Metadata/Base/entityDefs.json

@@ -47,7 +47,8 @@
         "teams": {
             "type": "hasMany",
             "entity": "Team",
-            "relationName": "EntityTeam"
+            "relationName": "EntityTeam",
+            "layoutRelationshipsDisabled": true
         }
     },
     "collection": {

application/Espo/Core/Templates/Metadata/Base/scopes.json

@@ -0,0 +1,9 @@
+{
+    "entity": true,
+    "layouts": true,
+    "tab": true,
+    "acl": true,
+    "customizable": true,
+    "importable": true,
+    "notifications": true
+}

application/Espo/Core/Templates/Metadata/CategoryTree/clientDefs.json

@@ -0,0 +1,26 @@
+{
+    "controller": "Controllers.RecordTree",
+    "collection": "Collections.Tree",
+    "menu": {
+        "listTree": {
+            "buttons": [
+                {
+                    "label": "List View",
+                    "link": "#{entityType}/list",
+                    "acl": "read",
+                    "style": "default"
+                }
+            ]
+        },
+        "list": {
+            "buttons": [
+                {
+                    "label": "Tree View",
+                    "link": "#{entityType}",
+                    "acl": "read",
+                    "style": "default"
+                }
+            ]
+        }
+    }
+}

application/Espo/Core/Templates/Metadata/CategoryTree/entityDefs.json

@@ -0,0 +1,106 @@
+{
+    "fields": {
+        "name": {
+            "type": "varchar",
+            "required": true
+        },
+        "order": {
+            "type": "int",
+            "required": true,
+            "default": 1
+        },
+        "description": {
+            "type": "text"
+        },
+        "createdAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "modifiedAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "createdBy": {
+            "type": "link",
+            "readOnly": true
+        },
+        "modifiedBy": {
+            "type": "link",
+            "readOnly": true
+        },
+        "teams": {
+            "type": "linkMultiple"
+        },
+        "parent": {
+            "type": "link"
+        },
+        "childList": {
+            "type": "jsonArray",
+            "notStorable": true,
+            "disabled": true
+        }
+    },
+    "links": {
+        "createdBy": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "modifiedBy": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "teams": {
+            "type": "hasMany",
+            "entity": "Team",
+            "relationName": "EntityTeam",
+            "layoutRelationshipsDisabled": true
+        },
+        "parent": {
+            "type": "belongsTo",
+            "foreign": "children",
+            "entity": "{entityType}",
+            "isCustom": true
+        },
+        "children": {
+            "type": "hasMany",
+            "foreign": "parent",
+            "entity": "{entityType}",
+            "isCustom": true
+        }
+    },
+    "collection": {
+        "sortBy": "parent",
+        "asc": true
+    },
+    "indexes": {
+        "name": {
+            "columns": [
+                "name",
+                "deleted"
+            ]
+        }
+    },
+    "additionalTables": {
+        "{entityType}Path": {
+            "fields": {
+                "id": {
+                    "type": "id",
+                    "dbType": "int",
+                    "len": "11",
+                    "autoincrement": true,
+                    "unique" : true
+                },
+                "ascendorId": {
+                    "type": "varchar",
+                    "len": "100",
+                    "index": true
+                },
+                "descendorId": {
+                    "type": "varchar",
+                    "len": "24",
+                    "index": true
+                }
+            }
+        }
+    }
+}

application/Espo/Core/Templates/Metadata/CategoryTree/scopes.json

@@ -0,0 +1,9 @@
+{
+    "entity": true,
+    "layouts": true,
+    "tab": true,
+    "acl": true,
+    "customizable": true,
+    "importable": false,
+    "notifications": false
+}

application/Espo/Core/Templates/Metadata/Person/clientDefs.json

@@ -1,4 +1,4 @@
 {
    "controller": "Controllers.Record",
-   "boolFilters": ["onlyMy"]
+   "boolFilterList": ["onlyMy"]
 }

application/Espo/Core/Templates/Metadata/Person/entityDefs.json

@@ -5,7 +5,7 @@
         },
         "salutationName": {
             "type": "enum",
-            "options": ["", "Mr.", "Mrs.", "Dr."]
+            "options": ["", "Mr.", "Mrs.", "Ms.", "Dr."]
         },
         "firstName": {
             "type": "varchar",
@@ -89,7 +89,8 @@
         "teams": {
             "type": "hasMany",
             "entity": "Team",
-            "relationName": "EntityTeam"
+            "relationName": "EntityTeam",
+            "layoutRelationshipsDisabled": true
         }
     },
     "collection": {

application/Espo/Core/Templates/Metadata/Person/scopes.json

@@ -0,0 +1,9 @@
+{
+    "entity": true,
+    "layouts": true,
+    "tab": true,
+    "acl": true,
+    "customizable": true,
+    "importable": true,
+    "notifications": true
+}

application/Espo/Core/Templates/Repositories/CategoryTree.php

@@ -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\Repositories;
+
+
+class CategoryTree extends \Espo\Core\Repositories\CategoryTree
+{
+
+}
+

application/Espo/Core/Templates/Services/CategoryTree.php

@@ -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\Services;
+
+
+class CategoryTree extends \Espo\Services\RecordTree
+{
+
+}
+

application/Espo/Core/Upgrades/Actions/Base.php

@@ -34,6 +34,8 @@ abstract class Base
 
     private $entityManager;
 
+    private $helper;
+
     protected $data;
 
     protected $params = null;
@@ -131,7 +133,7 @@ abstract class Base
         return $this->config;
     }
 
-    protected function getEntityManager()
+    public function getEntityManager()
     {
         if (!isset($this->entityManager)) {
             $this->entityManager = $this->getContainer()->get('entityManager');
@@ -195,10 +197,15 @@ abstract class Base
             $res &= $this->checkVersions($manifest['acceptableVersions'], $this->getConfig()->get('version'), 'Your EspoCRM version doesn\'t match for this installation package.');
         }
 
+        //check dependencies
+        if (!empty($manifest['dependencies'])) {
+            $res &= $this->checkDependencies($manifest['dependencies']);
+        }
+
         return (bool) $res;
     }
 
-    protected function checkVersions($versionList, $currentVersion, $errorMessage = '')
+    public function checkVersions($versionList, $currentVersion, $errorMessage = '')
     {
         if (empty($versionList)) {
             return true;
@@ -212,7 +219,7 @@ abstract class Base
             $semver = new SemVer\version($currentVersion);
         } catch (\Exception $e) {
             $GLOBALS['log']->error('Cannot recognize currentVersion ['.$currentVersion.'], error: '.$e->getMessage().'.');
-            return;
+            return false;
         }
 
         foreach ($versionList as $version) {
@@ -251,6 +258,11 @@ abstract class Base
         return true;
     }
 
+    protected function checkDependencies($dependencyList)
+    {
+        return true;
+    }
+
     /**
      * Run scripts by type
      * @param  string $type Ex. "before", "after"
@@ -539,7 +551,7 @@ abstract class Base
         $result = $this->getFileManager()->isWritableList($fullFileList);
         if (!$result) {
             $permissionDeniedList = $this->getFileManager()->getLastPermissionDeniedList();
-            throw new Error("Permission denied in <br>". implode(", <br>", $permissionDeniedList));
+            throw new Error("Permission denied for <br>". implode(", <br>", $permissionDeniedList));
         }
     }
 
@@ -550,4 +562,15 @@ abstract class Base
         $backupPath = $this->getPath('backupPath');
         return $this->copy('', array($backupPath, self::FILES), false, $fullFileList);
     }
+
+    protected function getHelper()
+    {
+        if (!isset($this->helper)) {
+            $this->helper = new Helper();
+        }
+
+        $this->helper->setActionObject($this);
+
+        return $this->helper;
+    }
 }

application/Espo/Core/Upgrades/Actions/Base/Install.php

@@ -27,13 +27,6 @@ use Espo\Core\Utils\Util;
 
 class Install extends \Espo\Core\Upgrades\Actions\Base
 {
-    /**
-     * Is copied extension files to Espo
-     *
-     * @var [type]
-     */
-    protected $isCopied = null;
-
     /**
      * Main installation process
      *
@@ -54,8 +47,6 @@ class Install extends \Espo\Core\Upgrades\Actions\Base
 
         $this->initialize();
 
-        $this->isCopied = false;
-
         /** check if an archive is unzipped, if no then unzip */
         $packagePath = $this->getPackagePath();
         if (!file_exists($packagePath)) {
@@ -66,10 +57,10 @@ class Install extends \Espo\Core\Upgrades\Actions\Base
         //check permissions copied and deleted files
         $this->checkIsWritable();
 
-        $this->backupExistingFiles();
-
         $this->beforeRunAction();
 
+        $this->backupExistingFiles();
+
         /* run before install script */
         $this->runScript('before');
 
@@ -77,7 +68,6 @@ class Install extends \Espo\Core\Upgrades\Actions\Base
         if (!$this->copyFiles()) {
             $this->throwErrorAndRemovePackage('Cannot copy files.');
         }
-        $this->isCopied = true;
 
         /* remove files defined in a manifest */
         $this->deleteFiles(true);
@@ -103,10 +93,6 @@ class Install extends \Espo\Core\Upgrades\Actions\Base
 
     protected function restoreFiles()
     {
-        if (!$this->isCopied) {
-            return;
-        }
-
         $GLOBALS['log']->info('Installer: Restore previous files.');
 
         $backupPath = $this->getPath('backupPath');

application/Espo/Core/Upgrades/Actions/Base/Uninstall.php

@@ -56,17 +56,17 @@ class Uninstall extends \Espo\Core\Upgrades\Actions\Base
 
             /* copy core files */
             if (!$this->copyFiles()) {
-                throw new $this->throwErrorAndRemovePackage('Cannot copy files.');
+                $this->throwErrorAndRemovePackage('Cannot copy files.');
             }
 
             /* remove extension files, saved in fileList */
             if (!$this->deleteFiles(true)) {
-                throw new $this->throwErrorAndRemovePackage('Permission denied to delete files.');
+                $this->throwErrorAndRemovePackage('Permission denied to delete files.');
             }
         }
 
         if (!$this->systemRebuild()) {
-            throw new $this->throwErrorAndRemovePackage('Error occurred while EspoCRM rebuild.');
+            $this->throwErrorAndRemovePackage('Error occurred while EspoCRM rebuild.');
         }
 
         /* run after uninstall script */

application/Espo/Core/Upgrades/Actions/Extension/Install.php

@@ -138,7 +138,7 @@ class Install extends \Espo\Core\Upgrades\Actions\Base\Install
 
         $data = array(
             'id' => $this->getProcessId(),
-            'name' => $manifest['name'],
+            'name' => trim($manifest['name']),
             'isInstalled' => true,
             'version' => $manifest['version'],
             'fileList' => $fileList,
@@ -160,7 +160,7 @@ class Install extends \Espo\Core\Upgrades\Actions\Base\Install
         $extensionEntity = $this->getExtensionEntity();
 
         if (isset($extensionEntity)) {
-            $comparedVersion = version_compare($manifest['version'], $extensionEntity->get('version'));
+            $comparedVersion = version_compare($manifest['version'], $extensionEntity->get('version'), '>=');
             if ($comparedVersion <= 0) {
                 $this->throwErrorAndRemovePackage('You cannot install an older version of this extension.');
             }
@@ -171,8 +171,8 @@ class Install extends \Espo\Core\Upgrades\Actions\Base\Install
      * Throw an exception and remove package files.
      * Redeclared to prevent of deleting a package of installed extension.
      *
-     * @param  string $errorMessage [description]
-     * @return [type]               [description]
+     * @param  string $errorMessage
+     * @return void
      */
     protected function throwErrorAndRemovePackage($errorMessage = '')
     {
@@ -211,7 +211,8 @@ class Install extends \Espo\Core\Upgrades\Actions\Base\Install
         $this->executeAction(ExtensionManager::DELETE, array('id' => $extensionEntity->get('id')));
     }
 
-
-
-
+    protected function checkDependencies($dependencyList)
+    {
+        return $this->getHelper()->checkDependencies($dependencyList);
+    }
 }

application/Espo/Core/Upgrades/Actions/Extension/Upload.php

@@ -24,5 +24,8 @@ namespace Espo\Core\Upgrades\Actions\Extension;
 
 class Upload extends \Espo\Core\Upgrades\Actions\Base\Upload
 {
-
+    protected function checkDependencies($dependencyList)
+    {
+        return $this->getHelper()->checkDependencies($dependencyList);
+    }
 }

application/Espo/Core/Upgrades/Actions/Helper.php

@@ -0,0 +1,77 @@
+<?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\Upgrades\Actions;
+
+use Espo\Core\Exceptions\Error;
+
+class Helper
+{
+    private $actionObject;
+
+    public function __construct($actionObject = null)
+    {
+        if (isset($actionObject)) {
+            $this->setActionObject($actionObject);
+        }
+    }
+
+    public function setActionObject(\Espo\Core\Upgrades\Actions\Base $actionObject)
+    {
+        $this->actionObject = $actionObject;
+    }
+
+    protected function getActionObject()
+    {
+        return $this->actionObject;
+    }
+
+    /**
+     * Check dependencies
+     *
+     * @param  array | string $dependencyList
+     *
+     * @return bool
+     */
+    public function checkDependencies($dependencyList)
+    {
+        if (!is_array($dependencyList)) {
+            $dependencyList = (array) $dependencyList;
+        }
+
+        $actionObject = $this->getActionObject();
+
+        foreach ($dependencyList as $extensionName => $extensionVersion) {
+            $dependencyExtensionEntity = $actionObject->getEntityManager()->getRepository('Extension')->where(array(
+                'name' => trim($extensionName),
+                'isInstalled' => true,
+            ))->findOne();
+
+            $errorMessage = 'Dependency Error: The extension "'.$extensionName.'" with version "'.$extensionVersion.'" is missing.';
+            if (!isset($dependencyExtensionEntity) || !$actionObject->checkVersions($extensionVersion, $dependencyExtensionEntity->get('version'), $errorMessage)) {
+                throw new Error($errorMessage);
+            }
+        }
+
+        return true;
+    }
+}

application/Espo/Core/Utils/Api/Output.php

@@ -67,7 +67,9 @@ class Output
         $currentRoute = $this->getSlim()->router()->getCurrentRoute();
 
         if (isset($currentRoute)) {
-            $GLOBALS['log']->error('API ['.$this->getSlim()->request()->getMethod().']:'.$currentRoute->getPattern().', Params:'.print_r($currentRoute->getParams(), true).', InputData: '.$this->getSlim()->request()->getBody().' - '.$message);
+            $inputData = $this->getSlim()->request()->getBody();
+            $inputData = $this->clearPasswords($inputData);
+            $GLOBALS['log']->error('API ['.$this->getSlim()->request()->getMethod().']:'.$currentRoute->getPattern().', Params:'.print_r($currentRoute->getParams(), true).', InputData: '.$inputData.' - '.$message);
         }
 
         $this->displayError($message, $code, $isPrint);
@@ -118,5 +120,17 @@ class Output
 
         return null;
     }
+
+    /**
+     * Clear passwords for inputData
+     *
+     * @param  string $inputData
+     *
+     * @return string
+     */
+    protected function clearPasswords($inputData)
+    {
+        return preg_replace('/"(.*?password.*?)":".*?"/i', '"$1":"*****"', $inputData);
+    }
 }
 

application/Espo/Core/Utils/Auth.php

@@ -45,6 +45,8 @@ class Auth
         $authenticationMethod = $this->config->get('authenticationMethod', 'Espo');
         $authenticationClassName = "\\Espo\\Core\\Utils\\Authentication\\" . $authenticationMethod;
         $this->authentication = new $authenticationClassName($this->config, $this->entityManager, $this);
+
+        $this->request = $this->container->get('slim')->request();
     }
 
     public function useNoAuth($isAdmin = false)
@@ -64,8 +66,6 @@ class Auth
 
     public function login($username, $password)
     {
-        $GLOBALS['log']->debug('AUTH: Try to authenticate');
-
         $entityManager = $this->entityManager;
 
         $authToken = $entityManager->getRepository('AuthToken')->where(array('token' => $password))->findOne();
@@ -79,22 +79,22 @@ class Auth
             }
             $entityManager->setUser($user);
             $this->container->setUser($user);
-            $GLOBALS['log']->debug('AUTH: Result of authenticate is [true]');
 
-            if (!$authToken) {
-                $authToken = $entityManager->getEntity('AuthToken');
-                $token = $this->createToken($user);
-                $authToken->set('token', $token);
-                $authToken->set('hash', $user->get('password'));
-                $authToken->set('ipAddress', $_SERVER['REMOTE_ADDR']);
-                $authToken->set('userId', $user->id);
+            if ($this->request->headers->get('HTTP_ESPO_AUTHORIZATION')) {
+	            if (!$authToken) {
+	                $authToken = $entityManager->getEntity('AuthToken');
+	                $token = $this->createToken($user);
+	                $authToken->set('token', $token);
+	                $authToken->set('hash', $user->get('password'));
+	                $authToken->set('ipAddress', $_SERVER['REMOTE_ADDR']);
+	                $authToken->set('userId', $user->id);
+	            }
+            	$authToken->set('lastAccess', date('Y-m-d H:i:s'));
+
+            	$entityManager->saveEntity($authToken);
+            	$user->set('token', $authToken->get('token'));
             }
 
-            $authToken->set('lastAccess', date('Y-m-d H:i:s'));
-
-            $entityManager->saveEntity($authToken);
-            $user->set('token', $authToken->get('token'));
-
             return true;
         }
     }

application/Espo/Core/Utils/Cron/Job.php

@@ -33,10 +33,14 @@ class Job
 
     private $entityManager;
 
+    private $cronScheduledJob;
+
     public function __construct(Config $config, EntityManager $entityManager)
     {
         $this->config = $config;
         $this->entityManager = $entityManager;
+
+        $this->cronScheduledJob = new ScheduledJob($this->config, $this->entityManager);
     }
 
     protected function getConfig()
@@ -49,6 +53,11 @@ class Job
         return $this->entityManager;
     }
 
+    protected function getCronScheduledJob()
+    {
+        return $this->cronScheduledJob;
+    }
+
     /**
      * Get Pending Jobs
      *
@@ -58,6 +67,7 @@ class Job
     {
         /** Mark Failed old jobs and remove pending duplicates */
         $this->markFailedJobs();
+        $this->markJobAttempts();
         $this->removePendingJobDuplicates();
 
         $jobList = $this->getActiveJobs();
@@ -87,12 +97,11 @@ class Job
         $jobConfigs = $this->getConfig()->get('cron');
 
         $currentTime = time();
-        $periodTime = $currentTime - intval($jobConfigs['jobPeriod']);
         $limit = empty($jobConfigs['maxJobNumber']) ? '' : 'LIMIT '.$jobConfigs['maxJobNumber'];
 
         $query = "SELECT " . $displayColumns . " FROM job WHERE
                     `status` = '" . $status . "'
-                    AND execute_time BETWEEN '".date('Y-m-d H:i:s', $periodTime)."' AND '".date('Y-m-d H:i:s', $currentTime)."'
+                    AND execute_time <= '".date('Y-m-d H:i:s', $currentTime)."'
                     AND deleted = 0
                     ORDER BY execute_time ASC ".$limit;
 
@@ -109,15 +118,18 @@ class Job
      * Get Jobs by ScheduledJobId and date
      *
      * @param  string $scheduledJobId
-     * @param  string $date
+     * @param  string $time
      *
      * @return array
      */
-    public function getJobByScheduledJob($scheduledJobId, $date)
+    public function getJobByScheduledJob($scheduledJobId, $time)
     {
+        $dateObj = new \DateTime($time);
+        $timeWithoutSeconds = $dateObj->format('Y-m-d H:i:');
+
         $query = "SELECT * FROM job WHERE
                     scheduled_job_id = '".$scheduledJobId."'
-                    AND execute_time = '".$date."'
+                    AND execute_time LIKE '".$timeWithoutSeconds."%'
                     AND deleted = 0
                     LIMIT 1";
 
@@ -142,13 +154,30 @@ class Job
         $currentTime = time();
         $periodTime = $currentTime - intval($jobConfigs['jobPeriod']);
 
-        $update = "UPDATE job SET `status` = '" . CronManager::FAILED ."' WHERE
-                    (`status` = '" . CronManager::PENDING ."' OR `status` = '" . CronManager::RUNNING ."')
-                    AND execute_time < '".date('Y-m-d H:i:s', $periodTime)."' ";
-
         $pdo = $this->getEntityManager()->getPDO();
+
+        $select = "SELECT id, scheduled_job_id, execute_time FROM `job` WHERE
+                    (`status` = '" . CronManager::RUNNING ."')
+                    AND execute_time < '".date('Y-m-d H:i:s', $periodTime)."' ";
+        $sth = $pdo->prepare($select);
+        $sth->execute();
+
+        $jobData = array();
+        while ($row = $sth->fetch(PDO::FETCH_ASSOC)){
+           $jobData[$row['id']] = $row;
+        }
+
+        $update = "UPDATE job SET `status` = '". CronManager::FAILED ."' WHERE id IN ('".implode("', '", array_keys($jobData))."')";
         $sth = $pdo->prepare($update);
         $sth->execute();
+
+        //add status 'Failed' to SchediledJobLog
+        $cronScheduledJob = $this->getCronScheduledJob();
+        foreach ($jobData as $jobId => $job) {
+            if (!empty($job['scheduled_job_id'])) {
+                $cronScheduledJob->addLogRecord($job['scheduled_job_id'], CronManager::FAILED, $job['execute_time']);
+            }
+        }
     }
 
     /**
@@ -158,10 +187,22 @@ class Job
      */
     protected function removePendingJobDuplicates()
     {
-        $duplicateJobs = $this->getActiveJobs('DISTINCT scheduled_job_id');
-
         $pdo = $this->getEntityManager()->getPDO();
 
+        $query = "SELECT scheduled_job_id FROM job
+                    WHERE
+                    scheduled_job_id IS NOT NULL
+                    AND `status` = '".CronManager::PENDING."'
+                    AND execute_time <= '".date('Y-m-d H:i:s')."'
+                    AND deleted = 0
+                    GROUP BY scheduled_job_id
+                    HAVING count( * ) > 1
+                    ORDER BY execute_time ASC";
+        $sth = $pdo->prepare($query);
+        $sth->execute();
+
+        $duplicateJobs = $sth->fetchAll(PDO::FETCH_ASSOC);
+
         foreach ($duplicateJobs as $row) {
             if (!empty($row['scheduled_job_id'])) {
 
@@ -182,4 +223,41 @@ class Job
             }
         }
     }
+
+    /**
+     * Mark job attempts
+     *
+     * @return void
+     */
+    protected function markJobAttempts()
+    {
+        $query = "SELECT * FROM job WHERE
+                    `status` = '" . CronManager::FAILED . "'
+                    AND deleted = 0
+                    AND execute_time <= '".date('Y-m-d H:i:s')."'
+                    AND attempts > 0";
+
+        $pdo = $this->getEntityManager()->getPDO();
+        $sth = $pdo->prepare($query);
+        $sth->execute();
+
+        $rows = $sth->fetchAll(PDO::FETCH_ASSOC);
+        if ($rows) {
+            foreach ($rows as $row) {
+                $row['failed_attempts'] = isset($row['failed_attempts']) ? $row['failed_attempts'] : 0;
+
+                $attempts = $row['attempts'] - 1;
+                $failedAttempts = $row['failed_attempts'] + 1;
+
+                $update = "UPDATE job SET
+                            `status` = '" . CronManager::PENDING ."',
+                            attempts = '".$attempts."',
+                            failed_attempts = '".$failedAttempts."'
+                            WHERE
+                            id = '".$row['id']."'
+                ";
+                $pdo->prepare($update)->execute();
+            }
+        }
+    }
 }

application/Espo/Core/Utils/Cron/ScheduledJob.php

@@ -81,14 +81,16 @@ class ScheduledJob
      *
      * @return string ID of created ScheduledJobLogRecord
      */
-    public function addLogRecord($scheduledJobId, $status)
+    public function addLogRecord($scheduledJobId, $status, $runTime = null)
     {
-        $lastRun = date('Y-m-d H:i:s');
+        if (!isset($runTime)) {
+            $runTime = date('Y-m-d H:i:s');
+        }
 
         $entityManager = $this->getEntityManager();
 
         $scheduledJob = $entityManager->getEntity('ScheduledJob', $scheduledJobId);
-        $scheduledJob->set('lastRun', $lastRun);
+        $scheduledJob->set('lastRun', $runTime);
         $entityManager->saveEntity($scheduledJob);
 
         $scheduledJobLog = $entityManager->getEntity('ScheduledJobLogRecord');
@@ -96,7 +98,7 @@ class ScheduledJob
             'scheduledJobId' => $scheduledJobId,
             'name' => $scheduledJob->get('name'),
             'status' => $status,
-            'executionTime' => $lastRun,
+            'executionTime' => $runTime,
         ));
         $scheduledJobLogId = $entityManager->saveEntity($scheduledJobLog);
 

application/Espo/Core/Utils/Database/Converter.php

@@ -33,16 +33,8 @@ class Converter
 
     private $schemaConverter;
 
-
-
     private $schemaFromMetadata = null;
 
-    /**
-    * @var array $meta - metadata array
-    */
-    //private $meta;
-
-
     public function __construct(\Espo\Core\Utils\Metadata $metadata, \Espo\Core\Utils\File\Manager $fileManager)
     {
         $this->metadata = $metadata;
@@ -53,7 +45,6 @@ class Converter
         $this->schemaConverter = new Schema\Converter($this->fileManager);
     }
 
-
     protected function getMetadata()
     {
         return $this->metadata;
@@ -69,13 +60,11 @@ class Converter
         return $this->schemaConverter;
     }
 
-
     public function getSchemaFromMetadata($entityList = null)
     {
         $ormMeta = $this->getMetadata()->getOrmMetadata();
-        $entityDefs = $this->getMetadata()->get('entityDefs');
 
-        $this->schemaFromMetadata = $this->getSchemaConverter()->process($ormMeta, $entityDefs, $entityList);
+        $this->schemaFromMetadata = $this->getSchemaConverter()->process($ormMeta, $entityList);
 
         return $this->schemaFromMetadata;
     }
@@ -98,11 +87,4 @@ class Converter
 
         return $result;
     }
-
-
-
-
-}
-
-
-?>
+}

application/Espo/Core/Utils/Database/DBAL/Platforms/MySqlPlatform.php

@@ -22,12 +22,13 @@
 
 namespace Espo\Core\Utils\Database\DBAL\Platforms;
 
-use Doctrine\DBAL\Schema\TableDiff,
-    Doctrine\DBAL\Schema\Index,
-    Doctrine\DBAL\Schema\Table,
-    Doctrine\DBAL\Schema\Constraint,
-    Doctrine\DBAL\Schema\ForeignKeyConstraint;
-
+use Doctrine\DBAL\Schema\TableDiff;
+use Doctrine\DBAL\Schema\Index;
+use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Schema\Constraint;
+use Doctrine\DBAL\Schema\ForeignKeyConstraint;
+use Doctrine\DBAL\Schema\ColumnDiff;
+use Doctrine\DBAL\Schema\Column;
 
 class MySqlPlatform extends \Doctrine\DBAL\Platforms\MySqlPlatform
 {
@@ -39,21 +40,52 @@ class MySqlPlatform extends \Doctrine\DBAL\Platforms\MySqlPlatform
             $queryParts[] = 'RENAME TO ' . $diff->newName;
         }
 
-        foreach ($diff->addedColumns as $column) {
-            if ($this->onSchemaAlterTableAddColumn($column, $diff, $columnSql)) {
+        //espo: It works not correctly. It can rename some existing fields
+        foreach ($diff->renamedColumns as $oldColumnName => $column) {
+            if ($this->onSchemaAlterTableRenameColumn($oldColumnName, $column, $diff, $columnSql)) {
                 continue;
             }
 
+            //espo: remaned autoincrement field
+            if ($column->getAutoincrement()) {
+                $diff->removedColumns[$oldColumnName] = new Column($oldColumnName, $column->getType(), $column->toArray());
+
+                $columnName = $column->getQuotedName($this);
+                $diff->addedColumns[$columnName] = $column;
+                continue;
+            }
+            //END espo
+
             $columnArray = $column->toArray();
             $columnArray['comment'] = $this->getColumnComment($column);
-            $queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
-        }
+            /*$queryParts[] =  'CHANGE ' . $oldColumnName . ' '
+                    . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray); */
+            $queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray); //espo: fixed the problem
+        } //espo: END
 
         foreach ($diff->removedColumns as $column) {
             if ($this->onSchemaAlterTableRemoveColumn($column, $diff, $columnSql)) {
                 continue;
             }
 
+            //espo: remove autoincrement option
+            if ($column->getAutoincrement()) {
+
+                $columnName = $column->getQuotedName($this);
+
+                $changedColumn = clone $column;
+                $changedColumn->setNotNull(false);
+                $changedColumn->setAutoincrement(false);
+
+                $changedProperties = array(
+                    'notnull',
+                    'autoincrement',
+                );
+
+                $diff->changedColumns[$columnName] = new ColumnDiff($columnName, $changedColumn, $changedProperties, $column);
+            }
+            //END espo
+
             //$queryParts[] =  'DROP ' . $column->getQuotedName($this); //espo: no needs to remove columns
         }
 
@@ -71,19 +103,15 @@ class MySqlPlatform extends \Doctrine\DBAL\Platforms\MySqlPlatform
                     . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
         }
 
-        //espo: It works not correctly. It can rename some existing fields
-        foreach ($diff->renamedColumns as $oldColumnName => $column) {
-            if ($this->onSchemaAlterTableRenameColumn($oldColumnName, $column, $diff, $columnSql)) {
+        foreach ($diff->addedColumns as $column) {
+            if ($this->onSchemaAlterTableAddColumn($column, $diff, $columnSql)) {
                 continue;
             }
 
             $columnArray = $column->toArray();
             $columnArray['comment'] = $this->getColumnComment($column);
-            /*$queryParts[] =  'CHANGE ' . $oldColumnName . ' '
-                    . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray); */
-            $queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray); //espo: fixed the problem
-        } //espo: END
-
+            $queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
+        }
 
         $sql = array();
         $tableSql = array();

application/Espo/Core/Utils/Database/Orm/Converter.php

@@ -29,7 +29,7 @@ class Converter
 {
     private $metadata;
     private $fileManager;
-    private $metadataUtils;
+    private $metadataHelper;
 
     private $relationManager;
 
@@ -79,9 +79,18 @@ class Converter
 
     protected $idParams = array(
         'dbType' => 'varchar',
-        'len' => '24',
+        'len' => 24,
     );
 
+    /**
+     * Permitted Entity options which will be moved to ormMetadata
+     *
+     * @var array
+     */
+    protected $permittedEntityOptions = array(
+        'indexes',
+        'additionalTables',
+    );
 
     public function __construct(\Espo\Core\Utils\Metadata $metadata, \Espo\Core\Utils\File\Manager $fileManager)
     {
@@ -90,18 +99,17 @@ class Converter
 
         $this->relationManager = new RelationManager($this->metadata);
 
-        $this->metadataUtils = new \Espo\Core\Utils\Metadata\Utils($this->metadata);
+        $this->metadataHelper = new \Espo\Core\Utils\Metadata\Helper($this->metadata);
     }
 
-
     protected function getMetadata()
     {
         return $this->metadata;
     }
 
-    protected function getEntityDefs()
+    protected function getEntityDefs($reload = false)
     {
-        if (empty($this->entityDefs)) {
+        if (empty($this->entityDefs) || $reload) {
             $this->entityDefs = $this->getMetadata()->get('entityDefs');
         }
 
@@ -118,14 +126,19 @@ class Converter
         return $this->relationManager;
     }
 
-    protected function getMetadataUtils()
+    protected function getMetadataHelper()
     {
-        return $this->metadataUtils;
+        return $this->metadataHelper;
     }
 
+    /**
+     * Orm metadata convertation process
+     *
+     * @return array
+     */
     public function process()
     {
-        $entityDefs = $this->getEntityDefs();
+        $entityDefs = $this->getEntityDefs(true);
 
         $ormMeta = array();
         foreach($entityDefs as $entityName => $entityMeta) {
@@ -153,11 +166,14 @@ class Converter
             ),
         );
 
-        if (isset($entityMeta['indexes'])) {
-            $ormMeta[$entityName]['indexes'] = $entityMeta['indexes'];
+        foreach ($this->permittedEntityOptions as $optionName) {
+            if (isset($entityMeta[$optionName])) {
+                $ormMeta[$entityName][$optionName] = $entityMeta[$optionName];
+            }
         }
 
         $ormMeta[$entityName]['fields'] = $this->convertFields($entityName, $entityMeta);
+        $ormMeta = $this->correctFields($entityName, $ormMeta);
 
         $convertedLinks = $this->convertLinks($entityName, $entityMeta, $ormMeta);
 
@@ -168,65 +184,26 @@ class Converter
 
     public function afterProcess(array $ormMeta)
     {
-        $entityDefs = $this->getEntityDefs();
-
-        $currentOrmMeta = $ormMeta;
-        //load custom field definitions and customCodes
-        foreach($currentOrmMeta as $entityName => $entityParams) {
-            foreach($entityParams['fields'] as $fieldName => $fieldParams) {
-
-                //load custom field definitions
-                $fieldType = ucfirst($fieldParams['type']);
-                $className = '\Espo\Custom\Core\Utils\Database\Orm\Fields\\'.$fieldType;
-                if (!class_exists($className)) {
-                    $className = '\Espo\Core\Utils\Database\Orm\Fields\\'.$fieldType;
-                }
-
-                if (class_exists($className) && method_exists($className, 'load')) {
-                    $helperClass = new $className($this->metadata, $ormMeta, $entityDefs);
-                    $fieldResult = $helperClass->process( $fieldName, $entityName );
-                    if (isset($fieldResult['unset'])) {
-                        $ormMeta = Util::unsetInArray($ormMeta, $fieldResult['unset']);
-                        unset($fieldResult['unset']);
-                    }
-
-                    $ormMeta = Util::merge($ormMeta, $fieldResult);
-
-                } //END: load custom field definitions
-
-                //todo move to separate file
-                //add a field 'isFollowed' for scopes with 'stream => true'
-                $scopeDefs = $this->getMetadata()->get('scopes.'.$entityName);
-                if (isset($scopeDefs['stream']) && $scopeDefs['stream']) {
-                    if (!isset($entityParams['fields']['isFollowed'])) {
-                        $ormMeta[$entityName]['fields']['isFollowed'] = array(
-                            'type' => 'varchar',
-                            'notStorable' => true,
-                        );
-                    }
-                } //END: add a field 'isFollowed' for stream => true
-
-            }
-        }
-
         foreach($ormMeta as $entityName => &$entityParams) {
             foreach($entityParams['fields'] as $fieldName => &$fieldParams) {
 
                 switch ($fieldParams['type']) {
                     case 'id':
                         if ($fieldParams['dbType'] != 'int') {
-                            $fieldParams = array_merge($fieldParams, $this->idParams);
+                            $fieldParams = array_merge($this->idParams, $fieldParams);
                         }
                         break;
 
                     case 'foreignId':
-                        $fieldParams = array_merge($fieldParams, $this->idParams);
+                        $fieldParams = array_merge($this->idParams, $fieldParams);
                         $fieldParams['notNull'] = false;
                         break;
 
                     case 'foreignType':
                         $fieldParams['dbType'] = Entity::VARCHAR;
-                        $fieldParams['len'] = $this->defaultLength['varchar'];
+                        if (empty($fieldParams['len'])) {
+                            $fieldParams['len'] = $this->defaultLength['varchar'];
+                        }
                         break;
 
                     case 'bool':
@@ -234,7 +211,6 @@ class Converter
                         break;
                 }
             }
-
         }
 
         return $ormMeta;
@@ -250,6 +226,11 @@ class Converter
      */
     protected function convertFields($entityName, &$entityMeta)
     {
+        //List of unmerged fields with default field defenitions in $outputMeta
+        $unmergedFields = array(
+            'name',
+        );
+
         $outputMeta = array(
             'id' => array(
                 'type' => Entity::ID,
@@ -259,36 +240,31 @@ class Converter
                 'type' => isset($entityMeta['fields']['name']['type']) ? $entityMeta['fields']['name']['type'] : Entity::VARCHAR,
                 'notStorable' => true,
             ),
+            'deleted' => array(
+                'type' => Entity::BOOL,
+                'default' => false,
+            ),
         );
 
         foreach($entityMeta['fields'] as $fieldName => $fieldParams) {
 
             /** check if "fields" option exists in $fieldMeta */
-            $fieldTypeMeta = $this->getMetadataUtils()->getFieldDefsByType($fieldParams);
+            $fieldTypeMeta = $this->getMetadataHelper()->getFieldDefsByType($fieldParams);
 
-            if (isset($fieldTypeMeta['fields']) && is_array($fieldTypeMeta['fields'])) {
+            $fieldDefs = $this->convertField($entityName, $fieldName, $fieldParams, $fieldTypeMeta);
 
-                foreach($fieldTypeMeta['actualFields'] as $subFieldName) {
-
-                    $subField = $this->convertActualFields($entityName, $fieldName, $fieldParams, $subFieldName, $fieldTypeMeta);
-
-                    if (!isset($outputMeta[ $subField['naming'] ])) {
-                        $subFieldDefs = $this->convertField($entityName, $subField['name'], $subField['params']);
-                        if ($subFieldDefs !== false) {
-                            $outputMeta[ $subField['naming'] ] = $subFieldDefs; //push fieldDefs to the main array
-                        }
-                    }
-                }
-            } else {
-                $fieldDefs = $this->convertField($entityName, $fieldName, $fieldParams, $fieldTypeMeta);
-                if ($fieldDefs !== false) {
-                    $outputMeta[$fieldName] = $fieldDefs; //push fieldDefs to the main array
+            if ($fieldDefs !== false) {
+                //push fieldDefs to the ORM metadata array
+                if (isset($outputMeta[$fieldName]) && !in_array($fieldName, $unmergedFields)) {
+                    $outputMeta[$fieldName] = array_merge($outputMeta[$fieldName], $fieldDefs);
+                } else {
+                    $outputMeta[$fieldName] = $fieldDefs;
                 }
             }
 
             /** check and set the linkDefs from 'fields' metadata */
             if (isset($fieldTypeMeta['linkDefs'])) {
-                $linkDefs = $this->getMetadataUtils()->getLinkDefsInFieldMeta($entityName, $fieldParams, $fieldTypeMeta['linkDefs']);
+                $linkDefs = $this->getMetadataHelper()->getLinkDefsInFieldMeta($entityName, $fieldParams, $fieldTypeMeta['linkDefs']);
                 if (isset($linkDefs)) {
                     if (!isset($entityMeta['links'])) {
                         $entityMeta['links'] = array();
@@ -298,35 +274,81 @@ class Converter
             }
         }
 
-        if (!isset($outputMeta['deleted'])) {
-            $outputMeta['deleted'] = array(
-                'type' => Entity::BOOL,
-                'default' => false,
-            );
+        return $outputMeta;
+    }
+
+    /**
+     * Correct fields defenitions based on \Espo\Custom\Core\Utils\Database\Orm\Fields
+     *
+     * @param  array  $ormMeta
+     *
+     * @return array
+     */
+    protected function correctFields($entityName, array $ormMeta)
+    {
+        $entityDefs = $this->getEntityDefs();
+
+        $entityMeta = $ormMeta[$entityName];
+        //load custom field definitions and customCodes
+        foreach($entityMeta['fields'] as $fieldName => $fieldParams) {
+
+            //load custom field definitions
+            $fieldType = ucfirst($fieldParams['type']);
+            $className = '\Espo\Custom\Core\Utils\Database\Orm\Fields\\' . $fieldType;
+            if (!class_exists($className)) {
+                $className = '\Espo\Core\Utils\Database\Orm\Fields\\' . $fieldType;
+            }
+
+            if (class_exists($className) && method_exists($className, 'load')) {
+                $helperClass = new $className($this->metadata, $ormMeta, $entityDefs);
+                $fieldResult = $helperClass->process( $fieldName, $entityName );
+                if (isset($fieldResult['unset'])) {
+                    $ormMeta = Util::unsetInArray($ormMeta, $fieldResult['unset']);
+                    unset($fieldResult['unset']);
+                }
+
+                $ormMeta = Util::merge($ormMeta, $fieldResult);
+
+            } //END: load custom field definitions
         }
 
-        return $outputMeta;
+        //todo move to separate file
+        //add a field 'isFollowed' for scopes with 'stream => true'
+        $scopeDefs = $this->getMetadata()->get('scopes.'.$entityName);
+        if (isset($scopeDefs['stream']) && $scopeDefs['stream']) {
+            if (!isset($entityMeta['fields']['isFollowed'])) {
+                $ormMeta[$entityName]['fields']['isFollowed'] = array(
+                    'type' => 'varchar',
+                    'notStorable' => true,
+                );
+
+                $ormMeta[$entityName]['fields']['followersIds'] = array(
+                    'type' => 'jsonArray',
+                    'notStorable' => true,
+                );
+                $ormMeta[$entityName]['fields']['followersNames'] = array(
+                    'type' => 'jsonObject',
+                    'notStorable' => true,
+                );
+            }
+        } //END: add a field 'isFollowed' for stream => true
+
+        return $ormMeta;
     }
 
     protected function convertField($entityName, $fieldName, array $fieldParams, $fieldTypeMeta = null)
     {
-        /** set default type if exists */
-        if (!isset($fieldParams['type']) || empty($fieldParams['type'])) {
-            $GLOBALS['log']->debug('Field type does not exist for '.$entityName.':'.$fieldName.'. Use default type ['.$this->defaultFieldType.']');
-            $fieldParams['type'] = $this->defaultFieldType;
-        } /** END: set default type if exists */
-
         /** merge fieldDefs option from field definition */
         if (!isset($fieldTypeMeta)) {
-            $fieldTypeMeta = $this->getMetadataUtils()->getFieldDefsByType($fieldParams);
+            $fieldTypeMeta = $this->getMetadataHelper()->getFieldDefsByType($fieldParams);
         }
 
         if (isset($fieldTypeMeta['fieldDefs'])) {
             $fieldParams = Util::merge($fieldParams, $fieldTypeMeta['fieldDefs']);
         }
 
-        /** check if need to skip this field in ORM metadata */
-        if (isset($fieldParams['skip']) && $fieldParams['skip'] === true) {
+        /** check if need to skipOrmDefs this field in ORM metadata */
+        if (isset($fieldParams['skipOrmDefs']) && $fieldParams['skipOrmDefs'] === true) {
             return false;
         }
 
@@ -350,45 +372,12 @@ class Converter
         return $fieldDefs;
     }
 
-    protected function convertActualFields($entityName, $fieldName, $fieldParams, $subFieldName, $fieldTypeMeta)
-    {
-        $subField = array();
-
-        $subField['params'] = $this->getInitValues($fieldParams);
-
-        if (isset($fieldTypeMeta['fieldDefs'])) {
-            $subField['params'] = Util::merge($subField['params'], $fieldTypeMeta['fieldDefs']);
-        }
-
-        //if empty field name, then use the main field
-        if (trim($subFieldName) == '') {
-
-            $subField['name'] = $fieldName;
-            $subField['naming'] = $fieldName;
-
-        } else {
-
-            $namingType = isset($fieldTypeMeta['naming']) ? $fieldTypeMeta['naming'] : $this->defaultNaming;
-
-            $subField['name'] = $subFieldName;
-            $subField['naming'] = Util::getNaming($fieldName, $subFieldName, $namingType);
-            if (isset($fieldTypeMeta['fields'][$subFieldName])) {
-                $subField['params'] = Util::merge($subField['params'], $fieldTypeMeta['fields'][$subFieldName]);
-            }
-
-        }
-
-        return $subField;
-    }
-
     protected function convertLinks($entityName, $entityMeta, $ormMeta)
     {
         if (!isset($entityMeta['links'])) {
             return array();
         }
 
-        $entityDefs = $this->getEntityDefs();
-
         $relationships = array();
         foreach($entityMeta['links'] as $linkName => $linkParams) {
 

application/Espo/Core/Utils/Database/Orm/Fields/Currency.php

@@ -34,30 +34,38 @@ class Currency extends Base
 
         $alias = Util::toUnderScore($fieldName) . "_currency_alias";
 
-        return array(
+        $d = array(
             $entityName => array(
                 'fields' => array(
                     $fieldName => array(
                         "type" => "float",
                         "orderBy" => $converedFieldName . " {direction}"
-                    ),
-                    $fieldName . 'Converted' => array(
-                        'type' => 'float',
-                        'select' => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate" ,
-                        'where' =>
-                        array (
-                                "=" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate = {value}",
-                                ">" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate > {value}",
-                                "<" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate < {value}",
-                                ">=" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate >= {value}",
-                                "<=" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate <= {value}",
-                                "<>" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate <> {value}"
-                        ),
-                        'notStorable' => true,
-                        'orderBy' => $converedFieldName . " {direction}"
-                    ),
+                    )
                 ),
             ),
         );
+
+        $params = $this->getFieldParams($fieldName);
+        if (!empty($params['notStorable'])) {
+            $d[$entityName]['fields'][$fieldName]['notStorable'] = true;
+        } else {
+            $d[$entityName]['fields'][$fieldName . 'Converted'] = array(
+                'type' => 'float',
+                'select' => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate" ,
+                'where' =>
+                array (
+                        "=" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate = {value}",
+                        ">" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate > {value}",
+                        "<" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate < {value}",
+                        ">=" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate >= {value}",
+                        "<=" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate <= {value}",
+                        "<>" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate <> {value}"
+                ),
+                'notStorable' => true,
+                'orderBy' => $converedFieldName . " {direction}"
+            );
+        }
+
+        return $d;
     }
 }

application/Espo/Core/Utils/Database/Orm/Fields/Email.php

@@ -30,7 +30,7 @@ class Email extends Base
             $entityName => array(
                 'fields' => array(
                     $fieldName => array(
-                        'select' => 'email_address.name',
+                        'select' => 'emailAddresses.name',
                         'where' =>
                         array (
                             'LIKE' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
@@ -58,7 +58,7 @@ class Email extends Base
                                     email_address.deleted = 0 AND email_address.name <> {value}
                             )"
                         ),
-                        'orderBy' => 'email_address.name {direction}',
+                        'orderBy' => 'emailAddresses.name {direction}',
                     ),
                     $fieldName .'Data' => array(
                         'type' => 'text',

application/Espo/Core/Utils/Database/Orm/Fields/Link.php

@@ -0,0 +1,57 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
+
+namespace Espo\Core\Utils\Database\Orm\Fields;
+
+class Link extends Base
+{
+    protected function load($fieldName, $entityName)
+    {
+        $fieldParams = $this->getFieldParams();
+
+        $data = array(
+            $entityName => array (
+                'fields' => array(
+                    $fieldName.'Id' => array(
+                        'type' => 'foreignId',
+                        'index' => $fieldName,
+                    ),
+                    $fieldName.'Name' => array(
+                        'type' => 'varchar',
+                        'notStorable' => true,
+                    ),
+                ),
+            ),
+            'unset' => array(
+                $entityName => array(
+                    'fields.'.$fieldName,
+                ),
+            ),
+        );
+        if (!empty($fieldParams['notStorable'])) {
+            $data[$entityName]['fields'][$fieldName.'Id']['notStorable'] = true;
+        }
+
+
+        return $data;
+    }
+}

application/Espo/Core/Utils/Database/Orm/Fields/LinkParent.php

@@ -44,6 +44,11 @@ class LinkParent extends Base
                     ),
                 ),
             ),
+            'unset' => array(
+                $entityName => array(
+                    'fields.'.$fieldName,
+                ),
+            ),
         );
     }
 }

application/Espo/Core/Utils/Database/Orm/Fields/Phone.php

@@ -30,7 +30,7 @@ class Phone extends Base
             $entityName => array(
                 'fields' => array(
                     $fieldName => array(
-                        'select' => 'phone_number.name',
+                        'select' => 'phoneNumbers.name',
                         'where' =>
                         array (
                             'LIKE' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
@@ -58,7 +58,7 @@ class Phone extends Base
                                     phone_number.deleted = 0 AND phone_number.name <> {value}
                             )"
                         ),
-                        'orderBy' => 'phone_number.name {direction}',
+                        'orderBy' => 'phoneNumbers.name {direction}',
                     ),
                     $fieldName .'Data' => array(
                         'type' => 'text',

application/Espo/Core/Utils/Database/Orm/RelationManager.php

@@ -28,8 +28,6 @@ class RelationManager
 {
     private $metadata;
 
-    private $entityDefs;
-
     public function __construct(\Espo\Core\Utils\Metadata $metadata)
     {
         $this->metadata = $metadata;
@@ -40,16 +38,6 @@ class RelationManager
         return $this->metadata;
     }
 
-    protected function getEntityDefs()
-    {
-        if (empty($this->entityDefs)) {
-            $this->entityDefs = $this->getMetadata()->get('entityDefs');
-        }
-
-        return $this->entityDefs;
-    }
-
-
     public function getLinkEntityName($entityName, $linkParams)
     {
         return isset($linkParams['entity']) ? $linkParams['entity'] : $entityName;
@@ -110,7 +98,7 @@ class RelationManager
 
     public function convert($linkName, $linkParams, $entityName, $ormMeta)
     {
-        $entityDefs = $this->getEntityDefs();
+        $entityDefs = $this->getMetadata()->get('entityDefs');
 
         $foreignEntityName = $this->getLinkEntityName($entityName, $linkParams);
         $foreignLink = $this->getForeignLink($linkName, $linkParams, $entityDefs[$foreignEntityName]);

application/Espo/Core/Utils/Database/Orm/Relations/Base.php

@@ -22,6 +22,8 @@
 
 namespace Espo\Core\Utils\Database\Orm\Relations;
 
+use Espo\Core\Utils\Util;
+
 class Base extends \Espo\Core\Utils\Database\Orm\Base
 {
     private $params;
@@ -36,6 +38,7 @@ class Base extends \Espo\Core\Utils\Database\Orm\Base
         'conditions',
         'additionalColumns',
         'midKeys',
+        'noJoin'
     );
 
     protected function getParams()
@@ -118,8 +121,11 @@ class Base extends \Espo\Core\Utils\Database\Orm\Base
 
                 $additionalParrams = $this->getAllowedAdditionalParams($name);
 
-                if (isset($additionalParrams) && !isset($linkParams[$name])) {
+                if (isset($additionalParrams)) {
                     $linkParams[$name] = $additionalParrams;
+                    if (isset($linkParams[$name]) && is_array($linkParams[$name])) {
+                        $linkParams[$name] = Util::merge($linkParams[$name], $additionalParrams);
+                    }
                 }
             }
         }

application/Espo/Core/Utils/Database/Orm/Relations/BelongsTo.php

@@ -26,16 +26,30 @@ class BelongsTo extends Base
 {
     protected function load($linkName, $entityName)
     {
+        $linkParams = $this->getLinkParams();
+
         $foreignEntityName = $this->getForeignEntityName();
 
+        if (!empty($linkParams['noJoin'])) {
+            $fieldNameDefs = array(
+                'type' => 'varchar',
+                'notStorable' => true,
+                'relation' => $linkName,
+                'foreign' => $this->getForeignField('name', $foreignEntityName),
+            );
+        } else {
+            $fieldNameDefs = array(
+                'type' => 'foreign',
+                'relation' => $linkName,
+                'foreign' => $this->getForeignField('name', $foreignEntityName),
+                'notStorable' => false,
+            );
+        }
+
         return array (
             $entityName => array (
                 'fields' => array(
-                    $linkName.'Name' => array(
-                        'type' => 'foreign',
-                        'relation' => $linkName,
-                        'foreign' => $this->getForeignField('name', $foreignEntityName),
-                    ),
+                    $linkName.'Name' => $fieldNameDefs,
                     $linkName.'Id' => array(
                         'type' => 'foreignId',
                         'index' => true,
@@ -46,7 +60,7 @@ class BelongsTo extends Base
                         'type' => 'belongsTo',
                         'entity' => $foreignEntityName,
                         'key' => $linkName.'Id',
-                        'foreignKey' => 'id', //????
+                        'foreignKey' => 'id',
                     ),
                 ),
             ),

application/Espo/Core/Utils/Database/Orm/Relations/BelongsToParent.php

@@ -0,0 +1,60 @@
+<?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\Utils\Database\Orm\Relations;
+
+class BelongsToParent extends Base
+{
+    protected function load($linkName, $entityName)
+    {
+        $linkParams = $this->getLinkParams();
+
+        return array(
+            $entityName => array (
+                'fields' => array(
+                    $linkName.'Id' => array(
+                        'type' => 'foreignId',
+                        'index' => $linkName,
+                    ),
+                    $linkName.'Type' => array(
+                        'type' => 'foreignType',
+                        'notNull' => false,
+                        'index' => $linkName,
+                        'len' => 100
+                    ),
+                    $linkName.'Name' => array(
+                        'type' => 'varchar',
+                        'notStorable' => true,
+                    ),
+                ),
+                'relations' => array(
+                    $linkName => array(
+                        'type' => 'belongsToParent',
+                        'key' => $linkName.'Id',
+                    ),
+                ),
+            ),
+        );
+
+    }
+
+}

application/Espo/Core/Utils/Database/Schema/Converter.php

@@ -47,11 +47,10 @@ class Converter
         'unique' => 'unique',
     );
 
-
     //todo: same array in Converters\Orm
     protected $idParams = array(
         'dbType' => 'varchar',
-        'len' => '24',
+        'len' => 24,
     );
 
     //todo: same array in Converters\Orm
@@ -68,8 +67,6 @@ class Converter
     {
         $this->fileManager = $fileManager;
 
-        $this->dbalSchema = new \Espo\Core\Utils\Database\DBAL\Schema\Schema();
-
         $this->typeList = array_keys(\Doctrine\DBAL\Types\Type::getTypesMap());
     }
 
@@ -78,18 +75,36 @@ class Converter
         return $this->fileManager;
     }
 
-    protected function getSchema()
+    /**
+     * Get schema
+     *
+     * @param  boolean $reload
+     *
+     * @return \Doctrine\DBAL\Schema\Schema
+     */
+    protected function getSchema($reload = false)
     {
+        if (!isset($this->dbalSchema) || $reload) {
+            $this->dbalSchema = new \Espo\Core\Utils\Database\DBAL\Schema\Schema();
+        }
+
         return $this->dbalSchema;
     }
 
-
-    public function process(array $ormMeta, $entityDefs, $entityList = null)
+    /**
+     * Schema convertation process
+     *
+     * @param  array  $ormMeta
+     * @param  array|null $entityList
+     *
+     * @return \Doctrine\DBAL\Schema\Schema
+     */
+    public function process(array $ormMeta, $entityList = null)
     {
         $GLOBALS['log']->debug('Schema\Converter - Start: building schema');
 
         //check if exist files in "Tables" directory and merge with ormMetadata
-        $ormMeta = Util::merge($ormMeta, $this->getCustomTables());
+        $ormMeta = Util::merge($ormMeta, $this->getCustomTables($ormMeta));
 
         //unset some keys in orm
         if (isset($ormMeta['unset'])) {
@@ -106,7 +121,7 @@ class Converter
             $ormMeta = array_intersect_key($ormMeta, array_flip($dependentEntities));
         }
 
-        $schema = $this->getSchema();
+        $schema = $this->getSchema(true);
 
         $tables = array();
         foreach ($ormMeta as $entityName => $entityParams) {
@@ -241,16 +256,19 @@ class Converter
         $table->addColumn('id', 'int', array('length'=>$this->defaultLength['int'], 'autoincrement' => true, 'notnull' => true,));  //'unique' => true,
 
         //add midKeys to a schema
+        $uniqueIndex = array();
         foreach($relationParams['midKeys'] as $index => $midKey) {
 
-            $usMidKey = Util::toUnderScore($midKey);
-            $table->addColumn($usMidKey, $this->idParams['dbType'], array('length'=>$this->idParams['len']));
-            $table->addIndex(array($usMidKey));
+            $columnName = Util::toUnderScore($midKey);
+            $table->addColumn($columnName, $this->idParams['dbType'], array('length'=>$this->idParams['len']));
+            $table->addIndex(array($columnName));
 
-        } //END: add midKeys to a schema
+            $uniqueIndex[] = $columnName;
+        }
+        //END: add midKeys to a schema
 
         //add additionalColumns
-        if (isset($relationParams['additionalColumns'])) {
+        if (!empty($relationParams['additionalColumns'])) {
             foreach($relationParams['additionalColumns'] as $fieldName => $fieldParams) {
 
                 if (!isset($fieldParams['type'])) {
@@ -264,6 +282,17 @@ class Converter
             }
         } //END: add additionalColumns
 
+        //add unique indexes
+        if (!empty($relationParams['conditions'])) {
+            foreach ($relationParams['conditions'] as $fieldName => $fieldParams) {
+                $uniqueIndex[] = Util::toUnderScore($fieldName);
+            }
+        }
+
+        if (!empty($uniqueIndex)) {
+            $table->addUniqueIndex($uniqueIndex);
+        }
+        //END: add unique indexes
 
         $table->addColumn('deleted', 'bool', array('default' => 0));
         $table->setPrimaryKey(array("id"));
@@ -271,7 +300,6 @@ class Converter
         return $table;
     }
 
-
     protected function getDbFieldParams($fieldParams)
     {
         $dbFieldParams = array();
@@ -322,11 +350,14 @@ class Converter
         return $keyList;
     }
 
-
-    /*
-     * @return array - ormMeta
+    /**
+     * Get custom table defenition in "application/Espo/Core/Utils/Database/Schema/tables/" and in metadata 'additionalTables'
+     *
+     * @param  array  $ormMeta
+     *
+     * @return array
      */
-    protected function getCustomTables()
+    protected function getCustomTables(array $ormMeta)
     {
         $customTables = array();
 
@@ -339,6 +370,13 @@ class Converter
             }
         }
 
+        //get custom tables from metdata 'additionalTables'
+        foreach ($ormMeta as $entityName => $entityParams) {
+            if (isset($entityParams['additionalTables']) && is_array($entityParams['additionalTables'])) {
+                $customTables = Util::merge($customTables, $entityParams['additionalTables']);
+            }
+        }
+
         return $customTables;
     }
 

application/Espo/Core/Utils/Database/Schema/tables/autofollow.php

@@ -0,0 +1,48 @@
+<?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/.
+ ************************************************************************/
+
+return array(
+
+    'Autofollow' => array(
+        'fields' => array(
+            'id' => array(
+                'type' => 'id',
+                'dbType' => 'int',
+                'len' => '11',
+                'autoincrement' => true,
+                'unique' => true,
+            ),
+            'entityType' => array(
+                'type' => 'varchar',
+                'len' => '100',
+                'index' => 'entityType',
+            ),
+            'userId' => array(
+                'type' => 'varchar',
+                'len' => '24',
+                'index' => true,
+            )
+        )
+    )
+
+);
+

application/Espo/Core/Utils/Database/Schema/tables/importEntity.php

@@ -0,0 +1,67 @@
+<?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/.
+ ************************************************************************/
+
+return array(
+
+    'ImportEntity' => array(
+        'fields' => array(
+            'id' => array(
+                'type' => 'id',
+                'dbType' => 'int',
+                'len' => '11',
+                'autoincrement' => true,
+                'unique' => true
+            ),
+            'entityId' => array(
+                'type' => 'varchar',
+                'len' => '24',
+                'index' => 'entity'
+            ),
+            'entityType' => array(
+                'type' => 'varchar',
+                'len' => '100',
+                'index' => 'entity'
+            ),
+            'importId' => array(
+                'type' => 'varchar',
+                'len' => '24',
+                'index' => true
+            ),
+            'isImported' => array(
+                'type' => 'bool'
+            ),
+            'isUpdated' => array(
+                'type' => 'bool'
+            ),
+            'isDuplicate' => array(
+                'type' => 'bool'
+            ),
+        ),
+        "indexes" => array(
+            "entityImport" => array(
+                "columns" => ["importId", "entityType"]
+            )
+        )
+    ),
+
+);
+

application/Espo/Core/Utils/DateTime.php

@@ -25,42 +25,56 @@ namespace Espo\Core\Utils;
 class DateTime
 {
     protected $dataFormat;
-    
+
     protected $timeFormat;
-    
+
     protected $timezone;
-    
+
+    protected $internalDateTimeFormat = 'Y-m-d H:i:s';
+
+    protected $internalDateFormat = 'Y-m-d';
+
     protected $dateFormats = array(
         'MM/DD/YYYY' => 'm/d/Y',
         'YYYY-MM-DD' => 'Y-m-d',
         'DD.MM.YYYY' => 'd.m.Y',
     );
-    
+
     protected $timeFormats = array(
         'HH:mm' => 'H:i',
         'hh:mm A' => 'h:i A',
         'hh:mm a' => 'h:ia',
         'hh:mmA' => 'h:iA',
     );
-    
+
     public function __construct($dateFormat = 'YYYY-MM-DD', $timeFormat = 'HH:mm', $timeZone = 'UTC')
     {
         $this->dateFormat = $dateFormat;
         $this->timeFormat = $timeFormat;
-        
+
         $this->timezone = new \DateTimeZone($timeZone);
     }
-    
+
+    public function getInternalDateTimeFormat()
+    {
+        return $this->internalDateTimeFormat;
+    }
+
+    public function getInternalDateFormat()
+    {
+        return $this->internalDateFormat;
+    }
+
     protected function getPhpDateFormat()
     {
         return $this->dateFormats[$this->dateFormat];
     }
-    
+
     protected function getPhpDateTimeFormat()
     {
         return $this->dateFormats[$this->dateFormat] . ' ' . $this->timeFormats[$this->timeFormat];
     }
-    
+
     public function convertSystemDateToGlobal($string)
     {
         $dateTime = \DateTime::createFromFormat('Y-m-d', $string);
@@ -69,7 +83,7 @@ class DateTime
         }
         return null;
     }
-    
+
     public function convertSystemDateTimeToGlobal($string)
     {
         $dateTime = \DateTime::createFromFormat('Y-m-d H:i:s', $string);

application/Espo/Core/Utils/EntityManager.php

@@ -35,7 +35,7 @@ class EntityManager
 
     private $fileManager;
 
-    private $metadataUtils;
+    private $metadataHelper;
 
     public function __construct(Metadata $metadata, Language $language, File\Manager $fileManager)
     {
@@ -43,7 +43,7 @@ class EntityManager
         $this->language = $language;
         $this->fileManager = $fileManager;
 
-        $this->metadataUtils = new \Espo\Core\Utils\Metadata\Utils($this->metadata);
+        $this->metadataHelper = new \Espo\Core\Utils\Metadata\Helper($this->metadata);
     }
 
     protected function getMetadata()
@@ -61,9 +61,9 @@ class EntityManager
         return $this->fileManager;
     }
 
-    protected function getMetadataUtils()
+    protected function getMetadataHelper()
     {
-        return $this->metadataUtils;
+        return $this->metadataHelper;
     }
 
     public function create($name, $type, $params = array())
@@ -77,33 +77,34 @@ class EntityManager
 
         $normalizedName = Util::normilizeClassName($name);
 
-        $contents = "<" . "?" . "php\n".
-            "namespace Espo\Custom\Entities;\n".
+        $contents = "<" . "?" . "php\n\n".
+            "namespace Espo\Custom\Entities;\n\n".
             "class {$normalizedName} extends \Espo\Core\Templates\Entities\\{$type}\n".
             "{\n".
+            "    protected \$entityType = \"$name\";\n".
             "}\n";
 
         $filePath = "custom/Espo/Custom/Entities/{$normalizedName}.php";
         $this->getFileManager()->putContents($filePath, $contents);
 
-        $contents = "<" . "?" . "php\n".
-            "namespace Espo\Custom\Controllers;\n".
+        $contents = "<" . "?" . "php\n\n".
+            "namespace Espo\Custom\Controllers;\n\n".
             "class {$normalizedName} extends \Espo\Core\Templates\Controllers\\{$type}\n".
             "{\n".
             "}\n";
         $filePath = "custom/Espo/Custom/Controllers/{$normalizedName}.php";
         $this->getFileManager()->putContents($filePath, $contents);
 
-        $contents = "<" . "?" . "php\n".
-            "namespace Espo\Custom\Services;\n".
+        $contents = "<" . "?" . "php\n\n".
+            "namespace Espo\Custom\Services;\n\n".
             "class {$normalizedName} extends \Espo\Core\Templates\Services\\{$type}\n".
             "{\n".
             "}\n";
         $filePath = "custom/Espo/Custom/Services/{$normalizedName}.php";
         $this->getFileManager()->putContents($filePath, $contents);
 
-        $contents = "<" . "?" . "php\n".
-            "namespace Espo\Custom\Repositories;\n".
+        $contents = "<" . "?" . "php\n\n".
+            "namespace Espo\Custom\Repositories;\n\n".
             "class {$normalizedName} extends \Espo\Core\Templates\Repositories\\{$type}\n".
             "{\n".
             "}\n";
@@ -125,26 +126,28 @@ class EntityManager
         }
         $labelCreate = $this->getLanguage()->translate('Create') . ' ' . $labelSingular;
 
-        $scopeData = array(
-            'entity' => true,
-            'layouts' => true,
-            'tab' => true,
-            'acl' => true,
-            'module' => 'Custom',
-            'isCustom' => true,
-            'customizable' => true,
-            'importable' => true,
-            'type' => $type,
-            'stream' => $stream
-        );
-        $this->getMetadata()->set('scopes', $name, $scopeData);
+        $filePath = "application/Espo/Core/Templates/Metadata/{$type}/scopes.json";
+        $scopesDataContents = $this->getFileManager()->getContents($filePath);
+        $scopesDataContents = str_replace('{entityType}', $name, $scopesDataContents);
+        $scopesData = Json::decode($scopesDataContents, true);
+
+        $scopesData['stream'] = $stream;
+        $scopesData['type'] = $type;
+        $scopesData['module'] = 'Custom';
+        $scopesData['isCustom'] = true;
+
+        $this->getMetadata()->set('scopes', $name, $scopesData);
 
         $filePath = "application/Espo/Core/Templates/Metadata/{$type}/entityDefs.json";
-        $entityDefsData = Json::decode($this->getFileManager()->getContents($filePath), true);
+        $entityDefsDataContents = $this->getFileManager()->getContents($filePath);
+        $entityDefsDataContents = str_replace('{entityType}', $name, $entityDefsDataContents);
+        $entityDefsData = Json::decode($entityDefsDataContents, true);
         $this->getMetadata()->set('entityDefs', $name, $entityDefsData);
 
         $filePath = "application/Espo/Core/Templates/Metadata/{$type}/clientDefs.json";
-        $clientDefsData = Json::decode($this->getFileManager()->getContents($filePath), true);
+        $clientDefsContents = $this->getFileManager()->getContents($filePath);
+        $clientDefsContents = str_replace('{entityType}', $name, $clientDefsContents);
+        $clientDefsData = Json::decode($clientDefsContents, true);
         $this->getMetadata()->set('clientDefs', $name, $clientDefsData);
 
         $this->getLanguage()->set('Global', 'scopeNames', $name, $labelSingular);
@@ -154,6 +157,11 @@ class EntityManager
         $this->getMetadata()->save();
         $this->getLanguage()->save();
 
+        $layoutsPath = "application/Espo/Core/Templates/Layouts/{$type}";
+        if ($this->getFileManager()->isDir($layoutsPath)) {
+            $this->getFileManager()->copy($layoutsPath, 'custom/Espo/Custom/Resources/layouts/' . $name);
+        }
+
         return true;
     }
 
@@ -182,6 +190,16 @@ class EntityManager
             $this->getLanguage()->set('Global', 'scopeNamesPlural', $name, $labelPlural);
         }
 
+        if (isset($data['sortBy'])) {
+            $entityDefsData = array(
+                'collection' => array(
+                    'sortBy' => $data['sortBy'],
+                    'asc' => !empty($data['asc'])
+                )
+            );
+            $this->getMetadata()->set('entityDefs', $name, $entityDefsData);
+        }
+
         $this->getMetadata()->save();
         $this->getLanguage()->save();
 
@@ -341,6 +359,10 @@ class EntityManager
                         )
                     )
                 );
+                if ($entityForeign == $entity) {
+                    $dataLeft['links'][$link]['midKeys'] = ['leftId', 'rightId'];
+                    $dataRight['links'][$linkForeign]['midKeys'] = ['rightId', 'leftId'];
+                }
                 break;
         }
 

application/Espo/Core/Utils/FieldManager.php

@@ -31,7 +31,7 @@ class FieldManager
 
     private $language;
 
-    private $metadataUtils;
+    private $metadataHelper;
 
     protected $isChanged = null;
 
@@ -44,7 +44,7 @@ class FieldManager
         $this->metadata = $metadata;
         $this->language = $language;
 
-        $this->metadataUtils = new \Espo\Core\Utils\Metadata\Utils($this->metadata);
+        $this->metadataHelper = new \Espo\Core\Utils\Metadata\Helper($this->metadata);
     }
 
     protected function getMetadata()
@@ -57,9 +57,9 @@ class FieldManager
         return $this->language;
     }
 
-    protected function getMetadataUtils()
+    protected function getMetadataHelper()
     {
-        return $this->metadataUtils;
+        return $this->metadataHelper;
     }
 
     public function read($name, $scope)
@@ -187,11 +187,6 @@ class FieldManager
             }
         }
 
-        if (isset($fieldDef['linkDefs'])) {
-            $linkDefs = $fieldDef['linkDefs'];
-            unset($fieldDef['linkDefs']);
-        }
-
         $currentOptionList = array_keys((array) $this->getFieldDef($name, $scope));
         foreach ($fieldDef as $defName => $defValue) {
             if ( (!isset($defValue) || $defValue === '') && !in_array($defName, $currentOptionList) ) {
@@ -214,11 +209,16 @@ class FieldManager
     {
         $fieldDef = $this->prepareFieldDef($fieldName, $fieldDef, $scope);
 
-        $metaFieldDef = $this->getMetadataUtils()->getFieldDefsInFieldMeta($fieldDef);
+        $metaFieldDef = $this->getMetadataHelper()->getFieldDefsInFieldMeta($fieldDef);
         if (isset($metaFieldDef)) {
             $fieldDef = Util::merge($metaFieldDef, $fieldDef);
         }
 
+        if (isset($fieldDef['linkDefs'])) {
+            $linkDefs = $fieldDef['linkDefs'];
+            unset($fieldDef['linkDefs']);
+        }
+
         $defs = array(
             'fields' => array(
                 $fieldName => $fieldDef,
@@ -226,7 +226,7 @@ class FieldManager
         );
 
         /** Save links for a field. */
-        $metaLinkDef = $this->getMetadataUtils()->getLinkDefsInFieldMeta($scope, $fieldDef);
+        $metaLinkDef = $this->getMetadataHelper()->getLinkDefsInFieldMeta($scope, $fieldDef);
         if (isset($linkDefs) || isset($metaLinkDef)) {
             $linkDefs = Util::merge((array) $metaLinkDef, (array) $linkDefs);
             $defs['links'] = array(

application/Espo/Core/Utils/File/FileUnifier.php

@@ -28,10 +28,12 @@ use Espo\Core\Utils\Json;
 class FileUnifier
 {
     private $fileManager;
+    private $metadata;
 
-    public function __construct(\Espo\Core\Utils\File\Manager $fileManager)
+    public function __construct(\Espo\Core\Utils\File\Manager $fileManager, \Espo\Core\Utils\Metadata $metadata = null)
     {
         $this->fileManager = $fileManager;
+        $this->metadata = $metadata;
     }
 
     protected function getFileManager()
@@ -39,6 +41,11 @@ class FileUnifier
         return $this->fileManager;
     }
 
+    protected function getMetadata()
+    {
+        return $this->metadata;
+    }
+
     /**
      * Unite files content
      *
@@ -53,7 +60,7 @@ class FileUnifier
 
         if (!empty($paths['modulePath'])) {
             $moduleDir = strstr($paths['modulePath'], '{*}', true);
-            $moduleList = $this->getFileManager()->getFileList($moduleDir, false, '', false);
+            $moduleList = isset($this->metadata) ? $this->getMetadata()->getModuleList() : $this->getFileManager()->getFileList($moduleDir, false, '', false);
 
             foreach ($moduleList as $moduleName) {
                 $moduleFilePath = str_replace('{*}', $moduleName, $paths['modulePath']);

application/Espo/Core/Utils/File/Manager.php

@@ -62,12 +62,14 @@ class Manager
      */
     public function getFileList($path, $recursively = false, $filter = '', $onlyFileType = null, $isReturnSingleArray = false)
     {
-        if (!file_exists($path)) {
-            return false;
-        }
+        $path = $this->concatPaths($path);
 
         $result = array();
 
+        if (!file_exists($path) || !is_dir($path)) {
+            return $result;
+        }
+
         $cdir = scandir($path);
         foreach ($cdir as $key => $value)
         {
@@ -203,7 +205,7 @@ class Manager
         $fullPath = $this->concatPaths($path); //todo remove after changing the params
 
         if ($this->checkCreateFile($fullPath) === false) {
-            throw new Error('Permission denied in '. $fullPath);
+            throw new Error('Permission denied for '. $fullPath);
         }
 
         $res = (file_put_contents($fullPath, $data, $flags, $context) !== FALSE);
@@ -240,7 +242,7 @@ class Manager
     public function putContentsJson($path, $data)
     {
         if (!Utils\Json::isJSON($data)) {
-            $data = Utils\Json::encode($data, JSON_PRETTY_PRINT);
+            $data = Utils\Json::encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
         }
 
         return $this->putContents($path, $data, LOCK_EX);
@@ -281,7 +283,7 @@ class Manager
         $data = Utils\Util::merge($savedDataArray, $newDataArray);
 
         if ($isReturnJson) {
-            $data = Utils\Json::encode($data, JSON_PRETTY_PRINT);
+            $data = Utils\Json::encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
         }
 
         if ($isPhp) {
@@ -373,9 +375,11 @@ class Manager
      *
      * @param  string | array $path
      * @param  int $permission - ex. 0755
+     * @param  bool $recursive
+     *
      * @return bool
      */
-    public function mkdir($path, $permission = null)
+    public function mkdir($path, $permission = null, $recursive = false)
     {
         $fullPath = $this->concatPaths($path);
 
@@ -383,14 +387,23 @@ class Manager
             return true;
         }
 
+        $defaultPermissions = $this->getPermissionUtils()->getDefaultPermissions();
+
         if (!isset($permission)) {
-            $defaultPermissions = $this->getPermissionUtils()->getDefaultPermissions();
             $permission = (string) $defaultPermissions['dir'];
             $permission = base_convert($permission, 8, 10);
         }
 
         try {
             $result = mkdir($fullPath, $permission, true);
+
+            if (!empty($defaultPermissions['user'])) {
+                $this->getPermissionUtils()->chown($fullPath);
+            }
+
+            if (!empty($defaultPermissions['group'])) {
+                $this->getPermissionUtils()->chgrp($fullPath);
+            }
         } catch (\Exception $e) {
             $GLOBALS['log']->critical('Permission denied: unable to create the folder on the server - '.$fullPath);
         }
@@ -446,7 +459,7 @@ class Manager
 
         if (!empty($permissionDeniedList)) {
             $betterPermissionList = $this->getPermissionUtils()->arrangePermissionList($permissionDeniedList);
-            throw new Error("Permission denied in <br>". implode(", <br>", $betterPermissionList));
+            throw new Error("Permission denied for <br>". implode(", <br>", $betterPermissionList));
         }
 
         $res = true;
@@ -459,7 +472,7 @@ class Manager
             $sourceFile = is_file($sourcePath) ? $sourcePath : $this->concatPaths(array($sourcePath, $file));
             $destFile = $this->concatPaths(array($destPath, $file));
 
-            if (file_exists($sourceFile)) {
+            if (file_exists($sourceFile) && is_file($sourceFile)) {
                 $res &= copy($sourceFile, $destFile);
             }
         }
@@ -473,7 +486,7 @@ class Manager
      * @param string $filePath
      * @return string
      */
-    protected function checkCreateFile($filePath)
+    public function checkCreateFile($filePath)
     {
         $defaultPermissions = $this->getPermissionUtils()->getDefaultPermissions();
 
@@ -490,8 +503,8 @@ class Manager
             $dirPermission = $defaultPermissions['dir'];
             $dirPermission = is_string($dirPermission) ? base_convert($dirPermission,8,10) : $dirPermission;
 
-            if (!mkdir($pathParts['dirname'], $dirPermission, true)) {
-                throw new Error('Permission denied: unable to create a folder on the server - '.$pathParts['dirname']);
+            if (!$this->mkdir($pathParts['dirname'], $dirPermission, true)) {
+                throw new Error('Permission denied: unable to create a folder on the server - ' . $pathParts['dirname']);
             }
         }
 
@@ -615,7 +628,7 @@ class Manager
 
         if (!empty($permissionDeniedList)) {
             $betterPermissionList = $this->getPermissionUtils()->arrangePermissionList($permissionDeniedList);
-            throw new Error("Permission denied in <br>". implode(", <br>", $betterPermissionList));
+            throw new Error("Permission denied for <br>". implode(", <br>", $betterPermissionList));
         }
 
         $result = true;
@@ -656,6 +669,17 @@ class Manager
         return (bool) $res;
     }
 
+    /**
+     * Check if $dirname is directory.
+     *
+     * @param  string  $dirname
+     * @return boolean
+     */
+    public function isDir($dirname)
+    {
+        return is_dir($dirname);
+    }
+
     /**
      * Check if $filename is file. If $filename doesn'ot exist, check by pathinfo
      *

application/Espo/Core/Utils/File/Permission.php

@@ -92,7 +92,6 @@ class Permission
         return $this->params;
     }
 
-
     /**
      * Get default settings
      *
@@ -137,7 +136,6 @@ class Permission
         return $result;
     }
 
-
     /**
      * Get current permissions
      *
@@ -216,7 +214,6 @@ class Permission
         return $this->chmodRecurse($path, $permission['file'], $permission['dir']);
     }
 
-
     /**
      * Change permissions recursive
      *
@@ -232,27 +229,20 @@ class Permission
             return false;
         }
 
-        if (is_file($path)) {
+        if (!is_dir($path)) {
             return $this->chmodReal($path, $fileOctal);
         }
 
-        if (is_dir($path)) {
-            $allFiles = $this->getFileManager()->getFileList($path);
+        $result = $this->chmodReal($path, $dirOctal);
 
-            foreach ($items as $item) {
-                $this->chmodRecurse($path. Utils\Util::getSeparator() .$item, $fileOctal, $dirOctal);
-            }
-
-            return $this->chmodReal($path, $dirOctal);
+        $allFiles = $this->getFileManager()->getFileList($path);
+        foreach ($allFiles as $item) {
+            $result &= $this->chmodRecurse($path . Utils\Util::getSeparator() . $item, $fileOctal, $dirOctal);
         }
 
-        return false;
+        return (bool) $result;
     }
 
-
-
-
-
     /**
      * Change owner permission
      *
@@ -262,7 +252,7 @@ class Permission
      *
      * @return bool
      */
-    public function chown($path, $user='', $recurse=false)
+    public function chown($path, $user = '', $recurse = false)
     {
         if (!file_exists($path)) {
             return false;
@@ -295,13 +285,18 @@ class Permission
             return false;
         }
 
-        $allFiles = $this->getFileManager()->getFileList($path);
-
-        foreach ($items as $item) {
-            $this->chownRecurse($path. Utils\Util::getSeparator() .$item, $user);
+        if (!is_dir($path)) {
+            return $this->chownReal($path, $user);
         }
 
-        return $this->chownReal($path, $user);
+        $result = $this->chownReal($path, $user);
+
+        $allFiles = $this->getFileManager()->getFileList($path);
+        foreach ($allFiles as $item) {
+            $result &= $this->chownRecurse($path . Utils\Util::getSeparator() . $item, $user);
+        }
+
+        return (bool) $result;
     }
 
     /**
@@ -347,15 +342,19 @@ class Permission
             return false;
         }
 
-        $allFiles = $this->getFileManager()->getFileList($path);
-
-        foreach ($items as $item) {
-            $this->chgrpRecurse($path. Utils\Util::getSeparator() .$item, $group);
+        if (!is_dir($path)) {
+            return $this->chgrpReal($path, $group);
         }
 
-        return $this->chgrpReal($path, $group);
-    }
+        $result = $this->chgrpReal($path, $group);
 
+        $allFiles = $this->getFileManager()->getFileList($path);
+        foreach ($allFiles as $item) {
+            $result &= $this->chgrpRecurse($path . Utils\Util::getSeparator() . $item, $group);
+        }
+
+        return (bool) $result;
+    }
 
     /**
      * Change permissions recursive

application/Espo/Core/Utils/File/Unifier.php

@@ -27,15 +27,17 @@ use Espo\Core\Utils;
 class Unifier
 {
     private $fileManager;
+    private $metadata;
 
     protected $params = array(
         'unsetFileName' => 'unset.json',
         'defaultsPath' => 'application/Espo/Core/defaults',
     );
 
-    public function __construct(\Espo\Core\Utils\File\Manager $fileManager)
+    public function __construct(\Espo\Core\Utils\File\Manager $fileManager, \Espo\Core\Utils\Metadata $metadata = null)
     {
         $this->fileManager = $fileManager;
+        $this->metadata = $metadata;
     }
 
     protected function getFileManager()
@@ -43,6 +45,11 @@ class Unifier
         return $this->fileManager;
     }
 
+    protected function getMetadata()
+    {
+        return $this->metadata;
+    }
+
     /**
      * Unite file content to the file
      *
@@ -58,11 +65,12 @@ class Unifier
 
         if (!empty($paths['modulePath'])) {
             $customDir = strstr($paths['modulePath'], '{*}', true);
-            $dirList = $this->getFileManager()->getFileList($customDir, false, '', false);
 
-            foreach ($dirList as $dirName) {
-                $curPath = str_replace('{*}', $dirName, $paths['modulePath']);
-                $content = Utils\Util::merge($content, $this->unifySingle($curPath, $name, $recursively, $dirName));
+            $moduleList = isset($this->metadata) ? $this->getMetadata()->getModuleList() : $this->getFileManager()->getFileList($customDir, false, '', false);
+
+            foreach ($moduleList as $moduleName) {
+                $curPath = str_replace('{*}', $moduleName, $paths['modulePath']);
+                $content = Utils\Util::merge($content, $this->unifySingle($curPath, $name, $recursively, $moduleName));
             }
         }
 

application/Espo/Core/Utils/Language.php

@@ -30,6 +30,7 @@ class Language
 {
     private $fileManager;
     private $config;
+    private $metadata;
     private $preferences;
     private $unifier;
 
@@ -62,13 +63,14 @@ class Language
     );
 
 
-    public function __construct(\Espo\Core\Utils\File\Manager $fileManager, \Espo\Core\Utils\Config $config, \Espo\Entities\Preferences $preferences = null)
+    public function __construct(File\Manager $fileManager, Config $config, Metadata $metadata, \Espo\Entities\Preferences $preferences = null)
     {
         $this->fileManager = $fileManager;
         $this->config = $config;
+        $this->metadata = $metadata;
         $this->preferences = $preferences;
 
-        $this->unifier = new \Espo\Core\Utils\File\Unifier($this->fileManager);
+        $this->unifier = new \Espo\Core\Utils\File\Unifier($this->fileManager, $this->metadata);
     }
 
     protected function getFileManager()
@@ -81,6 +83,11 @@ class Language
         return $this->config;
     }
 
+    protected function getMetadata()
+    {
+        return $this->metadata;
+    }
+
     protected function getPreferences()
     {
         return $this->preferences;
@@ -163,7 +170,7 @@ class Language
         return $translated;
     }
 
-    public function translateOption($value, $field, $scope)
+    public function translateOption($value, $field, $scope = 'Global')
     {
         $options = $this->get($scope. '.options.' . $field);
         if (array_key_exists($value, $options)) {

application/Espo/Core/Utils/Layout.php

@@ -136,7 +136,7 @@ class Layout
                     }
 
                     $layoutPath = $this->getLayoutPath($controllerName, true);
-                    $data = Json::encode($layoutData);
+                    $data = Json::encode($layoutData, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
 
                     $result &= $this->getFileManager()->putContents(array($layoutPath, $layoutName.'.json'), $data);
                 }

application/Espo/Core/Utils/Log/Monolog/Handler/StreamHandler.php

@@ -51,9 +51,15 @@ class StreamHandler extends \Monolog\Handler\StreamHandler
 
         $this->errorMessage = null;
 
-        set_error_handler(array($this, 'customErrorHandler'));
-        $this->getFileManager()->appendContents($this->url, $this->pruneMessage($record));
-        restore_error_handler();
+        if (!is_writable($this->url)) {
+            $this->getFileManager()->checkCreateFile($this->url);
+        }
+
+        if (is_writable($this->url)) {
+            set_error_handler(array($this, 'customErrorHandler'));
+            $this->getFileManager()->appendContents($this->url, $this->pruneMessage($record));
+            restore_error_handler();
+        }
 
         if (isset($this->errorMessage)) {
             throw new \UnexpectedValueException(sprintf('The stream or file "%s" could not be opened: '.$this->errorMessage, $this->url));

application/Espo/Core/Utils/Metadata.php

@@ -28,13 +28,12 @@ class Metadata
 {
     protected $meta = null;
 
-    protected $scopes = array();
-
     private $config;
     private $unifier;
     private $fileManager;
     private $converter;
     private $moduleConfig;
+    private $metadataHelper;
 
     /**
      * @var string - uses for loading default values
@@ -76,12 +75,6 @@ class Metadata
     {
         $this->config = $config;
         $this->fileManager = $fileManager;
-
-        $this->unifier = new \Espo\Core\Utils\File\Unifier($this->fileManager);
-
-        $this->converter = new \Espo\Core\Utils\Database\Converter($this, $this->fileManager);
-
-        $this->moduleConfig = new \Espo\Core\Utils\Module($this->config, $this->fileManager);
     }
 
     protected function getConfig()
@@ -89,26 +82,47 @@ class Metadata
         return $this->config;
     }
 
-    protected function getUnifier()
-    {
-        return $this->unifier;
-    }
-
     protected function getFileManager()
     {
         return $this->fileManager;
     }
 
+    protected function getUnifier()
+    {
+        if (!isset($this->unifier)) {
+            $this->unifier = new \Espo\Core\Utils\File\Unifier($this->fileManager, $this);
+        }
+
+        return $this->unifier;
+    }
+
     protected function getConverter()
     {
+        if (!isset($this->converter)) {
+            $this->converter = new \Espo\Core\Utils\Database\Converter($this, $this->fileManager);
+        }
+
         return $this->converter;
     }
 
     protected function getModuleConfig()
     {
+        if (!isset($this->moduleConfig)) {
+            $this->moduleConfig = new \Espo\Core\Utils\Module($this->config, $this->fileManager);
+        }
+
         return $this->moduleConfig;
     }
 
+    protected function getMetadataHelper()
+    {
+        if (!isset($this->metadataHelper)) {
+            $this->metadataHelper = new Metadata\Helper($this);
+        }
+
+        return $this->metadataHelper;
+    }
+
     public function isCached()
     {
         if (!$this->getConfig()->get('useCache')) {
@@ -137,8 +151,10 @@ class Metadata
         if (file_exists($this->cacheFile) && !$reload) {
             $this->meta = $this->getFileManager()->getPhpContents($this->cacheFile);
         } else {
+            $this->clearVars();
             $this->meta = $this->getUnifier()->unify($this->name, $this->paths, true);
             $this->meta = $this->setLanguageFromConfig($this->meta);
+            $this->meta = $this->addAdditionalFields($this->meta);
 
             if ($this->getConfig()->get('useCache')) {
                 $isSaved = $this->getFileManager()->putPhpContents($this->cacheFile, $this->meta);
@@ -197,6 +213,7 @@ class Metadata
     }
 
     /**
+     * todo: move to a separate file
      * Set language list and default for Settings, Preferences metadata
      *
      * @param array $data Meta
@@ -222,6 +239,37 @@ class Metadata
         return $data;
     }
 
+    /**
+     * todo: move to a separate file
+     * Add additional fields defined from metadata -> fields
+     *
+     * @param array $meta
+     */
+    protected function addAdditionalFields(array $meta)
+    {
+        $metaCopy = $meta;
+        $definitionList = $meta['fields'];
+
+        foreach ($metaCopy['entityDefs'] as $entityName => $entityParams) {
+            foreach ($entityParams['fields'] as $fieldName => $fieldParams) {
+
+                $additionalFields = $this->getMetadataHelper()->getAdditionalFieldList($fieldName, $fieldParams, $definitionList);
+                if (!empty($additionalFields)) {
+                    //merge or add to the end of meta array
+                    foreach ($additionalFields as $subFieldName => $subFieldParams) {
+                        if (isset($entityParams['fields'][$subFieldName])) {
+                            $meta['entityDefs'][$entityName]['fields'][$subFieldName] = Util::merge($subFieldParams, $entityParams['fields'][$subFieldName]);
+                        } else {
+                            $meta['entityDefs'][$entityName]['fields'][$subFieldName] = $subFieldParams;
+                        }
+                    }
+                }
+            }
+        }
+
+        return $meta;
+    }
+
     /**
     * Set Metadata data
     * Ex. $key1 = menu, $key2 = Account then will be created a file metadataFolder/menu/Account.json
@@ -482,4 +530,16 @@ class Metadata
 
         return $path;
     }
+
+    /**
+     * Clear metadata variables when reload meta
+     *
+     * @return void
+     */
+    protected function clearVars()
+    {
+        $this->meta = null;
+        $this->moduleList = null;
+        $this->ormMeta = null;
+    }
 }

application/Espo/Core/Utils/Metadata/Helper.php

@@ -22,10 +22,26 @@
 
 namespace Espo\Core\Utils\Metadata;
 
-class Utils
+use Espo\Core\Utils\Util;
+
+class Helper
 {
     private $metadata;
 
+    protected $defaultNaming = 'postfix';
+
+    /**
+     * List of copied params for metadata -> 'fields' from parent items
+     */
+    protected $copiedDefParams = array(
+        'readOnly',
+        'notStorable',
+        'layoutListDisabled',
+        'layoutDetailDisabled',
+        'layoutMassUpdateDisabled',
+        'layoutFiltersDisabled',
+    );
+
     public function __construct(\Espo\Core\Utils\Metadata $metadata)
     {
         $this->metadata = $metadata;
@@ -102,7 +118,41 @@ class Utils
         return $linkFieldDefsByType;
     }
 
-}
+    /**
+     * Get additional field list based on field definition in metadata 'fields'
+     *
+     * @param  string     $fieldName
+     * @param  array     $fieldParams
+     * @param  array|null $definitionList
+     *
+     * @return array
+     */
+    public function getAdditionalFieldList($fieldName, array $fieldParams, array $definitionList = null)
+    {
+        if (empty($fieldParams['type'])) {
+            return;
+        }
 
+        $fieldType = $fieldParams['type'];
+        $fieldDefinition = isset($definitionList[$fieldType]) ? $definitionList[$fieldType] : $this->getMetadata()->get('fields.'.$fieldType);
 
-?>
+        if (!empty($fieldDefinition['fields']) && is_array($fieldDefinition['fields'])) {
+
+            $copiedParams = array_intersect_key($fieldParams, array_flip($this->copiedDefParams));
+
+            $additionalFields = array();
+
+            //add additional fields
+            foreach ($fieldDefinition['fields'] as $subFieldName => $subFieldParams) {
+                $namingType = isset($fieldDefinition['naming']) ? $fieldDefinition['naming'] : $this->defaultNaming;
+
+                $subFieldNaming = Util::getNaming($fieldName, $subFieldName, $namingType);
+                $additionalFields[$subFieldNaming] = array_merge($copiedParams, $subFieldParams);
+            }
+
+            return $additionalFields;
+        }
+
+    }
+
+}

application/Espo/Core/Utils/Util.php

@@ -186,19 +186,25 @@ class Util
      */
     public static function unsetInArrayByValue($needle, array $haystack, $reIndex = true)
     {
+        $doReindex = false;
+
         foreach($haystack as $key => $value) {
             if (is_array($value)) {
                 $haystack[$key] = static::unsetInArrayByValue($needle, $value);
             } else if ($needle === $value) {
 
+                unset($haystack[$key]);
+
                 if ($reIndex) {
-                    array_splice($haystack, $key, 1);
-                } else {
-                    unset($haystack[$key]);
+                    $doReindex = true;
                 }
             }
         }
 
+        if ($doReindex) {
+            $haystack = array_values($haystack);
+        }
+
         return $haystack;
     }
 
@@ -510,6 +516,11 @@ class Util
         return true;
     }
 
+    public static function generateId()
+    {
+        return uniqid() . substr(md5(rand()), 0, 4);
+    }
+
 }