v

* Fix escape symbols in translations

Signed-off-by: Felix Kaechele <felix@kaechele.ca>

* Update German translation

Signed-off-by: Felix Kaechele <felix@kaechele.ca>

.gitignore

@@ -14,7 +14,9 @@
 /client/css/sakura-vertical.css
 /client/css/violet.css
 /client/css/violet-vertical.css
-/tests/testData/cache/*
+/tests/unit/testData/cache/*
+!/tests/unit/testData/cache/.data
+/tests/integration/config.php
 composer.phar
 vendor/
 /custom/Espo/Custom/*

README.md

@@ -8,14 +8,14 @@ Download the latest release from our [website](http://www.espocrm.com).
 
 ### Requirements
 
-* PHP 5.4 or above (with pdo, json, gd, mcrypt extensions);
+* PHP 5.5 or above (with pdo, json, gd, mcrypt extensions);
 * MySQL 5.1 or above.
 
 For more information about server configuration see [this article](http://blog.espocrm.com/administration/server-configuration-for-espocrm/).
 
 ### How to report bug
 
-Create an issue [here](https://github.com/espocrm/espocrm/issues) or post on our [forum](http://forum.espocrm.com/bug-reports?routestring=forum/bug-reports).
+Create an issue [here](https://github.com/espocrm/espocrm/issues) or post on our [forum](http://forum.espocrm.com/forum/bug-reports).
 
 ### How to get started (for developers)
 

application/Espo/Acl/Attachment.php

@@ -29,12 +29,12 @@
 
 namespace Espo\Acl;
 
-use \Espo\Entities\User;
+use \Espo\Entities\User as EntityUser;
 use \Espo\ORM\Entity;
 
 class Attachment extends \Espo\Core\Acl\Base
 {
-    public function checkEntityRead(User $user, Entity $entity, $data)
+    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
     {
         if ($user->isAdmin()) {
             return true;
@@ -82,7 +82,7 @@ class Attachment extends \Espo\Core\Acl\Base
         return false;
     }
 
-    public function checkIsOwner(User $user, Entity $entity)
+    public function checkIsOwner(EntityUser $user, Entity $entity)
     {
         if ($user->id === $entity->get('createdById')) {
             return true;

application/Espo/Acl/Email.php

@@ -29,13 +29,13 @@
 
 namespace Espo\Acl;
 
-use \Espo\Entities\User;
+use \Espo\Entities\User as EntityUser;
 use \Espo\ORM\Entity;
 
 class Email extends \Espo\Core\Acl\Base
 {
 
-    public function checkEntityRead(User $user, Entity $entity, $data)
+    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
     {
         if ($this->checkEntity($user, $entity, $data, 'read')) {
             return true;
@@ -60,7 +60,7 @@ class Email extends \Espo\Core\Acl\Base
         return false;
     }
 
-    public function checkIsOwner(User $user, Entity $entity)
+    public function checkIsOwner(EntityUser $user, Entity $entity)
     {
         if ($user->id === $entity->get('assignedUserId')) {
             return true;
@@ -76,5 +76,46 @@ class Email extends \Espo\Core\Acl\Base
 
         return false;
     }
+
+    public function checkEntityDelete(EntityUser $user, Entity $entity, $data)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+
+        if ($data === false) {
+            return false;
+        }
+
+        if ($data->delete === 'own') {
+            if ($user->id === $entity->get('assignedUserId')) {
+                return true;
+            }
+
+            if ($user->id === $entity->get('createdById')) {
+                return true;
+            }
+
+            $assignedUserIdList = $entity->getLinkMultipleIdList('assignedUsers');
+            if (count($assignedUserIdList) === 1 && $entity->hasLinkMultipleId('assignedUsers', $user->id)) {
+                return true;
+            }
+            return false;
+        }
+
+        if ($this->checkEntity($user, $entity, $data, 'delete')) {
+            return true;
+        }
+
+        if ($data->edit !== 'no' || $data->create !== 'no') {
+            if ($entity->get('createdById') === $user->id) {
+                if ($entity->get('status') !== 'Sent' && $entity->get('status') !== 'Archived') {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
 }
 

application/Espo/Acl/EmailFilter.php

@@ -29,12 +29,12 @@
 
 namespace Espo\Acl;
 
-use \Espo\Entities\User;
+use \Espo\Entities\User as EntityUser;
 use \Espo\ORM\Entity;
 
 class EmailFilter extends \Espo\Core\Acl\Base
 {
-    public function checkIsOwner(User $user, Entity $entity)
+    public function checkIsOwner(EntityUser $user, Entity $entity)
     {
         if ($entity->has('parentId') && $entity->has('parentType')) {
             $parentType = $entity->get('parentType');
@@ -42,11 +42,14 @@ class EmailFilter extends \Espo\Core\Acl\Base
             if (!$parentType || !$parentId) return;
 
             $parent = $this->getEntityManager()->getEntity($parentType, $parentId);
+
+            if ($parent->getEntityType() === 'User') {
+                return $parent->id === $user->id;
+            }
             if ($parent && $parent->has('assignedUserId') && $parent->get('assignedUserId') === $user->id) {
                 return true;
             }
         }
-
         return;
     }
 }

application/Espo/Acl/Notification.php

@@ -29,12 +29,12 @@
 
 namespace Espo\Acl;
 
-use \Espo\Entities\User;
+use \Espo\Entities\User as EntityUser;
 use \Espo\ORM\Entity;
 
 class Notification extends \Espo\Core\Acl\Base
 {
-    public function checkIsOwner(User $user, Entity $entity)
+    public function checkIsOwner(EntityUser $user, Entity $entity)
     {
         if ($user->id === $entity->get('userId')) {
             return true;

application/Espo/Acl/Team.php

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

application/Espo/AclPortal/Attachment.php

@@ -29,12 +29,12 @@
 
 namespace Espo\AclPortal;
 
-use \Espo\Entities\User;
+use \Espo\Entities\User as EntityUser;
 use \Espo\ORM\Entity;
 
 class Attachment extends \Espo\Core\AclPortal\Base
 {
-    public function checkEntityRead(User $user, Entity $entity, $data)
+    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
     {
         if ($user->isAdmin()) {
             return true;
@@ -82,7 +82,7 @@ class Attachment extends \Espo\Core\AclPortal\Base
         return false;
     }
 
-    public function checkIsOwner(User $user, Entity $entity)
+    public function checkIsOwner(EntityUser $user, Entity $entity)
     {
         if ($user->id === $entity->get('createdById')) {
             return true;

application/Espo/AclPortal/Email.php

@@ -29,13 +29,13 @@
 
 namespace Espo\AclPortal;
 
-use \Espo\Entities\User;
+use \Espo\Entities\User as EntityUser;
 use \Espo\ORM\Entity;
 
 class Email extends \Espo\Core\AclPortal\Base
 {
 
-    public function checkEntityRead(User $user, Entity $entity, $data)
+    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
     {
         if ($this->checkEntity($user, $entity, $data, 'read')) {
             return true;
@@ -60,7 +60,7 @@ class Email extends \Espo\Core\AclPortal\Base
         return false;
     }
 
-    public function checkIsOwner(User $user, Entity $entity)
+    public function checkIsOwner(EntityUser $user, Entity $entity)
     {
         if ($user->id === $entity->get('createdById')) {
             return true;

application/Espo/AclPortal/Notification.php

@@ -29,12 +29,12 @@
 
 namespace Espo\AclPortal;
 
-use \Espo\Entities\User;
+use \Espo\Entities\User as EntityUser;
 use \Espo\ORM\Entity;
 
 class Notification extends \Espo\Core\AclPortal\Base
 {
-    public function checkIsOwner(User $user, Entity $entity)
+    public function checkIsOwner(EntityUser $user, Entity $entity)
     {
         if ($user->id === $entity->get('userId')) {
             return true;

application/Espo/Controllers/App.php

@@ -47,11 +47,30 @@ class App extends \Espo\Core\Controllers\Base
             $user->loadLinkMultipleField('accounts');
         }
 
+        $userData = $user->getValues();
+
+        $emailAddressList = [];
+        foreach ($user->get('emailAddresses') as $emailAddress) {
+            if ($emailAddress->get('invalid')) continue;
+            if ($user->get('emailAddrses') === $emailAddress->get('name')) continue;
+            $emailAddressList[] = $emailAddress->get('name');
+        }
+        if ($user->get('emailAddrses')) {
+            array_unshift($emailAddressList, $user->get('emailAddrses'));
+        }
+        $userData['emailAddressList'] = $emailAddressList;
+
+        $settings = (object)[];
+        foreach ($this->getConfig()->get('userItems') as $item) {
+            $settings->$item = $this->getConfig()->get($item);
+        }
+
         return array(
-            'user' => $user->getValues(),
+            'user' => $userData,
             'acl' => $this->getAcl()->getMap(),
             'preferences' => $preferences,
-            'token' => $this->getUser()->get('token')
+            'token' => $this->getUser()->get('token'),
+            'settings' => $settings
         );
     }
 

application/Espo/Controllers/Attachment.php

@@ -44,8 +44,13 @@ class Attachment extends \Espo\Core\Controllers\Record
             throw new Forbidden();
         }
 
-        list($prefix, $contents) = explode(',', $data);
-        $contents = base64_decode($contents);
+        $arr = explode(',', $data);
+        if (count($arr) > 1) {
+            list($prefix, $contents) = $arr;
+            $contents = base64_decode($contents);
+        } else {
+            $contents = '';
+        }
 
         $attachment = $this->getEntityManager()->getEntity('Attachment');
         $this->getEntityManager()->saveEntity($attachment);

application/Espo/Controllers/AuthToken.php

@@ -40,32 +40,32 @@ class AuthToken extends \Espo\Core\Controllers\Record
         }
     }
 
-    public function actionUpdate($params, $data)
+    public function actionUpdate($params, $data, $request)
     {
         throw new Forbidden();
     }
 
-    public function actionCreate($params, $data)
+    public function actionCreate($params, $data, $request)
     {
         throw new Forbidden();
     }
 
-    public function actionListLinked($params, $data)
+    public function actionListLinked($params, $data, $request)
     {
         throw new Forbidden();
     }
 
-    public function actionMassUpdate($params, $data)
+    public function actionMassUpdate($params, $data, $request)
     {
         throw new Forbidden();
     }
 
-    public function actionCreateLink($params, $data)
+    public function actionCreateLink($params, $data, $request)
     {
         throw new Forbidden();
     }
 
-    public function actionRemoveLink($params, $data)
+    public function actionRemoveLink($params, $data, $request)
     {
         throw new Forbidden();
     }

application/Espo/Controllers/Email.php

@@ -32,6 +32,7 @@ namespace Espo\Controllers;
 use \Espo\Core\Exceptions\BadRequest;
 use \Espo\Core\Exceptions\Forbidden;
 use \Espo\Core\Exceptions\Error;
+use \Espo\Core\Exceptions\NotFound;
 
 class Email extends \Espo\Core\Controllers\Record
 {
@@ -51,22 +52,48 @@ class Email extends \Espo\Core\Controllers\Record
             throw new BadRequest();
         }
 
+        if (!$this->getAcl()->checkScope('Email')) {
+            throw new Forbidden();
+        }
+
         if (is_null($data['password'])) {
             if ($data['type'] == 'preferences') {
-                if (!$this->getUser()->isAdmin() && $data['id'] != $this->getUser()->id) {
+                if (!$this->getUser()->isAdmin() && $data['id'] !== $this->getUser()->id) {
                     throw new Forbidden();
                 }
                 $preferences = $this->getEntityManager()->getEntity('Preferences', $data['id']);
                 if (!$preferences) {
-                    throw new Error();
+                    throw new NotFound();
                 }
 
-                $data['password'] = $this->getContainer()->get('crypt')->decrypt($preferences->get('smtpPassword'));
+                if (is_null($data['password'])) {
+                    $data['password'] = $this->getContainer()->get('crypt')->decrypt($preferences->get('smtpPassword'));
+                }
+            } else if ($data['type'] == 'emailAccount') {
+                if (!$this->getAcl()->checkScope('EmailAccount')) {
+                    throw new Forbidden();
+                }
+                if (!empty($data['id'])) {
+                    $emailAccount = $this->getEntityManager()->getEntity('EmailAccount', $data['id']);
+                    if (!$emailAccount) {
+                        throw new NotFound();
+                    }
+                    if (!$this->getUser()->isAdmin()) {
+                        if ($emailAccount->get('assigniedUserId') !== $this->getUser()->id) {
+                            throw new Forbidden();
+                        }
+                    }
+                    if (is_null($data['password'])) {
+                        $data['password'] = $this->getContainer()->get('crypt')->decrypt($emailAccount->get('smtpPassword'));
+                    }
+                }
             } else {
                 if (!$this->getUser()->isAdmin()) {
                     throw new Forbidden();
                 }
-                $data['password'] = $this->getConfig()->get('smtpPassword');
+                if (is_null($data['password'])) {
+                    $data['password'] = $this->getConfig()->get('smtpPassword');
+                }
             }
         }
 
@@ -161,5 +188,38 @@ class Email extends \Espo\Core\Controllers\Record
         }
         return $this->getRecordService()->retrieveFromTrashByIdList($ids);
     }
+
+    public function getActionGetFoldersNotReadCounts(&$params, $request, $data)
+    {
+        return $this->getRecordService()->getFoldersNotReadCounts();
+    }
+
+    protected function fetchListParamsFromRequest(&$params, $request, $data)
+    {
+        parent::fetchListParamsFromRequest($params, $request, $data);
+
+        $folderId = $request->get('folderId');
+        if ($folderId) {
+            $params['folderId'] = $request->get('folderId');
+        }
+    }
+
+    public function postActionMoveToFolder($params, $data)
+    {
+        if (!empty($data['ids'])) {
+            $ids = $data['ids'];
+        } else {
+            if (!empty($data['id'])) {
+                $ids = [$data['id']];
+            } else {
+                throw new BadRequest();
+            }
+        }
+
+        if (empty($data['folderId'])) {
+            throw new BadRequest();
+        }
+        return $this->getRecordService()->moveToFolderByIdList($ids, $data['folderId']);
+    }
 }
 

application/Espo/Controllers/EmailFolder.php

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

application/Espo/Controllers/EntityManager.php

@@ -86,9 +86,12 @@ class EntityManager extends \Espo\Core\Controllers\Base
 
         if ($result) {
             $tabList = $this->getConfig()->get('tabList', []);
-            $tabList[] = $name;
-            $this->getConfig()->set('tabList', $tabList);
-            $this->getConfig()->save();
+
+            if (!in_array($name, $tabList)) {
+                $tabList[] = $name;
+                $this->getConfig()->set('tabList', $tabList);
+                $this->getConfig()->save();
+            }
 
             $this->getContainer()->get('dataManager')->rebuild();
         } else {
@@ -195,6 +198,13 @@ class EntityManager extends \Espo\Core\Controllers\Base
             $params['linkMultipleFieldForeign'] = $data['linkMultipleFieldForeign'];
         }
 
+        if (array_key_exists('audited', $data)) {
+            $params['audited'] = $data['audited'];
+        }
+        if (array_key_exists('auditedForeign', $data)) {
+            $params['auditedForeign'] = $data['auditedForeign'];
+        }
+
         $result = $this->getContainer()->get('entityManagerUtil')->createLink($params);
 
         if ($result) {
@@ -239,6 +249,13 @@ class EntityManager extends \Espo\Core\Controllers\Base
             $params['linkMultipleFieldForeign'] = $data['linkMultipleFieldForeign'];
         }
 
+        if (array_key_exists('audited', $data)) {
+            $params['audited'] = $data['audited'];
+        }
+        if (array_key_exists('auditedForeign', $data)) {
+            $params['auditedForeign'] = $data['auditedForeign'];
+        }
+
         $result = $this->getContainer()->get('entityManagerUtil')->updateLink($params);
 
         if ($result) {

application/Espo/Controllers/Extension.php

@@ -94,17 +94,17 @@ class Extension extends \Espo\Core\Controllers\Record
         return true;
     }
 
-    public function actionCreate($params, $data)
+    public function actionCreate($params, $data, $request)
     {
         throw new Forbidden();
     }
 
-    public function actionUpdate($params, $data)
+    public function actionUpdate($params, $data, $request)
     {
         throw new Forbidden();
     }
 
-    public function actionPatch($params, $data)
+    public function actionPatch($params, $data, $request)
     {
         throw new Forbidden();
     }
@@ -139,12 +139,12 @@ class Extension extends \Espo\Core\Controllers\Record
         throw new Forbidden();
     }
 
-    public function actionCreateLink($params, $data)
+    public function actionCreateLink($params, $data, $request)
     {
         throw new Forbidden();
     }
 
-    public function actionRemoveLink($params, $data)
+    public function actionRemoveLink($params, $data, $request)
     {
         throw new Forbidden();
     }

application/Espo/Controllers/FieldManager.php

@@ -31,7 +31,8 @@ namespace Espo\Controllers;
 
 use \Espo\Core\Exceptions\Error,
     \Espo\Core\Exceptions\Forbidden,
-    \Espo\Core\Exceptions\NotFound;
+    \Espo\Core\Exceptions\NotFound,
+    \Espo\Core\Exceptions\BadRequest;
 
 class FieldManager extends \Espo\Core\Controllers\Base
 {
@@ -44,19 +45,23 @@ class FieldManager extends \Espo\Core\Controllers\Base
 
     public function actionRead($params, $data)
     {
+        if (empty($params['scope']) || empty($params['name'])) {
+            throw new BadRequest();
+        }
+
         $data = $this->getContainer()->get('fieldManager')->read($params['name'], $params['scope']);
 
         if (!isset($data)) {
-            throw new NotFound();
+            throw new BadRequest();
         }
 
         return $data;
     }
 
-    public function actionCreate($params, $data)
+    public function postActionCreate($params, $data)
     {
-        if (empty($data['name'])) {
-            throw new Error("Field 'name' cannnot be empty");
+        if (empty($params['scope']) || empty($data['name'])) {
+            throw new BadRequest();
         }
 
         $fieldManager = $this->getContainer()->get('fieldManager');
@@ -72,8 +77,12 @@ class FieldManager extends \Espo\Core\Controllers\Base
         return $fieldManager->read($data['name'], $params['scope']);
     }
 
-    public function actionUpdate($params, $data)
+    public function putActionUpdate($params, $data)
     {
+        if (empty($params['scope']) || empty($params['name'])) {
+            throw new BadRequest();
+        }
+
         $fieldManager = $this->getContainer()->get('fieldManager');
         $fieldManager->update($params['name'], $data, $params['scope']);
 
@@ -86,8 +95,12 @@ class FieldManager extends \Espo\Core\Controllers\Base
         return $fieldManager->read($params['name'], $params['scope']);
     }
 
-    public function actionDelete($params, $data)
+    public function deleteActionDelete($params, $data)
     {
+        if (empty($params['scope']) || empty($params['name'])) {
+            throw new BadRequest();
+        }
+
         $res = $this->getContainer()->get('fieldManager')->delete($params['name'], $params['scope']);
 
         $this->getContainer()->get('dataManager')->rebuildMetadata();
@@ -95,5 +108,17 @@ class FieldManager extends \Espo\Core\Controllers\Base
         return $res;
     }
 
+    public function postActionResetToDefault($params, $data)
+    {
+        if (empty($data['scope']) || empty($data['name'])) {
+            throw new BadRequest();
+        }
+
+        $this->getContainer()->get('fieldManager')->resetToDefault($data['name'], $data['scope']);
+
+        $this->getContainer()->get('dataManager')->rebuildMetadata();
+
+        return true;
+    }
 }
 

application/Espo/Controllers/Import.php

@@ -43,12 +43,12 @@ class Import extends \Espo\Core\Controllers\Record
         }
     }
 
-    public function actionPatch($params, $data)
+    public function actionPatch($params, $data, $request)
     {
         throw new BadRequest();
     }
 
-    public function actionUpdate($params, $data)
+    public function actionUpdate($params, $data, $request)
     {
         throw new BadRequest();
     }
@@ -58,12 +58,12 @@ class Import extends \Espo\Core\Controllers\Record
         throw new BadRequest();
     }
 
-    public function actionCreateLink($params, $data)
+    public function actionCreateLink($params, $data, $request)
     {
         throw new BadRequest();
     }
 
-    public function actionRemoveLink($params, $data)
+    public function actionRemoveLink($params, $data, $request)
     {
         throw new BadRequest();
     }
@@ -127,8 +127,48 @@ class Import extends \Espo\Core\Controllers\Record
             throw new BadRequest();
         }
 
+        if (!isset($data['fieldDelimiter'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['textQualifier'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['dateFormat'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['timeFormat'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['personNameFormat'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['decimalMark'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['defaultValues'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['action'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['attachmentId'])) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data['entityType'])) {
+            throw new BadRequest();
+        }
+
         $importParams = array(
-            'headerRow' => $data['headerRow'],
+            'headerRow' => !empty($data['headerRow']),
             'fieldDelimiter' => $data['fieldDelimiter'],
             'textQualifier' => $data['textQualifier'],
             'dateFormat' => $data['dateFormat'],
@@ -138,6 +178,8 @@ class Import extends \Espo\Core\Controllers\Record
             'currency' => $data['currency'],
             'defaultValues' => $data['defaultValues'],
             'action' => $data['action'],
+            'skipDuplicateChecking' => !empty($data['skipDuplicateChecking']),
+            'idleMode' => !empty($data['idleMode'])
         );
 
         if (array_key_exists('updateBy', $data)) {

application/Espo/Controllers/Integration.php

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

application/Espo/Controllers/Preferences.php

@@ -132,6 +132,7 @@ class Preferences extends \Espo\Core\Controllers\Base
 
         $entity->set('smtpEmailAddress', $user->get('emailAddress'));
         $entity->set('name', $user->get('name'));
+        $entity->set('isPortalUser', $user->get('isPortalUser'));
 
         $entity->clear('smtpPassword');
 

application/Espo/Controllers/Settings.php

@@ -37,7 +37,11 @@ class Settings extends \Espo\Core\Controllers\Base
 {
     protected function getConfigData()
     {
-        $data = $this->getConfig()->getData($this->getUser()->isAdmin());
+        if ($this->getUser()->id == 'system') {
+            $data = $this->getConfig()->getData();
+        } else {
+            $data = $this->getConfig()->getData($this->getUser()->isAdmin());
+        }
 
         $fieldDefs = $this->getMetadata()->get('entityDefs.Settings.fields');
 
@@ -90,4 +94,23 @@ class Settings extends \Espo\Core\Controllers\Base
 
         return $this->getConfigData();
     }
+
+    public function postActionTestLdapConnection($params, $data)
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+
+        if (!isset($data['password'])) {
+            $data['password'] = $this->getConfig()->get('ldapPassword');
+        }
+
+        $ldapUtils = new \Espo\Core\Utils\Authentication\LDAP\Utils();
+        $options = $ldapUtils->normalizeOptions($data);
+
+        $ldapClient = new \Espo\Core\Utils\Authentication\LDAP\Client($options);
+        $ldapClient->bind(); //an exception if no connection
+
+        return true;
+    }
 }

application/Espo/Core/Acl.php

@@ -118,5 +118,15 @@ class Acl
     {
         return $this->getAclManager()->getScopeForbiddenFieldList($this->getUser(), $scope, $action, $thresholdLevel);
     }
+
+    public function checkUserPermission($target, $permissionType = 'userPermission')
+    {
+        return $this->getAclManager()->checkUserPermission($this->getUser(), $target, $permissionType);
+    }
+
+    public function checkAssignmentPermission($target)
+    {
+        return $this->getAclManager()->checkAssignmentPermission($this->getUser(), $target);
+    }
 }
 

application/Espo/Core/Acl/Base.php

@@ -66,6 +66,13 @@ class Base implements Injectable
         return $this->injections[$name];
     }
 
+    protected function addDependencyList(array $list)
+    {
+        foreach ($list as $item) {
+            $this->addDependency($item);
+        }
+    }
+
     protected function addDependency($name)
     {
         $this->dependencies[] = $name;
@@ -148,7 +155,7 @@ class Base implements Injectable
         }
 
         if (!isset($data->$action)) {
-            return true;
+            return false;
         }
 
         $value = $data->$action;

application/Espo/Core/Acl/Table.php

@@ -177,7 +177,7 @@ class Table
                 return $this->data->table->$scope->$action;
             }
         }
-        return false;
+        return 'no';
     }
 
     private function load()
@@ -207,6 +207,7 @@ class Table
             $this->applyDefault($aclTable, $fieldTable);
             $this->applyDisabled($aclTable, $fieldTable);
             $this->applyMandatory($aclTable, $fieldTable);
+            $this->applyAdditional($aclTable, $fieldTable, $valuePermissionLists);
         } else {
             $aclTable = (object) [];
             foreach ($this->getScopeList() as $scope) {
@@ -458,6 +459,17 @@ class Table
                         $defaultValue = (object) $defaultValue;
                     }
                     $table->$scope = $defaultValue;
+
+                    if (is_object($table->$scope)) {
+                        $actionList = $this->getMetadata()->get(['scopes', $scope, $this->type . 'ActionList']);
+                        if ($actionList) {
+                            foreach (get_object_vars($table->$scope) as $action => $level) {
+                                if (!in_array($action, $actionList)) {
+                                    unset($table->$scope->$action);
+                                }
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -524,6 +536,19 @@ class Table
         }
     }
 
+    protected function applyAdditional(&$table, &$fieldTable, &$valuePermissionLists)
+    {
+        if ($this->getUser()->get('isPortalUser')) {
+            foreach ($this->getScopeList() as $scope) {
+                $table->$scope = false;
+                unset($fieldTable->$scope);
+            }
+            foreach ($this->valuePermissionList as $permission) {
+                $valuePermissionLists->{$permission}[] = 'no';
+            }
+        }
+    }
+
     private function mergeValueList(array $list, $defaultValue)
     {
         $result = null;
@@ -592,7 +617,9 @@ class Table
 
                     if (!is_object($row)) continue;
 
-                    foreach ($this->actionList as $i => $action) {
+                    $actionList = $this->getMetadata()->get(['scopes', $scope, $this->type . 'ActionList'], $this->actionList);
+
+                    foreach ($actionList as $i => $action) {
                         if (isset($row->$action)) {
                             $level = $row->$action;
                             if (!isset($data->$scope->$action)) {
@@ -609,7 +636,7 @@ class Table
                                 if (in_array($action, $this->booleanActionList)) {
                                     $data->$scope->$action = 'yes';
                                 } else {
-                                    if (isset($data->$scope->$previousAction)) {
+                                    if ($action === 'stream' && isset($data->$scope->$previousAction)) {
                                         $data->$scope->$action = $data->$scope->$previousAction;
                                     }
                                 }
@@ -670,11 +697,12 @@ class Table
 
     private function buildCache()
     {
-        $contents = '<' . '?'. 'php return ' .  $this->varExport($this->data)  . ';';
-        $this->fileManager->putContents($this->cacheFilePath, $contents);
+        $this->fileManager->putPhpContents($this->cacheFilePath, $this->data, true);
+        /*$contents = '<' . '?'. 'php return ' .  $this->varExport($this->data)  . ';';
+        $this->fileManager->putContents($this->cacheFilePath, $contents);*/
     }
 
-    private function varExport($variable)
+    /*private function varExport($variable)
     {
         if ($variable instanceof \StdClass) {
             $result = '(object) ' . $this->varExport(get_object_vars($variable), true);
@@ -689,6 +717,6 @@ class Table
         }
 
         return $result;
-    }
+    }*/
 }
 

application/Espo/Core/AclManager.php

@@ -184,7 +184,7 @@ class AclManager
         return $this->getImplementation($entity->getEntityType())->checkIsOwner($user, $entity);
     }
 
-    public function checkInTeam(User $user, Entity $entity, $action)
+    public function checkInTeam(User $user, Entity $entity)
     {
         return $this->getImplementation($entity->getEntityType())->checkInTeam($user, $entity);
     }
@@ -235,5 +235,40 @@ class AclManager
         if ($user->isAdmin()) return [];
         return $this->getTable($user)->getScopeForbiddenFieldList($scope, $action, $thresholdLevel);
     }
+
+    public function checkUserPermission(User $user, $target, $permissionType = 'userPermission')
+    {
+        $permission = $this->get($user, $permissionType);
+
+        if (is_object($target)) {
+            $userId = $target->id;
+        } else {
+            $userId = $target;
+        }
+
+        if ($user->id === $userId) return true;
+
+        if ($permission === 'no') {
+            return false;
+        }
+
+        if ($permission === 'yes') {
+            return true;
+        }
+
+        if ($permission === 'team') {
+            $teamIdList = $user->getLinkMultipleIdList('teams');
+            if (!$this->getContainer()->get('entityManager')->getRepository('User')->checkBelongsToAnyOfTeams($userId, $teamIdList)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function checkAssignmentPermission(User $user, $target)
+    {
+        return $this->checkUserPermission($user, $target, 'assignmentPermission');
+    }
 }
 

application/Espo/Core/AclPortal/Base.php

@@ -71,7 +71,7 @@ class Base extends \Espo\Core\Acl\Base
         }
 
         if (!isset($data->$action)) {
-            return true;
+            return false;
         }
 
         $value = $data->$action;

application/Espo/Core/AclPortal/Table.php

@@ -127,5 +127,9 @@ class Table extends \Espo\Core\Acl\Table
             }
         }
     }
+
+    protected function applyAdditional(&$table, &$fieldTable, &$valuePermissionLists)
+    {
+    }
 }
 

application/Espo/Core/Application.php

@@ -222,7 +222,7 @@ class Application
             }
 
             try {
-                $controllerManager = new \Espo\Core\ControllerManager($container);
+                $controllerManager = $this->getContainer()->get('controllerManager');
                 $result = $controllerManager->process($controllerName, $actionName, $params, $data, $slim->request());
                 $container->get('output')->render($result);
             } catch (\Exception $e) {
@@ -315,7 +315,7 @@ class Application
             return $_GET['portalId'];
         }
         if (!empty($_COOKIE['auth-token'])) {
-            $token = $this->getContainer()->get('entityManager')->getRepository('AuthToken')->where(array('token'=>$_COOKIE['auth-token']))->findOne();
+            $token = $this->getContainer()->get('entityManager')->getRepository('AuthToken')->where(array('token' => $_COOKIE['auth-token']))->findOne();
 
             if ($token && $token->get('portalId')) {
                 return $token->get('portalId');

application/Espo/Core/Container.php

@@ -135,6 +135,13 @@ class Container
         );
     }
 
+    protected function loadControllerManager()
+    {
+        return new \Espo\Core\ControllerManager(
+            $this
+        );
+    }
+
     protected function loadPreferences()
     {
         return $this->get('entityManager')->getEntity('Preferences', $this->get('user')->id);
@@ -181,7 +188,7 @@ class Container
 
     protected function loadNumber()
     {
-        return new \Espo\Core\Utils\Number(
+        return new \Espo\Core\Utils\NumberUtil(
             $this->get('config')->get('decimalMark'),
             $this->get('config')->get('thousandSeparator')
         );
@@ -209,8 +216,8 @@ class Container
     protected function loadMetadata()
     {
         return new \Espo\Core\Utils\Metadata(
-            $this->get('config'),
-            $this->get('fileManager')
+            $this->get('fileManager'),
+            $this->get('config')->get('useCache')
         );
     }
 
@@ -247,7 +254,17 @@ class Container
             $this->get('metadata'),
             $this->get('fileManager'),
             $this->get('entityManager'),
-            $this->get('classParser')
+            $this->get('classParser'),
+            $this->get('ormMetadata')
+        );
+    }
+
+    protected function loadOrmMetadata()
+    {
+        return new \Espo\Core\Utils\Metadata\OrmMetadata(
+            $this->get('metadata'),
+            $this->get('fileManager'),
+            $this->get('config')->get('useCache')
         );
     }
 
@@ -263,10 +280,20 @@ class Container
     protected function loadLanguage()
     {
         return new \Espo\Core\Utils\Language(
+            \Espo\Core\Utils\Language::detectLanguage($this->get('config'), $this->get('preferences')),
             $this->get('fileManager'),
-            $this->get('config'),
             $this->get('metadata'),
-            $this->get('preferences')
+            $this->get('config')->get('useCache')
+        );
+    }
+
+    protected function loadDefaultLanguage()
+    {
+        return new \Espo\Core\Utils\Language(
+            null,
+            $this->get('fileManager'),
+            $this->get('metadata'),
+            $this->get('useCache')
         );
     }
 
@@ -295,7 +322,8 @@ class Container
     {
         return new \Espo\Core\Utils\FieldManager(
             $this->get('metadata'),
-            $this->get('language')
+            $this->get('language'),
+            $this
         );
     }
 

application/Espo/Core/Controllers/Record.php

@@ -131,9 +131,7 @@ class Record extends Base
         $asc = $request->get('asc', 'true') === 'true';
         $sortBy = $request->get('sortBy');
         $q = $request->get('q');
-        $primaryFilter = $request->get('primaryFilter');
         $textFilter = $request->get('textFilter');
-        $boolFilterList = $request->get('boolFilterList');
 
         if (empty($maxSize)) {
             $maxSize = self::MAX_SIZE_LIMIT;
@@ -151,12 +149,8 @@ class Record extends Base
             'q' => $q,
             'textFilter' => $textFilter
         );
-        if ($request->get('primaryFilter')) {
-            $params['primaryFilter'] = $request->get('primaryFilter');
-        }
-        if ($request->get('boolFilterList')) {
-            $params['boolFilterList'] = $request->get('boolFilterList');
-        }
+
+        $this->fetchListParamsFromRequest($params, $request, $data);
 
         $result = $this->getRecordService()->findEntities($params);
 
@@ -166,6 +160,16 @@ class Record extends Base
         );
     }
 
+    protected function fetchListParamsFromRequest(&$params, $request, $data)
+    {
+        if ($request->get('primaryFilter')) {
+            $params['primaryFilter'] = $request->get('primaryFilter');
+        }
+        if ($request->get('boolFilterList')) {
+            $params['boolFilterList'] = $request->get('boolFilterList');
+        }
+    }
+
     public function actionListLinked($params, $data, $request)
     {
         $id = $params['id'];
@@ -195,12 +199,8 @@ class Record extends Base
             'q' => $q,
             'textFilter' => $textFilter
         );
-        if ($request->get('primaryFilter')) {
-            $params['primaryFilter'] = $request->get('primaryFilter');
-        }
-        if ($request->get('boolFilterList')) {
-            $params['boolFilterList'] = $request->get('boolFilterList');
-        }
+
+        $this->fetchListParamsFromRequest($params, $request, $data);
 
         $result = $this->getRecordService()->findLinkedEntities($id, $link, $params);
 
@@ -226,6 +226,10 @@ class Record extends Base
 
     public function actionExport($params, $data, $request)
     {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+
         if ($this->getConfig()->get('exportDisabled') && !$this->getUser()->isAdmin()) {
             throw new Forbidden();
         }
@@ -234,17 +238,23 @@ class Record extends Base
             throw new Forbidden();
         }
 
-        $ids = $request->get('ids');
-        $where = $request->get('where');
-        $byWhere = $request->get('byWhere');
+        $ids = isset($data['ids']) ? $data['ids'] : null;
+        $where = isset($data['where']) ? json_decode(json_encode($data['where']), true) : null;
+        $byWhere = isset($data['byWhere']) ? $data['byWhere'] : false;
+        $selectData = isset($data['selectData']) ? json_decode(json_encode($data['selectData']), true) : null;
 
         $params = array();
         if ($byWhere) {
+            $params['selectData'] = $selectData;
             $params['where'] = $where;
         } else {
             $params['ids'] = $ids;
         }
 
+        if (isset($data['attributeList'])) {
+            $params['attributeList'] = $data['attributeList'];
+        }
+
         return array(
             'id' => $this->getRecordService()->export($params)
         );
@@ -266,6 +276,9 @@ class Record extends Base
         $params = array();
         if (array_key_exists('where', $data) && !empty($data['byWhere'])) {
             $params['where'] = json_decode(json_encode($data['where']), true);
+            if (array_key_exists('selectData', $data)) {
+                $params['selectData'] = json_decode(json_encode($data['selectData']), true);
+            }
         } else if (array_key_exists('ids', $data)) {
             $params['ids'] = $data['ids'];
         }
@@ -290,6 +303,9 @@ class Record extends Base
         if (array_key_exists('where', $data) && !empty($data['byWhere'])) {
             $where = json_decode(json_encode($data['where']), true);
             $params['where'] = $where;
+            if (array_key_exists('selectData', $data)) {
+                $params['selectData'] = json_decode(json_encode($data['selectData']), true);
+            }
         }
         if (array_key_exists('ids', $data)) {
             $params['ids'] = $data['ids'];
@@ -318,7 +334,13 @@ class Record extends Base
                 throw new BadRequest();
             }
             $where = json_decode(json_encode($data['where']), true);
-            return $this->getRecordService()->linkEntityMass($id, $link, $where);
+
+            $selectData = null;
+            if (isset($data['selectData']) && is_array($data['selectData'])) {
+                $selectData = json_decode(json_encode($data['selectData']), true);
+            }
+
+            return $this->getRecordService()->linkEntityMass($id, $link, $where, $selectData);
         } else {
             $foreignIdList = array();
             if (isset($data['id'])) {
@@ -423,5 +445,21 @@ class Record extends Base
 
         return $this->getRecordService()->merge($targetId, $sourceIds, $attributes);
     }
+
+    public function postActionGetDuplicateAttributes($params, $data, $request)
+    {
+        if (empty($data['id'])) {
+            throw new BadRequest();
+        }
+
+        if (!$this->getAcl()->check($this->name, 'create')) {
+            throw new Forbidden();
+        }
+        if (!$this->getAcl()->check($this->name, 'read')) {
+            throw new Forbidden();
+        }
+
+        return $this->getRecordService()->getDuplicateAttributes($data['id']);
+    }
 }
 

application/Espo/Core/CronManager.php

@@ -274,12 +274,18 @@ class CronManager
         $createdJobIdList = array();
         foreach ($activeScheduledJobList as $scheduledJob) {
             $scheduling = $scheduledJob['scheduling'];
-            $cronExpression = \Cron\CronExpression::factory($scheduling);
+
+            try {
+                $cronExpression = \Cron\CronExpression::factory($scheduling);
+            } catch (\Exception $e) {
+                $GLOBALS['log']->error('CronManager (ScheduledJob ['.$scheduledJob['id'].']): Scheduling string error - '. $e->getMessage() . '.');
+                continue;
+            }
 
             try {
                 $previousDate = $cronExpression->getPreviousRunDate()->format('Y-m-d H:i:s');
             } catch (\Exception $e) {
-                $GLOBALS['log']->error('CronManager: ScheduledJob ['.$scheduledJob['id'].']: CronExpression - Impossible CRON expression ['.$scheduling.']');
+                $GLOBALS['log']->error('CronManager (ScheduledJob ['.$scheduledJob['id'].']): Unsupported CRON expression ['.$scheduling.']');
                 continue;
             }
 
@@ -287,6 +293,9 @@ class CronManager
                 $previousDate = date('Y-m-d H:i:s');
             }
 
+            $existingJob = $this->getCronJob()->getJobByScheduledJob($scheduledJob['id'], $previousDate);
+            if ($existingJob) continue;
+
             $className = $this->getScheduledJobUtil()->get($scheduledJob['job']);
             if ($className) {
                 if (method_exists($className, 'prepare')) {
@@ -300,9 +309,6 @@ class CronManager
                 continue;
             }
 
-            $existingJob = $this->getCronJob()->getJobByScheduledJob($scheduledJob['id'], $previousDate);
-            if ($existingJob) continue;
-
             $jobEntity = $this->getEntityManager()->getEntity('Job');
             $jobEntity->set(array(
                 'name' => $scheduledJob['name'],

application/Espo/Core/DataManager.php

@@ -28,6 +28,7 @@
  ************************************************************************/
 
 namespace Espo\Core;
+
 class DataManager
 {
     private $container;
@@ -113,11 +114,11 @@ class DataManager
 
         $metadata->init(true);
 
-        $ormMeta = $metadata->getOrmMetadata(true);
+        $ormData = $this->getContainer()->get('ormMetadata')->getData(true);
 
         $this->updateCacheTimestamp();
 
-        return empty($ormMeta) ? false : true;
+        return empty($ormData) ? false : true;
     }
 
     /**

application/Espo/Core/HookManager.php

@@ -51,6 +51,8 @@ class HookManager
         'afterSave',
         'beforeRemove',
         'afterRemove',
+        'afterRelate',
+        'afterUnrelate'
     );
 
     protected $paths = array(
@@ -63,7 +65,6 @@ class HookManager
     public function __construct(Container $container)
     {
         $this->container = $container;
-        $this->loadHooks();
     }
 
     protected function getConfig()
@@ -85,24 +86,30 @@ class HookManager
 
         $metadata = $this->container->get('metadata');
 
-        $this->data = $this->getHookData($this->paths['corePath']);
+        $data = $this->getHookData($this->paths['customPath']);
 
         foreach ($metadata->getModuleList() as $moduleName) {
             $modulePath = str_replace('{*}', $moduleName, $this->paths['modulePath']);
-            $this->data = array_merge_recursive($this->data, $this->getHookData($modulePath));
+            $data = $this->getHookData($modulePath, $data);
         }
 
-        $this->data = array_merge_recursive($this->data, $this->getHookData($this->paths['customPath']));
+        $data = $this->getHookData($this->paths['corePath'], $data);
+
+        $this->data = $this->sortHooks($data);
 
         if ($this->getConfig()->get('useCache')) {
             $this->getFileManager()->putPhpContents($this->cacheFile, $this->data);
         }
     }
 
-    public function process($scope, $hookName, $injection = null, array $options = array())
+    public function process($scope, $hookName, $injection = null, array $options = array(), array $hookData = array())
     {
+        if (!isset($this->data)) {
+            $this->loadHooks();
+        }
+
         if ($scope != 'Common') {
-            $this->process('Common', $hookName, $injection, $options);
+            $this->process('Common', $hookName, $injection, $options, $hookData);
         }
 
         if (!empty($this->data[$scope])) {
@@ -115,7 +122,7 @@ class HookManager
                         }
                     }
                     $hook = $this->hooks[$className];
-                    $hook->$hookName($injection, $options);
+                    $hook->$hookName($injection, $options, $hookData);
                 }
             }
         }
@@ -131,7 +138,8 @@ class HookManager
             }
             return $hook;
         }
-        $GLOBALS['log']->error("Hook class '{$name}' does not exist.");
+
+        $GLOBALS['log']->error("Hook class '{$className}' does not exist.");
     }
 
     /**
@@ -141,14 +149,12 @@ class HookManager
      *
      * @return array
      */
-    protected function getHookData($hookDirs)
+    protected function getHookData($hookDirs, array $hookData = array())
     {
         if (is_string($hookDirs)) {
             $hookDirs = (array) $hookDirs;
         }
 
-        $hooks = array();
-
         foreach ($hookDirs as $hookDir) {
 
             if (file_exists($hookDir)) {
@@ -157,6 +163,7 @@ class HookManager
                 foreach ($fileList as $scopeName => $hookFiles) {
 
                     $hookScopeDirPath = Util::concatPath($hookDir, $scopeName);
+                    $normalizedScopeName = Util::normilizeScopeName($scopeName);
 
                     $scopeHooks = array();
                     foreach($hookFiles as $hookFile) {
@@ -164,32 +171,70 @@ class HookManager
                         $className = Util::getClassName($hookFilePath);
 
                         foreach($this->hookList as $hookName) {
-                            if (method_exists($className, $hookName)) {
-                                $scopeHooks[$hookName][$className::$order][] = $className;
+                            $entityHookData = isset($hookData[$scopeName][$hookName]) ? $hookData[$scopeName][$hookName] : array();
+                            if (method_exists($className, $hookName) && !$this->isHookExists($className, $entityHookData)) {
+                                $hookData[$normalizedScopeName][$hookName][$className::$order][] = $className;
                             }
                         }
                     }
-
-                    //sort hooks by order
-                    foreach ($scopeHooks as $hookName => $hookList) {
-                        ksort($hookList);
-
-                        $sortedHookList = array();
-                        foreach($hookList as $hookDetails) {
-                            $sortedHookList = array_merge($sortedHookList, $hookDetails);
-                        }
-
-                        $normalizedScopeName = Util::normilizeScopeName($scopeName);
-
-                        $hooks[$normalizedScopeName][$hookName] = isset($hooks[$normalizedScopeName][$hookName]) ? array_merge($hooks[$normalizedScopeName][$hookName], $sortedHookList) : $sortedHookList;
-                    }
                 }
             }
 
         }
 
+        return $hookData;
+    }
+
+    /**
+     * Sort hooks by an order
+     *
+     * @param  array  $scopeHooks
+     *
+     * @return array
+     */
+    protected function sortHooks(array $unsortedHooks)
+    {
+        $hooks = array();
+
+        foreach ($unsortedHooks as $scopeName => $scopeHooks) {
+            foreach ($scopeHooks as $hookName => $hookList) {
+                ksort($hookList);
+
+                $sortedHookList = array();
+                foreach($hookList as $hookDetails) {
+                    $sortedHookList = array_merge($sortedHookList, $hookDetails);
+                }
+
+                $normalizedScopeName = Util::normilizeScopeName($scopeName);
+
+                $hooks[$normalizedScopeName][$hookName] = isset($hooks[$normalizedScopeName][$hookName]) ? array_merge($hooks[$normalizedScopeName][$hookName], $sortedHookList) : $sortedHookList;
+            }
+        }
+
         return $hooks;
     }
 
+    /**
+     * Check if hook exists in the list
+     *
+     * @param  string  $className
+     * @param  array  $hookData
+     *
+     * @return boolean
+     */
+    protected function isHookExists($className, array $hookData)
+    {
+        $class = preg_replace('/^.*\\\(.*)$/', '$1', $className);
+
+        foreach ($hookData as $key => $hookList) {
+            foreach ($hookList as $rowHookName) {
+                if (preg_match('/\\'.$class.'$/', $rowHookName)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
 }
 

application/Espo/Core/Hooks/Base.php

@@ -29,15 +29,16 @@
 
 namespace Espo\Core\Hooks;
 
-use \Espo\Core\Interfaces\Injectable;
+use Espo\Core\Interfaces\Injectable;
 
 abstract class Base implements Injectable
 {
     protected $dependencies = array(
+        'container',
         'entityManager',
         'config',
         'metadata',
-        'acl',
+        'aclManager',
         'user',
     );
 
@@ -59,6 +60,13 @@ abstract class Base implements Injectable
         return $this->dependencies;
     }
 
+    protected function addDependencyList(array $list)
+    {
+        foreach ($list as $item) {
+            $this->addDependency($item);
+        }
+    }
+
     protected function addDependency($name)
     {
         $this->dependencies[] = $name;
@@ -74,29 +82,39 @@ abstract class Base implements Injectable
         $this->injections[$name] = $object;
     }
 
+    protected function getContainer()
+    {
+        return $this->getInjection('container');
+    }
+
     protected function getEntityManager()
     {
-        return $this->injections['entityManager'];
+        return $this->getInjection('entityManager');
     }
 
     protected function getUser()
     {
-        return $this->injections['user'];
+        return $this->getInjection('user');
     }
 
     protected function getAcl()
     {
-        return $this->injections['acl'];
+        return $this->getContainer()->get('acl');
+    }
+
+    protected function getAclManager()
+    {
+        return $this->getInjection('aclManager');
     }
 
     protected function getConfig()
     {
-        return $this->injections['config'];
+        return $this->getInjection('config');
     }
 
     protected function getMetadata()
     {
-        return $this->injections['metadata'];
+        return $this->getInjection('metadata');
     }
 
     protected function getRepository()

application/Espo/Core/Htmlizer/Htmlizer.php

@@ -34,7 +34,7 @@ use Espo\Core\Exceptions\Error;
 
 use Espo\Core\Utils\File\Manager as FileManager;
 use Espo\Core\Utils\DateTime;
-use Espo\Core\Utils\Number;
+use Espo\Core\Utils\NumberUtil;
 
 require('vendor/zordius/lightncandy/src/lightncandy.php');
 
@@ -46,42 +46,52 @@ class Htmlizer
 
     protected $config;
 
-    public function __construct(FileManager $fileManager, DateTime $dateTime, Number $number)
+    protected $acl;
+
+    public function __construct(FileManager $fileManager, DateTime $dateTime, NumberUtil $number, $acl = null)
     {
         $this->fileManager = $fileManager;
         $this->dateTime = $dateTime;
         $this->number = $number;
+        $this->acl = $acl;
     }
 
-    protected function formatNumber($value)
+    protected function getAcl()
     {
-        return $this->number->format($value);
+        return $this->acl;
     }
 
     protected function format($value)
     {
-        if (is_float($value) || is_int($value)) {
-            $value = $this->formatNumber($value);
+        if (is_float($value)) {
+            $value = $this->number->format($value, 2);
+        } else if (is_int($value)) {
+            $value = $this->number->format($value);
         } else if (is_string($value)) {
             $value = nl2br($value);
         }
         return $value;
     }
 
-    protected function getDataFromEntity(Entity $entity)
+    protected function getDataFromEntity(Entity $entity, $skipLinks = false)
     {
         $data = $entity->toArray();
 
-
-
         $fieldDefs = $entity->getFields();
         $fieldList = array_keys($fieldDefs);
 
+        $forbidenAttributeList = [];
+
+        if ($this->getAcl()) {
+            $forbidenAttributeList = $this->getAcl()->getScopeForbiddenAttributeList($entity->getEntityType(), 'read');
+        }
+
         foreach ($fieldList as $field) {
-            $type = null;
-            if (!empty($fieldDefs[$field]['type'])) {
-                $type = $fieldDefs[$field]['type'];
-            }
+            if (in_array($field, $forbidenAttributeList)) continue;
+
+
+            $type = $entity->getAttributeType($field);
+
             if ($type == Entity::DATETIME) {
                 if (!empty($data[$field])) {
                     $data[$field] = $this->dateTime->convertSystemDateTime($data[$field]);
@@ -116,6 +126,8 @@ class Htmlizer
                         $data[$field][$k] = $this->format($data[$field][$k]);
                     }
                 }
+            } else if ($type === Entity::PASSWORD) {
+                unset($data[$field]);
             }
 
             if (array_key_exists($field, $data)) {
@@ -123,19 +135,52 @@ class Htmlizer
             }
         }
 
+        if (!$skipLinks) {
+            $relationDefs = $entity->getRelations();
+            foreach ($entity->getRelationList() as $relation) {
+                if (
+                    !empty($relationDefs[$relation]['type'])
+                    &&
+                    ($entity->getRelationType($relation) === 'belongsTo' || $entity->getRelationType($relation) === 'belongsToParent')
+                ) {
+                    $relatedEntity = $entity->get($relation);
+                    if (!$relatedEntity) continue;
+                    if ($this->getAcl()) {
+                        if (!$this->getAcl()->check($relatedEntity, 'read')) continue;
+                    }
+
+                    $data[$relation] = $this->getDataFromEntity($relatedEntity, true);
+                }
+            }
+        }
+
         return $data;
     }
 
-    public function render(Entity $entity, $template)
+    public function render(Entity $entity, $template, $id = null, $additionalData = array(), $skipLinks = false)
     {
         $code = \LightnCandy::compile($template);
-        $id = uniqid('', true);
-        $fileName = 'data/cache/template-' . $id;
-        $this->fileManager->putContents($fileName, $code);
-        $renderer = include($fileName);
-        $this->fileManager->removeFile($fileName);
 
-        $data = $this->getDataFromEntity($entity);
+        $toRemove = false;
+        if ($id === null) {
+            $id = uniqid('', true);
+            $toRemove = true;
+        }
+
+        $fileName = 'data/cache/templates/' . $id . '.php';
+
+        $this->fileManager->putContents($fileName, $code);
+        $renderer = $this->fileManager->getPhpContents($fileName);
+
+        if ($toRemove) {
+            $this->fileManager->removeFile($fileName);
+        }
+
+        $data = $this->getDataFromEntity($entity, $skipLinks);
+
+        foreach ($additionalData as $k => $value) {
+            $data[$k] = $value;
+        }
 
         $html = $renderer($data);
 

application/Espo/Core/Interfaces/Injectable.php

@@ -25,14 +25,14 @@
  *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Interfaces;
 
 interface Injectable
 {
     public function getDependencyList();
-    
+
     public function inject($name, $object);
 }
 

application/Espo/Core/Loaders/EmailFilterManager.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/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Loaders;
+
+class EmailFilterManager extends Base
+{
+    public function load()
+    {
+        $emailFilterManager = new \Espo\Core\Utils\EmailFilterManager(
+            $this->getContainer()->get('entityManager')
+        );
+
+        return $emailFilterManager;
+    }
+}
+

application/Espo/Core/Loaders/EntityManager.php

@@ -40,8 +40,9 @@ class EntityManager extends Base
             'port' => $config->get('database.port'),
             'dbname' => $config->get('database.dbname'),
             'user' => $config->get('database.user'),
+            'charset' => $config->get('database.charset', 'utf8'),
             'password' => $config->get('database.password'),
-            'metadata' => $this->getContainer()->get('metadata')->getOrmMetadata(),
+            'metadata' => $this->getContainer()->get('ormMetadata')->getData(),
             'repositoryFactoryClassName' => '\\Espo\\Core\\ORM\\RepositoryFactory',
             'driver' => $config->get('database.driver'),
             'platform' => $config->get('database.platform')

application/Espo/Core/Loaders/EntityManagerUtil.php

@@ -36,7 +36,9 @@ class EntityManagerUtil extends Base
         $entityManager = new \Espo\Core\Utils\EntityManager(
             $this->getContainer()->get('metadata'),
             $this->getContainer()->get('language'),
-            $this->getContainer()->get('fileManager')
+            $this->getContainer()->get('fileManager'),
+            $this->getContainer()->get('config'),
+            $this->getContainer()
         );
 
         return $entityManager;

application/Espo/Core/Loaders/TemplateFileManager.php

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

application/Espo/Core/Mail/FiltersMatcher.php

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

application/Espo/Core/Mail/Importer.php

@@ -38,16 +38,13 @@ class Importer
 {
     private $entityManager;
 
-    private $fileManager;
-
     private $config;
 
     private $filtersMatcher;
 
-    public function __construct($entityManager, $fileManager, $config)
+    public function __construct($entityManager, $config)
     {
         $this->entityManager = $entityManager;
-        $this->fileManager = $fileManager;
         $this->config = $config;
         $this->filtersMatcher = new FiltersMatcher();
     }
@@ -56,222 +53,246 @@ class Importer
     {
         return $this->entityManager;
     }
+
     protected function getConfig()
     {
         return $this->config;
     }
 
-    protected function getFileManager()
-    {
-        return $this->fileManager;
-    }
-
     protected function getFiltersMatcher()
     {
         return $this->filtersMatcher;
     }
 
-    public function importMessage($message, $assignedUserId = null, $teamsIdList = [], $userIdList = [], $filterList = [], $fetchOnlyHeader = false)
+    public function importMessage($parserType = 'ZendMail', $message, $assignedUserId = null, $teamsIdList = [], $userIdList = [], $filterList = [], $fetchOnlyHeader = false, $folderData = null)
     {
-        try {
-            $email = $this->getEntityManager()->getEntity('Email');
+        $parser = $message->getParser();
+        $parserClassName = '\\Espo\\Core\\Mail\\Parsers\\' . $parserType;
 
-            $subject = $message->subject;
-            if ($subject !== '0' && empty($subject)) {
-                $subject = '(No Subject)';
+        if (!$parser || get_class($parser) !== $parserClassName) {
+            $parser = new $parserClassName($this->getEntityManager());
+        }
+
+        $email = $this->getEntityManager()->getEntity('Email');
+
+        $email->set('isBeingImported', true);
+
+        $subject = '';
+        if ($parser->checkMessageAttribute($message, 'subject')) {
+            $subject = $parser->getMessageAttribute($message, 'subject');
+        }
+        if (!empty($subject) && is_string($subject)) {
+            $subject = trim($subject);
+        }
+        if ($subject !== '0' && empty($subject)) {
+            $subject = '(No Subject)';
+        }
+
+        $email->set('isHtml', false);
+        $email->set('name', $subject);
+        $email->set('status', 'Archived');
+        $email->set('attachmentsIds', []);
+        if ($assignedUserId) {
+            $email->set('assignedUserId', $assignedUserId);
+            $email->addLinkMultipleId('assignedUsers', $assignedUserId);
+        }
+        $email->set('teamsIds', $teamsIdList);
+
+        if (!empty($userIdList)) {
+            foreach ($userIdList as $uId) {
+                $email->addLinkMultipleId('users', $uId);
             }
+        }
 
-            $email->set('isHtml', false);
-            $email->set('name', $subject);
-            $email->set('status', 'Archived');
-            $email->set('attachmentsIds', []);
-            if ($assignedUserId) {
-                $email->set('assignedUserId', $assignedUserId);
-                $email->set('assignedUsersIds', [$assignedUserId]);
-            }
-            $email->set('teamsIds', $teamsIdList);
+        if ($parser->checkMessageAttribute($message, 'from')) {
+            $email->set('fromString', $parser->getMessageAttribute($message, 'from'));
+        }
 
-            if (!empty($userIdList)) {
-                $email->set('usersIds', $userIdList);
-            }
+        if ($parser->checkMessageAttribute($message, 'reply-To')) {
+            $email->set('replyToString', $parser->getMessageAttribute($message, 'reply-To'));
+        }
 
-            $fromArr = $this->getAddressListFromMessage($message, 'from');
-            if (isset($message->from)) {
-                $email->set('fromString', $message->from);
-            }
-            if (isset($message->replyTo)) {
-                $email->set('replyToString', $message->replyTo);
-            }
-
-            $toArr = $this->getAddressListFromMessage($message, 'to');
-            $ccArr = $this->getAddressListFromMessage($message, 'cc');
-            $replyToArr = $this->getAddressListFromMessage($message, 'replyTo');
+        $fromArr = $parser->getAddressListFromMessage($message, 'from');
+        $toArr = $parser->getAddressListFromMessage($message, 'to');
+        $ccArr = $parser->getAddressListFromMessage($message, 'cc');
+        $replyToArr = $parser->getAddressListFromMessage($message, 'reply-To');
 
+        if (count($fromArr)) {
             $email->set('from', $fromArr[0]);
-            $email->set('to', implode(';', $toArr));
-            $email->set('cc', implode(';', $ccArr));
-            $email->set('replyTo', implode(';', $replyToArr));
+        }
+        $email->set('to', implode(';', $toArr));
+        $email->set('cc', implode(';', $ccArr));
+        $email->set('replyTo', implode(';', $replyToArr));
 
-            if ($this->getFiltersMatcher()->match($email, $filterList)) {
-                return false;
+        if ($folderData) {
+            foreach ($folderData as $uId => $folderId) {
+                $email->setLinkMultipleColumn('users', 'folderId', $uId, $folderId);
             }
+        }
 
-            if (isset($message->messageId) && !empty($message->messageId)) {
-                $email->set('messageId', $message->messageId);
-                if (isset($message->deliveredTo)) {
-                    $email->set('messageIdInternal', $message->messageId . '-' . $message->deliveredTo);
-                }
-                if (stripos($message->messageId, '@espo-system') !== false) {
-                    return;
+        if ($this->getFiltersMatcher()->match($email, $filterList, true)) {
+            return false;
+        }
+
+        if ($parser->checkMessageAttribute($message, 'message-Id') && $parser->getMessageAttribute($message, 'message-Id')) {
+            $messageId = $parser->getMessageMessageId($message);
+
+            $email->set('messageId', $messageId);
+            if ($parser->checkMessageAttribute($message, 'delivered-To')) {
+                $email->set('messageIdInternal', $messageId . '-' . $parser->getMessageAttribute($message, 'delivered-To'));
+            }
+            if (stripos($messageId, '@espo-system') !== false) {
+                return;
+            }
+        }
+
+        if ($duplicate = $this->findDuplicate($email)) {
+            if ($assignedUserId) {
+                $duplicate->addLinkMultipleId('users', $assignedUserId);
+                $duplicate->addLinkMultipleId('assignedUsers', $assignedUserId);
+            }
+            if (!empty($userIdList)) {
+                foreach ($userIdList as $uId) {
+                    $duplicate->addLinkMultipleId('users', $uId);
                 }
             }
 
-            if ($duplicate = $this->findDuplicate($email)) {
-                if ($assignedUserId) {
-                    $duplicate->addLinkMultipleId('users', $assignedUserId);
-                    $duplicate->addLinkMultipleId('assignedUsers', $assignedUserId);
+            if ($folderData) {
+                foreach ($folderData as $uId => $folderId) {
+                    $email->setLinkMultipleColumn('users', 'folderId', $uId, $folderId);
                 }
-                if (!empty($userIdList)) {
-                    foreach ($userIdList as $uId) {
-                        $duplicate->addLinkMultipleId('users', $uId);
-                    }
-                }
-
-            	$this->getEntityManager()->saveEntity($duplicate);
-
-                if (!empty($teamsIdList)) {
-                    foreach ($teamsIdList as $teamId) {
-                        $this->getEntityManager()->getRepository('Email')->relate($duplicate, 'teams', $teamId);
-                    }
-                }
-                return $duplicate;
             }
 
-            if (isset($message->date)) {
-                $dt = new \DateTime($message->date);
+            $duplicate->set('isBeingImported', true);
+
+            $this->getEntityManager()->saveEntity($duplicate);
+
+            if (!empty($teamsIdList)) {
+                foreach ($teamsIdList as $teamId) {
+                    $this->getEntityManager()->getRepository('Email')->relate($duplicate, 'teams', $teamId);
+                }
+            }
+            return $duplicate;
+        }
+
+        if ($parser->checkMessageAttribute($message, 'date')) {
+            try {
+                $dt = new \DateTime($parser->getMessageAttribute($message, 'date'));
                 if ($dt) {
                     $dateSent = $dt->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d H:i:s');
                     $email->set('dateSent', $dateSent);
                 }
-            } else {
-				$email->set('dateSent', date('Y-m-d H:i:s'));
-			}
-            if (isset($message->deliveryDate)) {
-                $dt = new \DateTime($message->deliveryDate);
+            } catch (\Exception $e) {}
+        } else {
+            $email->set('dateSent', date('Y-m-d H:i:s'));
+        }
+        if ($parser->checkMessageAttribute($message, 'delivery-Date')) {
+            try {
+                $dt = new \DateTime($parser->getMessageAttribute($message, 'delivery-Date'));
                 if ($dt) {
                     $deliveryDate = $dt->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d H:i:s');
-                    $email->set('deliveryDate', $deliveryDate);
+                    $email->set('delivery-Date', $deliveryDate);
                 }
+            } catch (\Exception $e) {}
+        }
+
+        if (!$fetchOnlyHeader) {
+            $parser->fetchContentParts($email, $message);
+
+            if ($this->getFiltersMatcher()->match($email, $filterList)) {
+                return false;
             }
+        } else {
+            $email->set('body', '(Not fetched)');
+            $email->set('isHtml', false);
+        }
 
-            $inlineIds = array();
+        $parentFound = false;
 
-            if (!$fetchOnlyHeader) {
-                if ($message->isMultipart()) {
-                    foreach (new \RecursiveIteratorIterator($message) as $part) {
-                        $this->importPartDataToEmail($email, $part, $inlineIds);
-                    }
-                } else {
-                    $this->importPartDataToEmail($email, $message, $inlineIds, 'text/plain');
-                }
+        $replied = null;
 
-                if (!$email->get('body') && $email->get('bodyPlain')) {
-                    $email->set('body', $email->get('bodyPlain'));
-                }
-
-                $body = $email->get('body');
-                if (!empty($body)) {
-                    foreach ($inlineIds as $cid => $attachmentId) {
-                        if (strpos($body, 'cid:' . $cid) !== false) {
-                            $body = str_replace('cid:' . $cid, '?entryPoint=attachment&id=' . $attachmentId, $body);
-                        } else {
-                            $email->addLinkMultipleId('attachments', $attachmentId);
-                        }
-                    }
-                    $email->set('body', $body);
-                }
-
-                if ($this->getFiltersMatcher()->matchBody($email, $filterList)) {
-                    return false;
-                }
-            } else {
-                $email->set('body', '(Not fetched)');
-                $email->set('isHtml', false);
+        if ($parser->checkMessageAttribute($message, 'in-Reply-To') && $parser->getMessageAttribute($message, 'in-Reply-To')) {
+            $arr = explode(' ', $parser->getMessageAttribute($message, 'in-Reply-To'));
+            $inReplyTo = $arr[0];
+            $replied = $this->getEntityManager()->getRepository('Email')->where(array(
+                'messageId' => $inReplyTo
+            ))->findOne();
+            if ($replied) {
+                $email->set('repliedId', $replied->id);
             }
+        }
 
-            $parentFound = false;
-
-            if (isset($message->inReplyTo) && !empty($message->inReplyTo)) {
-                $arr = explode(' ', $message->inReplyTo);
-                $inReplyTo = $arr[0];
-                $replied = $this->getEntityManager()->getRepository('Email')->where(array(
-                    'messageId' => $inReplyTo
-                ))->findOne();
-                if ($replied) {
-                    $email->set('repliedId', $replied->id);
-                }
+        if ($parser->checkMessageAttribute($message, 'references') && $parser->getMessageAttribute($message, 'references')) {
+            $arr = explode(' ', $parser->getMessageAttribute($message, 'references'));
+            $reference = $arr[0];
+            $reference = str_replace(array('/', '@'), " ", trim($reference, '<>'));
+            $parentType = $parentId = null;
+            $emailSent = PHP_INT_MAX;
+            $number = null;
+            $n = sscanf($reference, '%s %s %d %d espo', $parentType, $parentId, $emailSent, $number);
+            if ($n != 4) {
+                $n = sscanf($reference, '%s %s %d %d espo-system', $parentType, $parentId, $emailSent, $number);
             }
-
-            if (isset($message->references) && !empty($message->references)) {
-                $arr = explode(' ', $message->references);
-                $reference = $arr[0];
-                $reference = str_replace(array('/', '@'), " ", trim($reference, '<>'));
-                $parentType = $parentId = null;
-                $emailSent = PHP_INT_MAX;
-                $n = sscanf($reference, '%s %s %d %d espo', $parentType, $parentId, $emailSent, $number);
-                if ($n == 4 && $emailSent < time()) {
-                    if (!empty($parentType) && !empty($parentId)) {
-                        if ($parentType == 'Lead') {
-                            $parent = $this->getEntityManager()->getEntity('Lead', $parentId);
-                            if ($parent && $parent->get('status') == 'Converted') {
-                                if ($parent->get('createdAccountId')) {
-                                    $account = $this->getEntityManager()->getEntity('Account', $parent->get('createdAccountId'));
-                                    if ($account) {
-                                        $parentType = 'Account';
-                                        $parentId = $account->id;
-                                    }
-                                } else {
-                                    if ($this->getConfig()->get('b2cMode')) {
-                                        if ($parent->get('createdContactId')) {
-                                            $contact = $this->getEntityManager()->getEntity('Contact', $parent->get('createdContactId'));
-                                            if ($contact) {
-                                                $parentType = 'Contact';
-                                                $parentId = $contact->id;
-                                            }
+            if ($n == 4 && $emailSent < time()) {
+                if (!empty($parentType) && !empty($parentId)) {
+                    if ($parentType == 'Lead') {
+                        $parent = $this->getEntityManager()->getEntity('Lead', $parentId);
+                        if ($parent && $parent->get('status') == 'Converted') {
+                            if ($parent->get('createdAccountId')) {
+                                $account = $this->getEntityManager()->getEntity('Account', $parent->get('createdAccountId'));
+                                if ($account) {
+                                    $parentType = 'Account';
+                                    $parentId = $account->id;
+                                }
+                            } else {
+                                if ($this->getConfig()->get('b2cMode')) {
+                                    if ($parent->get('createdContactId')) {
+                                        $contact = $this->getEntityManager()->getEntity('Contact', $parent->get('createdContactId'));
+                                        if ($contact) {
+                                            $parentType = 'Contact';
+                                            $parentId = $contact->id;
                                         }
                                     }
                                 }
                             }
                         }
-                        $email->set('parentType', $parentType);
-                        $email->set('parentId', $parentId);
-                        $parentFound = true;
                     }
+                    $email->set('parentType', $parentType);
+                    $email->set('parentId', $parentId);
+                    $parentFound = true;
                 }
             }
+        }
 
-            if (!$parentFound) {
-                $from = $email->get('from');
-                if ($from) {
-                    $parentFound = $this->findParent($email, $from);
+        if (!$parentFound) {
+            if ($replied && $replied->get('parentId') && $replied->get('parentType')) {
+                $parentFound = $this->getEntityManager()->getEntity($replied->get('parentType'), $replied->get('parentId'));
+                if ($parentFound) {
+                    $email->set('parentType', $replied->get('parentType'));
+                    $email->set('parentId', $replied->get('parentId'));
                 }
             }
-            if (!$parentFound) {
-                if (!empty($replyToArr)) {
-                    $parentFound = $this->findParent($email, $replyToArr[0]);
-                }
+        }
+        if (!$parentFound) {
+            $from = $email->get('from');
+            if ($from) {
+                $parentFound = $this->findParent($email, $from);
             }
-            if (!$parentFound) {
-                if (!empty($toArr)) {
-                    $parentFound = $this->findParent($email, $toArr[0]);
-                }
+        }
+        if (!$parentFound) {
+            if (!empty($replyToArr)) {
+                $parentFound = $this->findParent($email, $replyToArr[0]);
             }
+        }
+        if (!$parentFound) {
+            if (!empty($toArr)) {
+                $parentFound = $this->findParent($email, $toArr[0]);
+            }
+        }
 
-            $this->getEntityManager()->saveEntity($email);
+        $this->getEntityManager()->saveEntity($email);
 
-            return $email;
-
-        } catch (\Exception $e) {}
+        return $email;
     }
 
     protected function findParent(Entity $email, $emailAddress)
@@ -300,15 +321,15 @@ class Importer
                 $email->set('parentId', $account->id);
                 return true;
             } else {
-	            $lead = $this->getEntityManager()->getRepository('Lead')->where(array(
-	                'emailAddress' => $emailAddress
-	            ))->findOne();
-	            if ($lead) {
-	                $email->set('parentType', 'Lead');
-	                $email->set('parentId', $lead->id);
-	                return true;
-	            }
-	       	}
+                $lead = $this->getEntityManager()->getRepository('Lead')->where(array(
+                    'emailAddress' => $emailAddress
+                ))->findOne();
+                if ($lead) {
+                    $email->set('parentType', 'Lead');
+                    $email->set('parentId', $lead->id);
+                    return true;
+                }
+            }
         }
     }
 
@@ -323,246 +344,4 @@ class Importer
             }
         }
     }
-
-    protected function normilizeHeader($header)
-    {
-        if (is_a($header, 'ArrayIterator')) {
-            return $header->current();
-        } else {
-            return $header;
-        }
-    }
-
-    protected function getAddressListFromMessage($message, $type)
-    {
-        $addressList = array();
-        if (isset($message->$type)) {
-            $list = $this->normilizeHeader($message->getHeader($type))->getAddressList();
-            foreach ($list as $address) {
-                $addressList[] = $address->getEmail();
-            }
-        }
-        return $addressList;
-    }
-
-    protected function importPartDataToEmail(\Espo\Entities\Email $email, $part, &$inlineIds = array(), $defaultContentType = null)
-    {
-        try {
-            $type = null;
-
-            if ($part->getHeaders() && isset($part->contentType)) {
-                $type = strtok($part->contentType, ';');
-            }
-
-            $contentDisposition = false;
-            if (isset($part->ContentDisposition)) {
-                if (strpos(strtolower($part->ContentDisposition), 'attachment') === 0) {
-                    $contentDisposition = 'attachment';
-                } else if (strpos(strtolower($part->ContentDisposition), 'inline') === 0) {
-                    $contentDisposition = 'inline';
-                }
-            } else if (isset($part->contentID)) {
-                $contentDisposition = 'inline';
-            }
-
-            if (empty($type)) {
-                if (!empty($defaultContentType)) {
-                    $type = $defaultContentType;
-                } else {
-                    return;
-                }
-            }
-
-            $encoding = null;
-            $isAttachment = true;
-            if ($type == 'text/plain' || $type == 'text/html') {
-                if ($contentDisposition !== 'attachment') {
-                    $isAttachment = false;
-                    $content = $this->getContentFromPart($part);
-                    if ($type == 'text/plain') {
-                        $bodyPlain = '';
-                        if ($email->get('bodyPlain')) {
-                            $bodyPlain .= $email->get('bodyPlain') . "\n";
-                        }
-                        $bodyPlain .= $content;
-                        $email->set('bodyPlain', $bodyPlain);
-                    } else if ($type == 'text/html') {
-                        $body = '';
-                        if ($email->get('body')) {
-                            $body .= $email->get('body') . "<br>";
-                        }
-                        $body .= $content;
-                        $email->set('isHtml', true);
-                        $email->set('body', $body);
-                    }
-                }
-            }
-
-            if ($isAttachment) {
-                $content = $part->getContent();
-                $disposition = null;
-
-                $fileName = null;
-                $contentId = null;
-
-                if ($contentDisposition) {
-                    if ($contentDisposition === 'attachment') {
-                        $fileName = $this->fetchFileNameFromContentDisposition($part->ContentDisposition);
-                        if ($fileName) {
-                            $disposition = 'attachment';
-                        }
-                    } else if ($contentDisposition ===  'inline') {
-                        if (isset($part->contentID)) {
-                            $contentId = trim($part->contentID, '<>');
-                            $fileName = $contentId;
-                            $disposition = 'inline';
-                        } else {
-                            // for iOS attachments
-                            if (empty($fileName)) {
-                                $fileName = $this->fetchFileNameFromContentDisposition($part->ContentDisposition);
-                                if ($fileName) {
-                                    $disposition = 'attachment';
-                                }
-                            }
-                        }
-                    }
-                }
-
-                if (isset($part->contentTransferEncoding)) {
-                    $encoding = strtolower($this->normilizeHeader($part->getHeader('Content-Transfer-Encoding'))->getTransferEncoding());
-                }
-
-                $attachment = $this->getEntityManager()->getEntity('Attachment');
-                $attachment->set('name', $fileName);
-                $attachment->set('type', $type);
-
-                if ($disposition == 'inline') {
-                    $attachment->set('role', 'Inline Attachment');
-                } else {
-                    $attachment->set('role', 'Attachment');
-                }
-
-                if ($encoding == 'base64') {
-                    $content = base64_decode($content);
-                }
-
-                $attachment->set('size', strlen($content));
-
-                $this->getEntityManager()->saveEntity($attachment);
-
-                $path = $this->getEntityManager()->getRepository('Attachment')->getFilePath($attachment);
-                $this->getFileManager()->putContents($path, $content);
-
-                if ($disposition == 'attachment') {
-                    $attachmentsIds = $email->get('attachmentsIds');
-                    $attachmentsIds[] = $attachment->id;
-                    $email->set('attachmentsIds', $attachmentsIds);
-                } else if ($disposition == 'inline') {
-                    $inlineIds[$contentId] = $attachment->id;
-                }
-            }
-        } catch (\Exception $e) {}
-    }
-
-    protected function decodeAttachmentFileName($fileName)
-    {
-        if ($fileName && stripos($fileName, "''") !== false) {
-            list($encoding, $fileName) = explode("''", $fileName);
-            $fileName = rawurldecode($fileName);
-            if (strtoupper($encoding) !== 'UTF-8') {
-                if ($encoding) {
-                    $fileName = mb_convert_encoding($fileName, 'UTF-8', $encoding);
-                }
-            }
-        }
-        return $fileName;
-    }
-
-    protected function fetchFileNameFromContentDisposition($contentDisposition)
-    {
-        $contentDisposition = preg_replace('/\\\\"/', "{{_!Q!U!O!T!E!_}}", $contentDisposition);
-
-        $fileName = false;
-        $m = array();
-
-        if (preg_match('/filename="([^"]+)";?/i', $contentDisposition, $m)) {
-            $fileName = $m[1];
-        } else if (preg_match('/filename=([^";]+);?/i', $contentDisposition, $m)) {
-            $fileName = $m[1];
-        } else if (preg_match('/filename\*="([^"]+)";?/i', $contentDisposition, $m)) {
-            $fileName = $m[1];
-            $fileName = $this->decodeAttachmentFileName($fileName);
-        } else if (preg_match('/filename\*=([^";]+);?/i', $contentDisposition, $m)) {
-            $fileName = $m[1];
-            $fileName = $this->decodeAttachmentFileName($fileName);
-        } else {
-            $fileName = '';
-            foreach (['0', '1'] as $i) {
-                if (preg_match('/filename\*'.$i.'[\*]?="([^"]+)";?/i', $contentDisposition, $m)) {
-                    $part = $m[1];
-                    $fileName .= $part;
-                } else if (preg_match('/filename\*'.$i.'[\*]?=([^";]+);?/i', $contentDisposition, $m)) {
-                    $part = $m[1];
-                    $fileName .= $part;
-                }
-            }
-
-            if ($fileName === '') {
-                $fileName = null;
-            } else {
-                $fileName = $this->decodeAttachmentFileName($fileName);
-            }
-        }
-
-        if ($fileName) {
-            $fileName = str_replace('{{_!Q!U!O!T!E!_}}', '"', $fileName);
-        }
-
-        return $fileName;
-    }
-
-    protected function getContentFromPart($part)
-    {
-        if ($part instanceof \Zend\Mime\Part) {
-            $content = $part->getRawContent();
-            if (strtolower($part->charset) != 'utf-8') {
-                $content = mb_convert_encoding($content, 'UTF-8', $part->charset);
-            }
-        } else {
-            $content = $part->getContent();
-
-            $encoding = null;
-
-            if (isset($part->contentTransferEncoding)) {
-                $cteHeader = $this->normilizeHeader($part->getHeader('Content-Transfer-Encoding'));
-                $encoding = strtolower($cteHeader->getTransferEncoding());
-            }
-
-            if ($encoding == 'base64') {
-                $content = base64_decode($content);
-            }
-
-            $charset = 'UTF-8';
-
-            if (isset($part->contentType)) {
-                $ctHeader = $this->normilizeHeader($part->getHeader('Content-Type'));
-                $charsetParamValue = $ctHeader->getParameter('charset');
-                if (!empty($charsetParamValue)) {
-                    $charset = strtoupper($charsetParamValue);
-                }
-            }
-
-            if (isset($part->contentTransferEncoding)) {
-                $cteHeader = $this->normilizeHeader($part->getHeader('Content-Transfer-Encoding'));
-                if ($cteHeader->getTransferEncoding() == 'quoted-printable') {
-                    $content = quoted_printable_decode($content);
-                }
-            }
-
-            if ($charset !== 'UTF-8') {
-                $content = mb_convert_encoding($content, 'UTF-8', $charset);
-            }
-        }
-        return $content;
-    }
 }

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

@@ -31,8 +31,6 @@ namespace Espo\Core\Mail\Mail\Storage;
 
 class Imap extends \Zend\Mail\Storage\Imap
 {
-	protected $messageClass = '\\Espo\\Core\\Mail\\Mail\\Storage\\Message';
-
     public function getIdsFromUID($uid)
     {
         $uid = intval($uid) + 1;
@@ -44,5 +42,22 @@ class Imap extends \Zend\Mail\Storage\Imap
         return $this->protocol->search(array('SINCE "' . $date . '"'));
     }
 
+    public function getHeaderAndFlags($id, $part = null)
+    {
+        $data = $this->protocol->fetch(['FLAGS', 'RFC822.HEADER'], $id);
+
+        $header = $data['RFC822.HEADER'];
+
+        $flags = [];
+        foreach ($data['FLAGS'] as $flag) {
+            $flags[] = isset(static::$knownFlags[$flag]) ? static::$knownFlags[$flag] : $flag;
+        }
+
+        return array(
+            'flags' => $flags,
+            'header' => $header
+        );
+    }
+
 }
 

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

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

application/Espo/Core/Mail/MessageWrapper.php

@@ -0,0 +1,144 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Mail;
+
+use \Espo\Entities\Email;
+
+class MessageWrapper
+{
+    private $storage;
+
+    private $id;
+
+    private $rawHeader = null;
+
+    private $rawContent = null;
+
+    private $zendMessage = null;
+
+    protected $zendMessageClass = '\Zend\Mail\Storage\Message';
+
+    protected $fullRawContent = null;
+
+    protected $flagList = null;
+
+    public function __construct($storage = null, $id = null, $parser = null)
+    {
+        if ($storage) {
+            $data = $storage->getHeaderAndFlags($id);
+            $this->rawHeader = $data['header'];
+            $this->flagList = $data['flags'];
+        }
+
+        $this->id = $id;
+        $this->storage = $storage;
+        $this->parser = $parser;
+    }
+
+    public function setFullRawContent($content)
+    {
+        $this->fullRawContent = $content;
+    }
+
+    public function getRawHeader()
+    {
+        return $this->rawHeader;
+    }
+
+    public function getParser()
+    {
+        return $this->parser;
+    }
+
+    public function checkAttribute($attribute)
+    {
+        return $this->getParser()->checkMessageAttribute($this, $attribute);
+    }
+
+    public function getAttribute($attribute)
+    {
+        return $this->getParser()->getMessageAttribute($this, $attribute);
+    }
+
+    public function getRawContent()
+    {
+        if (is_null($this->rawContent)) {
+            $this->rawContent = $this->storage->getRawContent($this->id);
+        }
+
+        return $this->rawContent;
+    }
+
+    public function getFullRawContent()
+    {
+        if ($this->fullRawContent) {
+            return $this->fullRawContent;
+        }
+
+        return $this->getRawHeader() . "\n" . $this->getRawContent();
+    }
+
+    public function getZendMessage()
+    {
+        if (!$this->zendMessage) {
+            $data = array();
+            if ($this->storage) {
+                $data['handler'] = $this->storage;
+            }
+            if ($this->flagList) {
+                $data['flags'] = $this->flagList;
+            }
+            if ($this->fullRawContent) {
+                $data['raw'] = $this->fullRawContent;
+            } else {
+                if ($this->rawHeader) {
+                    $data['headers'] = $this->rawHeader;
+                }
+            }
+            if ($this->id) {
+                $data['id'] = $this->id;
+            }
+
+            $this->zendMessage = new $this->zendMessageClass($data);
+        }
+
+        return $this->zendMessage;
+    }
+
+    public function getFlags()
+    {
+        return $this->flagList;
+    }
+
+    public function isFetched()
+    {
+        return !!$this->rawHeader;
+    }
+}

application/Espo/Core/Mail/Parsers/PhpMimeMailParser.php

@@ -0,0 +1,167 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Mail\Parsers;
+
+class PhpMimeMailParser
+{
+    private $entityManager;
+
+    private $parserHash = array();
+
+    public function __construct($entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    protected function getEntityManager()
+    {
+        return $this->entityManager;
+    }
+
+    protected function getParser($message)
+    {
+        $key = spl_object_hash($message);
+        if (!array_key_exists($key, $this->parserHash)) {
+            $this->parserHash[$key] = new PhpMimeMailParser\Parser();
+            $raw = $message->getRawHeader();
+            if (!$raw) {
+                $raw = $message->getFullRawContent();
+            }
+            $this->parserHash[$key]->setText($raw);
+        }
+
+        return $this->parserHash[$key];
+    }
+
+    protected function loadContent($message)
+    {
+        $this->getParser($message);
+
+        $raw = $message->getFullRawContent();
+        $this->getParser($message)->setText($raw);
+    }
+
+    public function checkMessageAttribute($message, $attribute)
+    {
+        return $this->getParser($message)->getHeader($attribute) !== false;
+    }
+
+    public function getMessageAttribute($message, $attribute)
+    {
+        if (!$this->checkMessageAttribute($message, $attribute)) return null;
+
+        return $this->getParser($message)->getHeader($attribute);
+    }
+
+    public function getMessageMessageId($message)
+    {
+        return $this->getMessageAttribute($message, 'Message-ID');
+    }
+
+    public function getAddressListFromMessage($message, $type)
+    {
+        $addressList = [];
+        if ($this->checkMessageAttribute($message, $type)) {
+            $list = $this->getParser($message)->getAddresses($type);
+            foreach ($list as $address) {
+                $addressList[] = $address['address'];
+            }
+        }
+        return $addressList;
+    }
+
+    public function fetchContentParts(\Espo\Entities\Email $email, $message)
+    {
+        $this->loadContent($message);
+
+        $bodyPlain = $this->getParser($message)->getMessageBody('text');
+        $bodyHtml = $this->getParser($message)->getMessageBody('html');
+
+        if ($bodyHtml) {
+            $email->set('isHtml', true);
+            $email->set('body', $bodyHtml);
+            $email->set('bodyPlain', $bodyPlain);
+        } else {
+            $email->set('isHtml', false);
+            $email->set('body', $bodyPlain);
+        }
+
+        if (!$email->get('body') && $email->get('bodyPlain')) {
+            $email->set('body', $email->get('bodyPlain'));
+        }
+
+        $attachmentObjList = $this->getParser($message)->getAttachments();
+        $inlineIds = array();
+
+        foreach ($attachmentObjList as $attachmentObj) {
+            $attachment = $this->getEntityManager()->getEntity('Attachment');
+
+            $content = $attachmentObj->getContent();
+            $disposition = $attachmentObj->getContentDisposition();
+
+            $attachment = $this->getEntityManager()->getEntity('Attachment');
+            $attachment->set('name', $attachmentObj->getFileName());
+            $attachment->set('type', $attachmentObj->getContentType());
+
+            if ($disposition == 'inline') {
+                $attachment->set('role', 'Inline Attachment');
+                $contentId = $attachmentObj->getContentID();
+            } else {
+                $attachment->set('role', 'Attachment');
+            }
+
+            $attachment->set('contents', $content);
+
+            $this->getEntityManager()->saveEntity($attachment);
+
+            if ($disposition == 'attachment') {
+                $attachmentsIds = $email->get('attachmentsIds');
+                $attachmentsIds[] = $attachment->id;
+                $email->set('attachmentsIds', $attachmentsIds);
+            } else if ($disposition == 'inline') {
+                $inlineIds[$contentId] = $attachment->id;
+            }
+        }
+
+        $body = $email->get('body');
+
+        if (!empty($body)) {
+            foreach ($inlineIds as $cid => $attachmentId) {
+                if (strpos($body, 'cid:' . $cid) !== false) {
+                    $body = str_replace('cid:' . $cid, '?entryPoint=attachment&amp;id=' . $attachmentId, $body);
+                } else {
+                    $email->addLinkMultipleId('attachments', $attachmentId);
+                }
+            }
+            $email->set('body', $body);
+        }
+    }
+}
+

application/Espo/Core/Mail/Parsers/PhpMimeMailParser/Parser.php

@@ -0,0 +1,89 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Mail\Parsers\PhpMimeMailParser;
+
+use \PhpMimeMailParser\Attachment;
+
+class Parser extends \PhpMimeMailParser\Parser
+{
+    public function getAttachments()
+    {
+        $attachments = [];
+        $dispositions = ['attachment', 'inline'];
+        $non_attachment_types = ['text/plain', 'text/html'];
+        $nonameIter = 0;
+
+        foreach ($this->parts as $part) {
+            $disposition = $this->getPart('content-disposition', $part);
+            $filename = 'noname';
+
+            if (isset($part['disposition-filename'])) {
+                $filename = $this->decodeHeader($part['disposition-filename']);
+            } elseif (isset($part['content-name'])) {
+                // if we have no disposition but we have a content-name, it's a valid attachment.
+                // we simulate the presence of an attachment disposition with a disposition filename
+                $filename = $this->decodeHeader($part['content-name']);
+                if (!$disposition) {
+                    $disposition = 'attachment';
+                }
+            } elseif (!in_array($part['content-type'], $non_attachment_types, true)
+                && substr($part['content-type'], 0, 10) !== 'multipart/'
+                ) {
+                // if we cannot get it by getMessageBody(), we assume it is an attachment
+                $disposition = 'attachment';
+            }
+
+            if (in_array($disposition, $dispositions) === true && isset($filename) === true) {
+                if ($filename == 'noname') {
+                    $nonameIter++;
+                    $filename = 'noname'.$nonameIter;
+                }
+
+                $headersAttachments = $this->getPart('headers', $part);
+                $contentidAttachments = $this->getPart('content-id', $part);
+
+                $mimePartStr = $this->getPartComplete($part);
+
+                $attachments[] = new Attachment(
+                    $filename,
+                    $this->getPart('content-type', $part),
+                    $this->getAttachmentStream($part),
+                    $disposition,
+                    $contentidAttachments,
+                    $headersAttachments,
+                    $mimePartStr
+                );
+            }
+        }
+
+        return $attachments;
+    }
+}
+

application/Espo/Core/Mail/Parsers/ZendMail.php

@@ -0,0 +1,349 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Mail\Parsers;
+
+class ZendMail
+{
+    private $entityManager;
+
+    public function __construct($entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    protected function getEntityManager()
+    {
+        return $this->entityManager;
+    }
+
+    public function checkMessageAttribute($message, $attribute)
+    {
+        $zendMessage = $message->getZendMessage();
+
+        return isset($zendMessage->$attribute);
+    }
+
+    public function getMessageAttribute($message, $attribute)
+    {
+        $zendMessage = $message->getZendMessage();
+
+        if (!isset($zendMessage->$attribute)) return null;
+
+        return $zendMessage->$attribute;
+    }
+
+    public function getMessageMessageId($message)
+    {
+        $zendMessage = $message->getZendMessage();
+
+        if (!isset($zendMessage->messageId)) return null;
+
+        $messageId = $zendMessage->messageId;
+        $messageId = str_replace('<<', '<', $messageId);
+        $messageId = str_replace('>>', '>', $messageId);
+
+        return $messageId;
+    }
+
+    public function getAddressListFromMessage($message, $type)
+    {
+        $zendMessage = $message->getZendMessage();
+
+        $addressList = array();
+        if (isset($zendMessage->$type)) {
+            $list = $this->normilizeHeader($zendMessage->getHeader($type))->getAddressList();
+            foreach ($list as $address) {
+                $addressList[] = $address->getEmail();
+            }
+        }
+        return $addressList;
+    }
+
+    public function fetchContentParts(\Espo\Entities\Email $email, $message)
+    {
+        $zendMessage = $message->getZendMessage();
+
+        $inlineIds = array();
+
+        if ($zendMessage->isMultipart()) {
+            foreach (new \RecursiveIteratorIterator($zendMessage) as $part) {
+                $this->importPartDataToEmail($email, $part, $inlineIds);
+            }
+        } else {
+            $this->importPartDataToEmail($email, $zendMessage, $inlineIds, 'text/plain');
+        }
+
+        if (!$email->get('body') && $email->get('bodyPlain')) {
+            $email->set('body', $email->get('bodyPlain'));
+        }
+
+        $body = $email->get('body');
+        if (!empty($body)) {
+            foreach ($inlineIds as $cid => $attachmentId) {
+                if (strpos($body, 'cid:' . $cid) !== false) {
+                    $body = str_replace('cid:' . $cid, '?entryPoint=attachment&amp;id=' . $attachmentId, $body);
+                } else {
+                    $email->addLinkMultipleId('attachments', $attachmentId);
+                }
+            }
+            $email->set('body', $body);
+        }
+    }
+
+    protected function importPartDataToEmail(\Espo\Entities\Email $email, $part, &$inlineIds = array(), $defaultContentType = null)
+    {
+        try {
+            $type = null;
+
+            if ($part->getHeaders() && isset($part->contentType)) {
+                $type = strtok($part->contentType, ';');
+            }
+
+            $contentDisposition = false;
+            if (isset($part->ContentDisposition)) {
+                if (strpos(strtolower($part->ContentDisposition), 'attachment') === 0) {
+                    $contentDisposition = 'attachment';
+                } else if (strpos(strtolower($part->ContentDisposition), 'inline') === 0) {
+                    $contentDisposition = 'inline';
+                }
+            } else if (isset($part->contentID)) {
+                $contentDisposition = 'inline';
+            }
+
+            if (empty($type)) {
+                if (!empty($defaultContentType)) {
+                    $type = $defaultContentType;
+                } else {
+                    return;
+                }
+            }
+
+            $encoding = null;
+            $isAttachment = true;
+            if ($type == 'text/plain' || $type == 'text/html') {
+                if ($contentDisposition !== 'attachment') {
+                    $isAttachment = false;
+                    $content = $this->getContentFromPart($part);
+                    if ($type == 'text/plain') {
+                        $bodyPlain = '';
+                        if ($email->get('bodyPlain')) {
+                            $bodyPlain .= $email->get('bodyPlain') . "\n";
+                        }
+                        $bodyPlain .= $content;
+                        $email->set('bodyPlain', $bodyPlain);
+                    } else if ($type == 'text/html') {
+                        $body = '';
+                        if ($email->get('body')) {
+                            $body .= $email->get('body') . "<br>";
+                        }
+                        $body .= $content;
+                        $email->set('isHtml', true);
+                        $email->set('body', $body);
+                    }
+                }
+            }
+
+            if ($isAttachment) {
+                $content = $part->getContent();
+
+                $disposition = null;
+
+                $fileName = null;
+                $contentId = null;
+
+                if ($contentDisposition) {
+                    if ($contentDisposition === 'attachment') {
+                        $fileName = $this->fetchFileNameFromContentDisposition($part->ContentDisposition);
+                        if ($fileName) {
+                            $disposition = 'attachment';
+                        }
+                    } else if ($contentDisposition ===  'inline') {
+                        if (isset($part->contentID)) {
+                            $contentId = trim($part->contentID, '<>');
+                            $fileName = $contentId;
+                            $disposition = 'inline';
+                        } else {
+                            // for iOS attachments
+                            if (empty($fileName)) {
+                                $fileName = $this->fetchFileNameFromContentDisposition($part->ContentDisposition);
+                                if ($fileName) {
+                                    $disposition = 'attachment';
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (isset($part->contentTransferEncoding)) {
+                    $encoding = strtolower($this->normilizeHeader($part->getHeader('Content-Transfer-Encoding'))->getTransferEncoding());
+                }
+
+                $attachment = $this->getEntityManager()->getEntity('Attachment');
+                $attachment->set('name', $fileName);
+                $attachment->set('type', $type);
+
+                if ($disposition == 'inline') {
+                    $attachment->set('role', 'Inline Attachment');
+                } else {
+                    $attachment->set('role', 'Attachment');
+                }
+
+                if ($encoding == 'base64') {
+                    $content = base64_decode($content);
+                }
+
+                $attachment->set('contents', $content);
+
+                $this->getEntityManager()->saveEntity($attachment);
+
+                if ($disposition == 'attachment') {
+                    $attachmentsIds = $email->get('attachmentsIds');
+                    $attachmentsIds[] = $attachment->id;
+                    $email->set('attachmentsIds', $attachmentsIds);
+                } else if ($disposition == 'inline') {
+                    $inlineIds[$contentId] = $attachment->id;
+                }
+            }
+        } catch (\Exception $e) {}
+    }
+
+    protected function getContentFromPart($part)
+    {
+        if ($part instanceof \Zend\Mime\Part) {
+            $content = $part->getRawContent();
+            if (strtolower($part->charset) != 'utf-8') {
+                $content = mb_convert_encoding($content, 'UTF-8', $part->charset);
+            }
+        } else {
+            $content = $part->getContent();
+
+            $encoding = null;
+
+            if (isset($part->contentTransferEncoding)) {
+                $cteHeader = $this->normilizeHeader($part->getHeader('Content-Transfer-Encoding'));
+                $encoding = strtolower($cteHeader->getTransferEncoding());
+            }
+
+            if ($encoding == 'base64') {
+                $content = base64_decode($content);
+            }
+
+            $charset = 'UTF-8';
+
+            if (isset($part->contentType)) {
+                $ctHeader = $this->normilizeHeader($part->getHeader('Content-Type'));
+                $charsetParamValue = $ctHeader->getParameter('charset');
+                if (!empty($charsetParamValue)) {
+                    $charset = strtoupper($charsetParamValue);
+                }
+            }
+
+            if (isset($part->contentTransferEncoding)) {
+                $cteHeader = $this->normilizeHeader($part->getHeader('Content-Transfer-Encoding'));
+                if ($cteHeader->getTransferEncoding() == 'quoted-printable') {
+                    $content = quoted_printable_decode($content);
+                }
+            }
+
+            if ($charset !== 'UTF-8') {
+                $content = mb_convert_encoding($content, 'UTF-8', $charset);
+            }
+        }
+        return $content;
+    }
+
+    protected function normilizeHeader($header)
+    {
+        if (is_a($header, 'ArrayIterator')) {
+            return $header->current();
+        } else {
+            return $header;
+        }
+    }
+
+    protected function fetchFileNameFromContentDisposition($contentDisposition)
+    {
+        $contentDisposition = preg_replace('/\\\\"/', "{{_!Q!U!O!T!E!_}}", $contentDisposition);
+
+        $fileName = false;
+        $m = array();
+
+        if (preg_match('/filename="([^"]+)";?/i', $contentDisposition, $m)) {
+            $fileName = $m[1];
+        } else if (preg_match('/filename=([^";]+);?/i', $contentDisposition, $m)) {
+            $fileName = $m[1];
+        } else if (preg_match('/filename\*="([^"]+)";?/i', $contentDisposition, $m)) {
+            $fileName = $m[1];
+            $fileName = $this->decodeAttachmentFileName($fileName);
+        } else if (preg_match('/filename\*=([^";]+);?/i', $contentDisposition, $m)) {
+            $fileName = $m[1];
+            $fileName = $this->decodeAttachmentFileName($fileName);
+        } else {
+            $fileName = '';
+            foreach (['0', '1'] as $i) {
+                if (preg_match('/filename\*'.$i.'[\*]?="([^"]+)";?/i', $contentDisposition, $m)) {
+                    $part = $m[1];
+                    $fileName .= $part;
+                } else if (preg_match('/filename\*'.$i.'[\*]?=([^";]+);?/i', $contentDisposition, $m)) {
+                    $part = $m[1];
+                    $fileName .= $part;
+                }
+            }
+
+            if ($fileName === '') {
+                $fileName = null;
+            } else {
+                $fileName = $this->decodeAttachmentFileName($fileName);
+            }
+        }
+
+        if ($fileName) {
+            $fileName = str_replace('{{_!Q!U!O!T!E!_}}', '"', $fileName);
+        }
+
+        return $fileName;
+    }
+
+    protected function decodeAttachmentFileName($fileName)
+    {
+        if ($fileName && stripos($fileName, "''") !== false) {
+            list($encoding, $fileName) = explode("''", $fileName);
+            $fileName = rawurldecode($fileName);
+            if (strtoupper($encoding) !== 'UTF-8') {
+                if ($encoding) {
+                    $fileName = mb_convert_encoding($fileName, 'UTF-8', $encoding);
+                }
+            }
+        }
+        return $fileName;
+    }
+
+}
+

application/Espo/Core/Mail/Sender.php

@@ -104,10 +104,10 @@ class Sender
             $opts['connection_config']['ssl'] = strtolower($params['security']);
         }
 
-        if (in_array('fromName', $params)) {
+        if (array_key_exists('fromName', $params)) {
             $this->params['fromName'] = $params['fromName'];
         }
-        if (in_array('fromAddress', $params)) {
+        if (array_key_exists('fromAddress', $params)) {
             $this->params['fromAddress'] = $params['fromAddress'];
         }
 
@@ -151,7 +151,7 @@ class Sender
         return $this;
     }
 
-    public function send(Email $email, $params = array(), &$message = null, $attachmetList = [])
+    public function send(Email $email, $params = array(), &$message = null, $attachmentList = [])
     {
         if (!$message) {
             $message = new Message();
@@ -190,6 +190,10 @@ class Sender
             $email->set('from', $fromAddress);
         }
 
+        $sender = new \Zend\Mail\Header\Sender();
+        $sender->setAddress($email->get('from'));
+        $message->getHeaders()->addHeader($sender);
+
         if (!empty($params['replyToAddress'])) {
             $replyToName = null;
             if (!empty($params['replyToName'])) {
@@ -242,7 +246,7 @@ class Sender
         $attachmentCollection = $email->get('attachments');
         $attachmentInlineCollection = $email->getInlineAttachments();
 
-        foreach ($attachmetList as $attachment) {
+        foreach ($attachmentList as $attachment) {
             $attachmentCollection[] = $attachment;
         }
 
@@ -340,15 +344,12 @@ class Sender
         $message->setEncoding('UTF-8');
 
         try {
-            $rand = mt_rand(1000, 9999);
-
-            if ($email->get('parentType') && $email->get('parentId')) {
-                $messageId = '' . $email->get('parentType') .'/' . $email->get('parentId') . '/' . time() . '/' . $rand . '@espo';
+            $messageId = $email->get('messageId');
+            if (empty($messageId) || !is_string($messageId) || strlen($messageId) < 4) {
+                $messageId = $this->generateMessageId($email);
+                $email->set('messageId', '<' . $messageId . '>');
             } else {
-                $messageId = '' . md5($email->get('name')) . '/' . time() . '/' . $rand .  '@espo';
-            }
-            if ($email->get('isSystem')) {
-                $messageId .= '-system';
+                $messageId = substr($messageId, 1, strlen($messageId) - 2);
             }
 
             $messageIdHeader = new \Zend\Mail\Header\MessageId();
@@ -357,7 +358,6 @@ class Sender
 
             $this->transport->send($message);
 
-            $email->set('messageId', '<' . $messageId . '>');
             $email->set('status', 'Sent');
             $email->set('dateSent', date("Y-m-d H:i:s"));
         } catch (\Exception $e) {
@@ -366,5 +366,21 @@ class Sender
 
         $this->useGlobal();
     }
+
+    static public function generateMessageId(Email $email)
+    {
+        $rand = mt_rand(1000, 9999);
+
+        if ($email->get('parentType') && $email->get('parentId')) {
+            $messageId = '' . $email->get('parentType') .'/' . $email->get('parentId') . '/' . time() . '/' . $rand . '@espo';
+        } else {
+            $messageId = '' . md5($email->get('name')) . '/' . time() . '/' . $rand .  '@espo';
+        }
+        if ($email->get('isSystem')) {
+            $messageId .= '-system';
+        }
+
+        return $messageId;
+    }
 }
 

application/Espo/Core/Notificators/Base.php

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

application/Espo/Core/ORM/Entity.php

@@ -31,6 +31,15 @@ namespace Espo\Core\ORM;
 
 class Entity extends \Espo\ORM\Entity
 {
+    public function hasLinkMultipleField($field)
+    {
+        return $this->hasAttribute($field . 'Ids');
+    }
+
+    public function hasLinkField($field)
+    {
+        return $this->hasAttribute($field . 'Id');
+    }
 
     public function loadLinkMultipleField($field, $columns = null)
     {
@@ -105,7 +114,27 @@ class Entity extends \Espo\ORM\Entity
                 }
             }
         }
+    }
 
+    public function setLinkMultipleColumn($field, $column, $id, $value)
+    {
+        $columnsField = $field . 'Columns';
+        if (!$this->hasField($columnsField)) {
+            return;
+        }
+        $object = $this->get($columnsField);
+        if (!isset($object) || !($object instanceof \StdClass)) {
+            $object = (object) [];
+        }
+        if (!isset($object->$id)) {
+            $object->$id = (object) [];
+        }
+        if (!isset($object->$id->$column)) {
+            $object->$id->$column = (object) [];
+        }
+
+        $object->$id->$column = $value;
+        $this->set($columnsField, $object);
     }
 
     public function setLinkMultipleIdList($field, array $idList)

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

@@ -52,6 +52,13 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
         $this->dependencies[] = $name;
     }
 
+    protected function addDependencyList(array $list)
+    {
+        foreach ($list as $item) {
+            $this->addDependency($item);
+        }
+    }
+
     public function inject($name, $object)
     {
         $this->injections[$name] = $object;
@@ -72,6 +79,16 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
         return $this->getInjection('metadata');
     }
 
+    public function __construct($entityType, EntityManager $entityManager, EntityFactory $entityFactory)
+    {
+        parent::__construct($entityType, $entityManager, $entityFactory);
+        $this->init();
+    }
+
+    protected function init()
+    {
+    }
+
     public function handleSelectParams(&$params)
     {
         $this->handleEmailAddressParams($params);
@@ -81,7 +98,7 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 
     protected function handleCurrencyParams(&$params)
     {
-        $entityName = $this->entityName;
+        $entityType = $this->entityType;
 
         $metadata = $this->getMetadata();
 
@@ -89,7 +106,7 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
             return;
         }
 
-        $defs = $metadata->get('entityDefs.' . $entityName);
+        $defs = $metadata->get('entityDefs.' . $entityType);
 
         foreach ($defs['fields'] as $field => $d) {
             if (isset($d['type']) && $d['type'] == 'currency') {
@@ -101,7 +118,7 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
                 }
                 $alias = Util::toUnderScore($field) . "_currency_alias";
                 $params['customJoin'] .= "
-                    LEFT JOIN currency AS `{$alias}` ON {$alias}.id = ".Util::toUnderScore($entityName).".".Util::toUnderScore($field)."_currency
+                    LEFT JOIN currency AS `{$alias}` ON {$alias}.id = ".Util::toUnderScore($entityType).".".Util::toUnderScore($field)."_currency
                 ";
             }
         }
@@ -110,9 +127,9 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 
     protected function handleEmailAddressParams(&$params)
     {
-        $entityName = $this->entityName;
+        $entityType = $this->entityType;
 
-        $defs = $this->getEntityManager()->getMetadata()->get($entityName);
+        $defs = $this->getEntityManager()->getMetadata()->get($entityType);
         if (!empty($defs['relations']) && array_key_exists('emailAddresses', $defs['relations'])) {
             if (empty($params['leftJoins'])) {
                 $params['leftJoins'] = array();
@@ -132,9 +149,9 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 
     protected function handlePhoneNumberParams(&$params)
     {
-        $entityName = $this->entityName;
+        $entityType = $this->entityType;
 
-        $defs = $this->getEntityManager()->getMetadata()->get($entityName);
+        $defs = $this->getEntityManager()->getMetadata()->get($entityType);
         if (!empty($defs['relations']) && array_key_exists('phoneNumbers', $defs['relations'])) {
             if (empty($params['leftJoins'])) {
                 $params['leftJoins'] = array();
@@ -155,7 +172,7 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
     protected function beforeRemove(Entity $entity, array $options = array())
     {
         parent::beforeRemove($entity, $options);
-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeRemove', $entity, $options);
+        $this->getEntityManager()->getHookManager()->process($this->entityType, 'beforeRemove', $entity, $options);
 
         $nowString = date('Y-m-d H:i:s', time());
         if ($entity->hasAttribute('modifiedAt')) {
@@ -169,23 +186,52 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
     protected function afterRemove(Entity $entity, array $options = array())
     {
         parent::afterRemove($entity, $options);
-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'afterRemove', $entity, $options);
+        $this->getEntityManager()->getHookManager()->process($this->entityType, 'afterRemove', $entity, $options);
     }
 
     public function remove(Entity $entity, array $options = array())
     {
         $result = parent::remove($entity, $options);
         if ($result) {
-            $this->getEntityManager()->getHookManager()->process($this->entityName, 'afterRemove', $entity, $options);
+            $this->getEntityManager()->getHookManager()->process($this->entityType, 'afterRemove', $entity, $options);
         }
         return $result;
     }
 
+    protected function afterRelate(Entity $entity, $relationName, $foreign, $data = null, array $options = array())
+    {
+        parent::afterRelate($entity, $relationName, $foreign, $data, $options);
+
+        if ($foreign instanceof Entity) {
+            $foreignEntity = $foreign;
+            $hookData = array(
+                'relationName' => $relationName,
+                'relationData' => $data,
+                'foreignEntity' => $foreignEntity
+            );
+            $this->getEntityManager()->getHookManager()->process($this->entityType, 'afterRelate', $entity, $options, $hookData);
+        }
+    }
+
+    protected function afterUnrelate(Entity $entity, $relationName, $foreign, array $options = array())
+    {
+        parent::afterUnrelate($entity, $relationName, $foreign, $options);
+
+        if ($foreign instanceof Entity) {
+            $foreignEntity = $foreign;
+            $hookData = array(
+                'relationName' => $relationName,
+                'foreignEntity' => $foreignEntity
+            );
+            $this->getEntityManager()->getHookManager()->process($this->entityType, 'afterUnrelate', $entity, $options, $hookData);
+        }
+    }
+
     protected function beforeSave(Entity $entity, array $options = array())
     {
         parent::beforeSave($entity, $options);
 
-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeSave', $entity, $options);
+        $this->getEntityManager()->getHookManager()->process($this->entityType, 'beforeSave', $entity, $options);
     }
 
     protected function afterSave(Entity $entity, array $options = array())
@@ -196,12 +242,12 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
         }
         parent::afterSave($entity, $options);
 
-        $this->handleEmailAddressSave($entity);
-        $this->handlePhoneNumberSave($entity);
-        $this->handleSpecifiedRelations($entity);
-        $this->handleFileFields($entity);
+        $this->processEmailAddressSave($entity);
+        $this->processPhoneNumberSave($entity);
+        $this->processSpecifiedRelationsSave($entity);
+        $this->processFileFieldsSave($entity);
 
-        $this->getEntityManager()->getHookManager()->process($this->entityName, 'afterSave', $entity, $options);
+        $this->getEntityManager()->getHookManager()->process($this->entityType, 'afterSave', $entity, $options);
     }
 
     public function save(Entity $entity, array $options = array())
@@ -215,40 +261,54 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
             }
 
             if ($entity->hasAttribute('createdAt')) {
-                $entity->set('createdAt', $nowString);
+                if (empty($options['import']) || !$entity->has('createdAt')) {
+                    $entity->set('createdAt', $nowString);
+                }
             }
             if ($entity->hasAttribute('modifiedAt')) {
                 $entity->set('modifiedAt', $nowString);
             }
             if ($entity->hasAttribute('createdById')) {
-                $entity->set('createdById', $this->entityManager->getUser()->id);
+                if (empty($options['import']) || !$entity->has('createdById')) {
+                    $entity->set('createdById', $this->getEntityManager()->getUser()->id);
+                }
             }
 
             if ($entity->has('modifiedById')) {
                 $restoreData['modifiedById'] = $entity->get('modifiedById');
             }
+            if ($entity->has('modifiedByName')) {
+                $restoreData['modifiedByName'] = $entity->get('modifiedByName');
+            }
             if ($entity->has('modifiedAt')) {
                 $restoreData['modifiedAt'] = $entity->get('modifiedAt');
             }
             $entity->clear('modifiedById');
+            $entity->clear('modifiedByName');
         } else {
             if (empty($options['silent'])) {
                 if ($entity->hasAttribute('modifiedAt')) {
                     $entity->set('modifiedAt', $nowString);
                 }
                 if ($entity->hasAttribute('modifiedById')) {
-                    $entity->set('modifiedById', $this->entityManager->getUser()->id);
+                    $entity->set('modifiedById', $this->getEntityManager()->getUser()->id);
+                    $entity->set('modifiedByName', $this->getEntityManager()->getUser()->get('name'));
                 }
             }
 
             if ($entity->has('createdById')) {
-                $restoreData['createdById'] = $entity->get('createdById');
+                if (empty($options['import'])) {
+                    $restoreData['createdById'] = $entity->get('createdById');
+                    $entity->clear('createdById');
+                }
             }
+
             if ($entity->has('createdAt')) {
-                $restoreData['createdAt'] = $entity->get('createdAt');
+                if (empty($options['import'])) {
+                    $restoreData['createdAt'] = $entity->get('createdAt');
+                    $entity->clear('createdAt');
+                }
             }
-            $entity->clear('createdById');
-            $entity->clear('createdAt');
         }
         $this->restoreData = $restoreData;
 
@@ -257,7 +317,7 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
         return $result;
     }
 
-    protected function handleFileFields(Entity $entity)
+    protected function processFileFieldsSave(Entity $entity)
     {
         foreach ($entity->getRelations() as $name => $defs) {
             if (!isset($defs['type']) || !isset($defs['entity'])) continue;
@@ -278,23 +338,22 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
         }
     }
 
-    protected function handleEmailAddressSave(Entity $entity)
+    protected function processEmailAddressSave(Entity $entity)
     {
         if ($entity->hasRelation('emailAddresses') && $entity->hasAttribute('emailAddress')) {
             $emailAddressRepository = $this->getEntityManager()->getRepository('EmailAddress')->storeEntityEmailAddress($entity);
         }
     }
 
-    protected function handlePhoneNumberSave(Entity $entity)
+    protected function processPhoneNumberSave(Entity $entity)
     {
         if ($entity->hasRelation('phoneNumbers') && $entity->hasAttribute('phoneNumber')) {
             $emailAddressRepository = $this->getEntityManager()->getRepository('PhoneNumber')->storeEntityPhoneNumber($entity);
         }
     }
 
-    protected function handleSpecifiedRelations(Entity $entity)
+    protected function processSpecifiedRelationsSave(Entity $entity)
     {
-
         $relationTypeList = [$entity::HAS_MANY, $entity::MANY_MANY, $entity::HAS_CHILDREN];
         foreach ($entity->getRelations() as $name => $defs) {
             if (in_array($defs['type'], $relationTypeList)) {
@@ -358,15 +417,16 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
                             } else {
                                 if (!empty($columns)) {
                                     foreach ($columns as $columnName => $columnField) {
-                                        if ($columnData->$id->$columnName != $existingColumnsData->$id->$columnName) {
-                                            $toUpdateIds[] = $id;
+                                        if (isset($columnData->$id)) {
+                                            if ($columnData->$id->$columnName !== $existingColumnsData->$id->$columnName) {
+                                                $toUpdateIds[] = $id;
+                                            }
                                         }
                                     }
                                 }
                             }
                         }
 
-
                         foreach ($specifiedIds as $id) {
                             if (!in_array($id, $existingIds)) {
                                 $data = null;

application/Espo/Core/ORM/Repository.php

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

application/Espo/Core/Pdf/Tcpdf.php

@@ -29,7 +29,7 @@
 
 namespace Espo\Core\Pdf;
 
-require "vendor/tecnick.com/tcpdf/tcpdf.php";
+require "vendor/tecnickcom/tcpdf/tcpdf.php";
 
 class Tcpdf extends \TCPDF
 {

application/Espo/Core/Portal/AclManager.php

@@ -37,6 +37,10 @@ class AclManager extends \Espo\Core\AclManager
 {
     protected $tableClassName = '\\Espo\\Core\\AclPortal\\Table';
 
+    private $mainManager = null;
+
+    private $portal = null;
+
     public function getImplementation($scope)
     {
         if (empty($this->implementationHashMap[$scope])) {
@@ -70,6 +74,29 @@ class AclManager extends \Espo\Core\AclManager
         return $this->implementationHashMap[$scope];
     }
 
+    public function setMainManager($mainManager)
+    {
+        $this->mainManager = $mainManager;
+    }
+
+    protected function getMainManager()
+    {
+        return $this->mainManager;
+    }
+
+    public function setPortal($portal)
+    {
+        $this->portal = $portal;
+    }
+
+    protected function getPortal()
+    {
+        if ($this->portal) {
+            return $this->portal;
+        }
+        return $this->getContainer()->get('portal');
+    }
+
     protected function getTable(User $user)
     {
         $key = $user->id;
@@ -82,7 +109,7 @@ class AclManager extends \Espo\Core\AclManager
             $fileManager = $this->getContainer()->get('fileManager');
             $metadata = $this->getContainer()->get('metadata');
             $fieldManager = $this->getContainer()->get('fieldManager');
-            $portal = $this->getContainer()->get('portal');
+            $portal = $this->getPortal();
 
             $this->tableHashMap[$key] = new $this->tableClassName($user, $portal, $config, $fileManager, $metadata, $fieldManager);
         }
@@ -118,5 +145,116 @@ class AclManager extends \Espo\Core\AclManager
         return $this->getImplementation($entity->getEntityType())->checkIsOwnContact($user, $entity);
     }
 
+    public function getMap(User $user)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->getMap($user);
+        }
+        return parent::getMap($user);
+    }
+
+    public function getLevel(User $user, $scope, $action)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->getLevel($user, $scope, $action);
+        }
+        return parent::getLevel($user, $scope, $action);
+    }
+
+    public function get(User $user, $permission)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->get($user, $permission);
+        }
+        return parent::get($user, $permission);
+    }
+
+    public function checkReadOnlyTeam(User $user, $scope)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            $data = $this->getTable($user)->getScopeData($scope);
+            return $this->getMainManager()->checkReadOnlyTeam($user, $data);
+        }
+        return parent::checkReadOnlyTeam($user, $scope);
+    }
+
+    public function checkReadOnlyOwn(User $user, $scope)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            $data = $this->getTable($user)->getScopeData($scope);
+            return $this->getMainManager()->checkReadOnlyOwn($user, $data);
+        }
+        return parent::checkReadOnlyOwn($user, $scope);
+    }
+
+    public function check(User $user, $subject, $action = null)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->check($user, $subject, $action);
+        }
+        return parent::check($user, $subject, $action);
+    }
+
+    public function checkEntity(User $user, Entity $entity, $action = 'read')
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkEntity($user, $entity, $action);
+        }
+        return parent::checkEntity($user, $entity, $action);
+    }
+
+    public function checkIsOwner(User $user, Entity $entity)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkIsOwner($user, $entity);
+        }
+        return parent::checkIsOwner($user, $entity);
+    }
+
+    public function checkInTeam(User $user, Entity $entity)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkInTeam($user, $entity);
+        }
+        return parent::checkInTeam($user, $entity);
+    }
+
+    public function checkScope(User $user, $scope, $action = null)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkScope($user, $scope, $action);
+        }
+        return parent::checkScope($user, $scope, $action);
+    }
+
+    public function checkUser(User $user, $permission, User $entity)
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->checkUser($user, $permission, $entity);
+        }
+        return parent::checkUser($user, $permission, $entity);
+    }
+
+    public function getScopeForbiddenAttributeList(User $user, $scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->getScopeForbiddenAttributeList($user, $scope, $action, $thresholdLevel);
+        }
+        return parent::getScopeForbiddenAttributeList($user, $scope, $action, $thresholdLevel);
+    }
+
+    public function getScopeForbiddenFieldList(User $user, $scope, $action = 'read', $thresholdLevel = 'no')
+    {
+        if ($this->checkUserIsNotPortal($user)) {
+            return $this->getMainManager()->getScopeForbiddenFieldList($user, $scope, $action, $thresholdLevel);
+        }
+        return parent::getScopeForbiddenFieldList($user, $scope, $action, $thresholdLevel);
+    }
+
+    protected function checkUserIsNotPortal($user)
+    {
+        return !$user->get('isPortalUser');
+    }
+
 }
 

application/Espo/Core/Portal/Application.php

@@ -49,6 +49,12 @@ class Application extends \Espo\Core\Application
 
         $portal = $this->getContainer()->get('entityManager')->getEntity('Portal', $portalId);
 
+        if (!$portal) {
+            $portal = $this->getContainer()->get('entityManager')->getRepository('Portal')->where(array(
+                'customId' => $portalId
+            ))->findOne();
+        }
+
         if (!$portal) {
             throw new NotFound();
         }

application/Espo/Core/Portal/Container.php

@@ -38,12 +38,27 @@ class Container extends \Espo\Core\Container
         return $className;
     }
 
+    protected function getServiceMainClassName($name, $default)
+    {
+        $metadata = $this->get('metadata');
+        $className = $metadata->get('app.serviceContainer.classNames.' . $name, $default);
+        return $className;
+    }
+
     protected function loadAclManager()
     {
         $className = $this->getServiceClassName('aclManager', '\\Espo\\Core\\Portal\\AclManager');
-        return new $className(
+        $mainClassName = $this->getServiceMainClassName('aclManager', '\\Espo\\Core\\AclManager');
+
+        $obj = new $className(
             $this->get('container')
         );
+        $objMain = new $mainClassName(
+            $this->get('container')
+        );
+        $obj->setMainManager($objMain);
+
+        return $obj;
     }
 
     protected function loadAcl()
@@ -76,10 +91,10 @@ class Container extends \Espo\Core\Container
     protected function loadLanguage()
     {
         $language = new \Espo\Core\Portal\Utils\Language(
+            \Espo\Core\Utils\Language::detectLanguage($this->get('config'), $this->get('preferences')),
             $this->get('fileManager'),
-            $this->get('config'),
             $this->get('metadata'),
-            $this->get('preferences')
+            $this->get('useCache')
         );
         $language->setPortal($this->get('portal'));
         return $language;

application/Espo/Core/Portal/Utils/Language.php

@@ -33,7 +33,6 @@ use \Espo\Entities\Portal;
 
 class Language extends \Espo\Core\Utils\Language
 {
-
     public function setPortal($portal)
     {
         if ($portal->get('language') !== '' && $portal->get('language')) {

application/Espo/Core/Repositories/Event.php

@@ -0,0 +1,174 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Repositories;
+
+use Espo\ORM\Entity;
+use Espo\Core\Utils\Util;
+
+class Event extends \Espo\Core\ORM\Repositories\RDB
+{
+    protected $reminderDateAttribute = 'dateStart';
+
+    protected function afterRemove(Entity $entity, array $options = array())
+    {
+        $pdo = $this->getEntityManager()->getPDO();
+        $sql = "
+            DELETE FROM `reminder`
+            WHERE
+                entity_id = ".$pdo->quote($entity->id)." AND
+                entity_type = ".$pdo->quote($entity->getEntityType())." AND
+                deleted = 0
+        ";
+        $pdo->query($sql);
+    }
+
+    protected function afterSave(Entity $entity, array $options = array())
+    {
+        parent::afterSave($entity, $options);
+
+        if (
+            $entity->isNew() ||
+            $entity->isAttributeChanged('assignedUserId') ||
+            $entity->isAttributeChanged('usersIds') ||
+            $entity->isAttributeChanged($this->reminderDateAttribute) ||
+            $entity->has('reminders')
+        ) {
+            $pdo = $this->getEntityManager()->getPDO();
+
+            $reminderTypeList = $this->getMetadata()->get('entityDefs.Reminder.fields.type.options');
+
+            if (!$entity->has('reminders')) {
+                $reminderList = $this->getEntityReminderList($entity);
+            } else {
+                $reminderList = $entity->get('reminders');
+            }
+
+            if (!$entity->isNew()) {
+                $sql = "
+                    DELETE FROM `reminder`
+                    WHERE
+                        entity_id = ".$pdo->quote($entity->id)." AND
+                        entity_type = ".$pdo->quote($entity->getEntityType())." AND
+                        deleted = 0
+                ";
+                $pdo->query($sql);
+            }
+
+            if (empty($reminderList) || !is_array($reminderList)) return;
+
+            $entityType = $entity->getEntityType();
+
+            $dateValue = $entity->get($this->reminderDateAttribute);
+
+            if (!$dateValue) {
+                $e = $this->get($entity->id);
+                if ($e) {
+                    $dateValue = $e->get($this->reminderDateAttribute);
+                }
+            }
+
+            if ($entity->hasLinkMultipleField('users')) {
+                $userIdList = $entity->getLinkMultipleIdList('users');
+            } else {
+                $userIdList = [];
+                if ($entity->get('assignedUserId')) {
+                    $userIdList[] = $entity->get('assignedUserId');
+                }
+            }
+
+            if (!$dateValue) return;
+            if (empty($userIdList)) return;
+
+            $dateValueObj = new \DateTime($dateValue);
+            if (!$dateValueObj) return;
+
+            foreach ($reminderList as $item) {
+                $remindAt = clone $dateValueObj;
+                $seconds = intval($item->seconds);
+                $type = $item->type;
+
+                if (!in_array($type , $reminderTypeList)) continue;
+
+                $remindAt->sub(new \DateInterval('PT' . $seconds . 'S'));
+
+                foreach ($userIdList as $userId) {
+                    $id = Util::generateId();
+
+                    $sql = "
+                        INSERT
+                        INTO `reminder`
+                        (id, entity_id, entity_type, `type`, user_id, remind_at, start_at, `seconds`)
+                        VALUES (
+                            ".$pdo->quote($id).",
+                            ".$pdo->quote($entity->id).",
+                            ".$pdo->quote($entityType).",
+                            ".$pdo->quote($type).",
+                            ".$pdo->quote($userId).",
+                            ".$pdo->quote($remindAt->format('Y-m-d H:i:s')).",
+                            ".$pdo->quote($dateValue).",
+                            ".$pdo->quote($seconds)."
+                        )
+                    ";
+                    $pdo->query($sql);
+                }
+            }
+        }
+    }
+
+    public function getEntityReminderList(Entity $entity)
+    {
+        $pdo = $this->getEntityManager()->getPDO();
+        $reminderList = [];
+
+        $sql = "
+            SELECT DISTINCT `seconds`, `type`
+            FROM `reminder`
+            WHERE
+                `entity_type` = ".$pdo->quote($entity->getEntityType())." AND
+                `entity_id` = ".$pdo->quote($entity->id)." AND
+                `deleted` = 0
+            ORDER BY `seconds` ASC
+        ";
+
+        $sth = $pdo->prepare($sql);
+        $sth->execute();
+        $rows = $sth->fetchAll(\PDO::FETCH_ASSOC);
+
+        foreach ($rows as $row) {
+            $o = new \StdClass();
+            $o->seconds = intval($row['seconds']);
+            $o->type = $row['type'];
+            $reminderList[] = $o;
+        }
+
+        return $reminderList;
+    }
+}
+

application/Espo/Core/SelectManagers/Base.php

@@ -77,6 +77,11 @@ class Base
         return $this->entityManager;
     }
 
+    protected function getMetadata()
+    {
+        return $this->metadata;
+    }
+
     protected function getUser()
     {
         return $this->user;
@@ -117,18 +122,39 @@ class Base
         }
     }
 
-    protected function order($sortBy, $asc, &$result)
+    protected function order($sortBy, $desc = false, &$result)
     {
         if (!empty($sortBy)) {
+
             $result['orderBy'] = $sortBy;
-            $type = $this->metadata->get("entityDefs.{$this->entityType}.fields." . $result['orderBy'] . ".type");
-            if ($type == 'link') {
+            $type = $this->getMetadata()->get(['entityDefs', $this->getEntityType(), 'fields', $sortBy, 'type']);
+            if ($type === 'link') {
                 $result['orderBy'] .= 'Name';
-            } else if ($type == 'linkParent') {
+            } else if ($type === 'linkParent') {
                 $result['orderBy'] .= 'Type';
+            } else if ($type === 'address') {
+                if (!$desc) {
+                    $orderPart = 'ASC';
+                } else {
+                    $orderPart = 'DESC';
+                }
+                $result['orderBy'] = [[$sortBy . 'Country', $orderPart], [$sortBy . 'City', $orderPart], [$sortBy . 'Street', $orderPart]];
+                return;
+            } else if ($type === 'enum') {
+                $list = $this->getMetadata()->get(['entityDefs', $this->getEntityType(), 'fields', $sortBy, 'options']);
+                if ($list && is_array($list) && count($list)) {
+                    if ($this->getMetadata()->get(['entityDefs', $this->getEntityType(), 'fields', $sortBy, 'isSorted'])) {
+                        $list = asort($list);
+                    }
+                    if ($desc) {
+                        $list = array_reverse($list);
+                    }
+                    $result['orderBy'] = 'LIST:' . $sortBy . ':' . implode(',', $list);
+                    return;
+                }
             }
         }
-        if ($asc) {
+        if (!$desc) {
             $result['order'] = 'ASC';
         } else {
             $result['order'] = 'DESC';
@@ -137,7 +163,7 @@ class Base
 
     protected function getTextFilterFieldList()
     {
-        return $this->metadata->get("entityDefs.{$this->entityType}.collection.textFilterFields", ['name']);
+        return $this->getMetadata()->get("entityDefs.{$this->entityType}.collection.textFilterFields", ['name']);
     }
 
     protected function getSeed()
@@ -193,8 +219,17 @@ class Base
                     if (!empty($item['value'])) {
                         $methodName = 'apply' . ucfirst($type);
 
-                        if (method_exists($this, $methodName)) {;
-                            $this->$methodName($item['field'], $item['value'], $result);
+                        if (method_exists($this, $methodName)) {
+                            $attribute = null;
+                            if (isset($item['field'])) {
+                                $attribute = $item['field'];
+                            }
+                            if (isset($item['attribute'])) {
+                                $attribute = $item['attribute'];
+                            }
+                            if ($attribute) {
+                                $this->$methodName($attribute, $item['value'], $result);
+                            }
                         }
                     }
                 }
@@ -222,18 +257,21 @@ class Base
 
         $defs = $relDefs[$link];
         if ($relationType == 'manyMany') {
-            $this->addJoin($link, $result);
+            $this->addJoin([$link, $link . 'Filter'], $result);
             $midKeys = $seed->getRelationParam($link, 'midKeys');
 
             if (!empty($midKeys)) {
                 $key = $midKeys[1];
-                $part[$link . 'Middle.' . $key] = $idsValue;
+                $part[$link . 'Filter' . 'Middle.' . $key] = $idsValue;
             }
-        } else if ($relationType== 'belongsTo') {
+        } else if ($relationType == 'belongsTo') {
             $key = $seed->getRelationParam($link, 'key');
             if (!empty($key)) {
                 $part[$key] = $idsValue;
             }
+        } else if ($relationType == 'hasOne') {
+            $this->addJoin([$link, $link . 'Filter'], $result);
+            $part[$link . 'Filter' . '.id'] = $idsValue;
         } else {
             return;
         }
@@ -612,6 +650,11 @@ class Base
         return $result;
     }
 
+    public function buildSelectParams(array $params, $withAcl = false, $checkWherePermission = false)
+    {
+        return $this->getSelectParams($params, $withAcl, $checkWherePermission);
+    }
+
     public function getSelectParams(array $params, $withAcl = false, $checkWherePermission = false)
     {
         $result = array();
@@ -621,7 +664,7 @@ class Base
             if (!array_key_exists('asc', $params)) {
                 $params['asc'] = true;
             }
-            $this->order($params['sortBy'], $params['asc'], $result);
+            $this->order($params['sortBy'], !$params['asc'], $result);
         }
 
         if (!isset($params['offset'])) {
@@ -667,13 +710,20 @@ class Base
     protected function checkWhere($where)
     {
         foreach ($where as $w) {
+            $attribute = null;
             if (isset($w['field'])) {
+                $attribute = $w['field'];
+            }
+            if (isset($w['attribute'])) {
+                $attribute = $w['attribute'];
+            }
+            if ($attribute) {
                 if (isset($w['type']) && $w['type'] === 'linkedWith') {
-                    if (in_array($w['field'], $this->getAcl()->getScopeForbiddenFieldList($this->getEntityType()))) {
+                    if (in_array($attribute, $this->getAcl()->getScopeForbiddenFieldList($this->getEntityType()))) {
                         throw new Forbidden();
                     }
                 } else {
-                    if (in_array($w['field'], $this->getAcl()->getScopeForbiddenAttributeList($this->getEntityType()))) {
+                    if (in_array($attribute, $this->getAcl()->getScopeForbiddenAttributeList($this->getEntityType()))) {
                         throw new Forbidden();
                     }
                 }
@@ -684,25 +734,37 @@ class Base
         }
     }
 
-    protected function getUserTimeZone()
+    public function getUserTimeZone()
     {
         if (empty($this->userTimeZone)) {
             $preferences = $this->getEntityManager()->getEntity('Preferences', $this->getUser()->id);
-            $timeZone = $preferences->get('timeZone');
-            $this->userTimeZone = $timeZone;
+            if ($preferences) {
+                $timeZone = $preferences->get('timeZone');
+                $this->userTimeZone = $timeZone;
+            } else {
+                $this->userTimeZone = 'UTC';
+            }
         }
 
         return $this->userTimeZone;
     }
 
-    protected function convertDateTimeWhere($item)
+    public function convertDateTimeWhere($item)
     {
         $format = 'Y-m-d H:i:s';
 
         $value = null;
         $timeZone = 'UTC';
 
-        if (empty($item['field'])) {
+        $attribute = null;
+        if (isset($item['field'])) {
+            $attribute = $item['field'];
+        }
+        if (isset($item['attribute'])) {
+            $attribute = $item['attribute'];
+        }
+
+        if (!$attribute) {
             return null;
         }
         if (empty($item['type'])) {
@@ -715,14 +777,13 @@ class Base
             $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;
+        $where['attribute'] = $attribute;
 
         $dt = new \DateTime('now', new \DateTimeZone($timeZone));
 
@@ -849,8 +910,16 @@ class Base
     {
         $part = array();
 
-        if (!empty($item['field']) && !empty($item['type'])) {
-            $methodName = 'getWherePart' . ucfirst($item['field']) . ucfirst($item['type']);
+        $attribute = null;
+        if (!empty($item['field'])) { // for backward compatibility
+            $attribute = $item['field'];
+        }
+        if (!empty($item['attribute'])) {
+            $attribute = $item['attribute'];
+        }
+
+        if (!empty($attribute) && !empty($item['type'])) {
+            $methodName = 'getWherePart' . ucfirst($attribute) . ucfirst($item['type']);
             if (method_exists($this, $methodName)) {
                 $value = null;
                 if (!empty($item['value'])) {
@@ -883,74 +952,74 @@ class Base
                     }
                     break;
                 case 'like':
-                    $part[$item['field'] . '*'] = $item['value'];
+                    $part[$attribute . '*'] = $item['value'];
                     break;
                 case 'equals':
                 case 'on':
-                    $part[$item['field'] . '='] = $item['value'];
+                    $part[$attribute . '='] = $item['value'];
                     break;
                 case 'startsWith':
-                    $part[$item['field'] . '*'] = $item['value'] . '%';
+                    $part[$attribute . '*'] = $item['value'] . '%';
                     break;
                 case 'endsWith':
-                    $part[$item['field'] . '*'] = $item['value'] . '%';
+                    $part[$attribute . '*'] = '%' . $item['value'];
                     break;
                 case 'contains':
-                    $part[$item['field'] . '*'] = '%' . $item['value'] . '%';
+                    $part[$attribute . '*'] = '%' . $item['value'] . '%';
                     break;
                 case 'notEquals':
                 case 'notOn':
-                    $part[$item['field'] . '!='] = $item['value'];
+                    $part[$attribute . '!='] = $item['value'];
                     break;
                 case 'greaterThan':
                 case 'after':
-                    $part[$item['field'] . '>'] = $item['value'];
+                    $part[$attribute . '>'] = $item['value'];
                     break;
                 case 'lessThan':
                 case 'before':
-                    $part[$item['field'] . '<'] = $item['value'];
+                    $part[$attribute . '<'] = $item['value'];
                     break;
                 case 'greaterThanOrEquals':
-                    $part[$item['field'] . '>='] = $item['value'];
+                    $part[$attribute . '>='] = $item['value'];
                     break;
                 case 'lessThanOrEquals':
-                    $part[$item['field'] . '<'] = $item['value'];
+                    $part[$attribute . '<'] = $item['value'];
                     break;
                 case 'in':
-                    $part[$item['field'] . '='] = $item['value'];
+                    $part[$attribute . '='] = $item['value'];
                     break;
                 case 'notIn':
-                    $part[$item['field'] . '!='] = $item['value'];
+                    $part[$attribute . '!='] = $item['value'];
                     break;
                 case 'isNull':
-                    $part[$item['field'] . '='] = null;
+                    $part[$attribute . '='] = null;
                     break;
                 case 'isNotNull':
                 case 'ever':
-                    $part[$item['field'] . '!='] = null;
+                    $part[$attribute . '!='] = null;
                     break;
                 case 'isTrue':
-                    $part[$item['field'] . '='] = true;
+                    $part[$attribute . '='] = true;
                     break;
                 case 'isFalse':
-                    $part[$item['field'] . '='] = false;
+                    $part[$attribute . '='] = false;
                     break;
                 case 'today':
-                    $part[$item['field'] . '='] = date('Y-m-d');
+                    $part[$attribute . '='] = date('Y-m-d');
                     break;
                 case 'past':
-                    $part[$item['field'] . '<'] = date('Y-m-d');
+                    $part[$attribute . '<'] = date('Y-m-d');
                     break;
                 case 'future':
-                    $part[$item['field'] . '>='] = date('Y-m-d');
+                    $part[$attribute . '>='] = date('Y-m-d');
                     break;
                 case 'lastSevenDays':
                     $dt1 = new \DateTime();
                     $dt2 = clone $dt1;
                     $dt2->modify('-7 days');
                     $part['AND'] = array(
-                        $item['field'] . '>=' => $dt2->format('Y-m-d'),
-                        $item['field'] . '<=' => $dt1->format('Y-m-d'),
+                        $attribute . '>=' => $dt2->format('Y-m-d'),
+                        $attribute . '<=' => $dt1->format('Y-m-d'),
                     );
                     break;
                 case 'lastXDays':
@@ -960,8 +1029,8 @@ class Base
 
                     $dt2->modify('-'.$number.' days');
                     $part['AND'] = array(
-                        $item['field'] . '>=' => $dt2->format('Y-m-d'),
-                        $item['field'] . '<=' => $dt1->format('Y-m-d'),
+                        $attribute . '>=' => $dt2->format('Y-m-d'),
+                        $attribute . '<=' => $dt1->format('Y-m-d'),
                     );
                     break;
                 case 'nextXDays':
@@ -970,22 +1039,22 @@ class Base
                     $number = strval(intval($item['value']));
                     $dt2->modify('+'.$number.' days');
                     $part['AND'] = array(
-                        $item['field'] . '>=' => $dt1->format('Y-m-d'),
-                        $item['field'] . '<=' => $dt2->format('Y-m-d'),
+                        $attribute . '>=' => $dt1->format('Y-m-d'),
+                        $attribute . '<=' => $dt2->format('Y-m-d'),
                     );
                     break;
                 case 'currentMonth':
                     $dt = new \DateTime();
                     $part['AND'] = array(
-                        $item['field'] . '>=' => $dt->modify('first day of this month')->format('Y-m-d'),
-                        $item['field'] . '<' => $dt->add(new \DateInterval('P1M'))->format('Y-m-d'),
+                        $attribute . '>=' => $dt->modify('first day of this month')->format('Y-m-d'),
+                        $attribute . '<' => $dt->add(new \DateInterval('P1M'))->format('Y-m-d'),
                     );
                     break;
                 case 'lastMonth':
                     $dt = new \DateTime();
                     $part['AND'] = array(
-                        $item['field'] . '>=' => $dt->modify('first day of last month')->format('Y-m-d'),
-                        $item['field'] . '<' => $dt->add(new \DateInterval('P1M'))->format('Y-m-d'),
+                        $attribute . '>=' => $dt->modify('first day of last month')->format('Y-m-d'),
+                        $attribute . '<' => $dt->add(new \DateInterval('P1M'))->format('Y-m-d'),
                     );
                     break;
                 case 'currentQuarter':
@@ -993,8 +1062,8 @@ class Base
                     $quarter = ceil($dt->format('m') / 3);
                     $dt->modify('first day of January this year');
                     $part['AND'] = array(
-                        $item['field'] . '>=' => $dt->add(new \DateInterval('P'.(($quarter - 1) * 3).'M'))->format('Y-m-d'),
-                        $item['field'] . '<' => $dt->add(new \DateInterval('P3M'))->format('Y-m-d'),
+                        $attribute . '>=' => $dt->add(new \DateInterval('P'.(($quarter - 1) * 3).'M'))->format('Y-m-d'),
+                        $attribute . '<' => $dt->add(new \DateInterval('P3M'))->format('Y-m-d'),
                     );
                     break;
                 case 'lastQuarter':
@@ -1007,29 +1076,29 @@ class Base
                         $dt->sub('P1Y');
                     }
                     $part['AND'] = array(
-                        $item['field'] . '>=' => $dt->add(new \DateInterval('P'.(($quarter - 1) * 3).'M'))->format('Y-m-d'),
-                        $item['field'] . '<' => $dt->add(new \DateInterval('P3M'))->format('Y-m-d'),
+                        $attribute . '>=' => $dt->add(new \DateInterval('P'.(($quarter - 1) * 3).'M'))->format('Y-m-d'),
+                        $attribute . '<' => $dt->add(new \DateInterval('P3M'))->format('Y-m-d'),
                     );
                     break;
                 case 'currentYear':
                     $dt = new \DateTime();
                     $part['AND'] = array(
-                        $item['field'] . '>=' => $dt->modify('first day of January this year')->format('Y-m-d'),
-                        $item['field'] . '<' => $dt->add(new \DateInterval('P1Y'))->format('Y-m-d'),
+                        $attribute . '>=' => $dt->modify('first day of January this year')->format('Y-m-d'),
+                        $attribute . '<' => $dt->add(new \DateInterval('P1Y'))->format('Y-m-d'),
                     );
                     break;
                 case 'lastYear':
                     $dt = new \DateTime();
                     $part['AND'] = array(
-                        $item['field'] . '>=' => $dt->modify('first day of January last year')->format('Y-m-d'),
-                        $item['field'] . '<' => $dt->add(new \DateInterval('P1Y'))->format('Y-m-d'),
+                        $attribute . '>=' => $dt->modify('first day of January last year')->format('Y-m-d'),
+                        $attribute . '<' => $dt->add(new \DateInterval('P1Y'))->format('Y-m-d'),
                     );
                     break;
                 case 'between':
                     if (is_array($item['value'])) {
                         $part['AND'] = array(
-                            $item['field'] . '>=' => $item['value'][0],
-                            $item['field'] . '<=' => $item['value'][1],
+                            $attribute . '>=' => $item['value'][0],
+                            $attribute . '<=' => $item['value'][1],
                         );
                     }
                     break;
@@ -1039,10 +1108,10 @@ class Base
         return $part;
     }
 
-    public function applyOrder($sortBy, $asc, &$result)
+    public function applyOrder($sortBy, $desc, &$result)
     {
         $this->prepareResult($result);
-        $this->order($sortBy, $asc, $result);
+        $this->order($sortBy, $desc, $result);
     }
 
     public function applyLimit($offset, $maxSize, &$result)
@@ -1084,12 +1153,36 @@ class Base
 
     public function hasJoin($join, &$result)
     {
-        return in_array($join, $result['joins']);
+        if (in_array($join, $result['joins'])) {
+            return true;
+        }
+
+        foreach ($result['joins'] as $item) {
+            if (is_array($item) && count($item) > 1) {
+                if ($item[1] == $join) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
     }
 
     public function hasLeftJoin($leftJoin, &$result)
     {
-        return in_array($leftJoin, $result['leftJoins']);
+        if (in_array($leftJoin, $result['leftJoins'])) {
+            return true;
+        }
+
+        foreach ($result['leftJoins'] as $item) {
+            if (is_array($item) && count($item) > 1) {
+                if ($item[1] == $leftJoin) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
     }
 
     public function addJoin($join, &$result)

application/Espo/Core/Services/Base.php

@@ -65,6 +65,13 @@ abstract class Base implements Injectable
         $this->dependencies[] = $name;
     }
 
+    protected function addDependencyList(array $list)
+    {
+        foreach ($list as $item) {
+            $this->addDependency($item);
+        }
+    }
+
     public function getDependencyList()
     {
         return $this->dependencies;

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

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

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

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

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

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

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

@@ -0,0 +1,36 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Templates\Entities;
+
+class BasePlus extends \Espo\Core\ORM\Entity
+{
+
+}
+

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

@@ -0,0 +1,36 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Templates\Entities;
+
+class Company extends \Espo\Core\ORM\Entity
+{
+
+}
+

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

@@ -0,0 +1,36 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Templates\Entities;
+
+class Event extends \Espo\Core\ORM\Entity
+{
+
+}
+

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

@@ -0,0 +1,37 @@
+[
+    {
+        "label": "Overview",
+        "rows": [
+            [
+                {
+                    "name": "name"
+                },
+                {
+                    "name": "website"
+                }
+            ],
+            [
+                {
+                    "name": "emailAddress"
+                },
+                {
+                    "name": "phoneNumber"
+                }
+            ],
+            [
+                {
+                    "name": "billingAddress"
+                },
+                {
+                    "name": "shippingAddress"
+                }
+            ],
+            [
+                {
+                    "name": "description",
+                    "fullWidth": true
+                }
+            ]
+        ]
+    }
+]

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

@@ -0,0 +1,37 @@
+[
+    {
+        "label": "",
+        "rows": [
+            [
+                {
+                    "name": "name",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "website",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "emailAddress",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "phoneNumber",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "billingAddressCountry",
+                    "fullWidth": true
+                }
+            ]
+        ]
+    }
+]

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

@@ -0,0 +1,43 @@
+[
+    {
+        "label": "Overview",
+        "rows": [
+            [
+                {
+                    "name": "name"
+                },
+                {
+                    "name": "parent"
+                }
+            ],
+            [
+                {
+                    "name": "status"
+                },
+                false
+            ],
+            [
+                {
+                    "name": "dateStart"
+                },
+                {
+                    "name": "dateEnd"
+                }
+            ],
+            [
+                {
+                    "name": "duration"
+                },
+                {
+                    "name": "reminders"
+                }
+            ],
+            [
+                {
+                    "name": "description",
+                    "fullWidth": true
+                }
+            ]
+        ]
+    }
+]

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

@@ -0,0 +1,49 @@
+[
+    {
+        "label": "",
+        "rows": [
+            [
+                {
+                    "name": "name",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "status",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "dateStart",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "duration",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "dateEnd",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "parent",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "description",
+                    "fullWidth": true
+                }
+            ]
+        ]
+    }
+]

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

@@ -0,0 +1,33 @@
+[
+    {
+        "label": "Overview",
+        "rows": [
+            [
+                {
+                    "name": "name"
+                },
+                false
+            ],
+            [
+                {
+                    "name": "emailAddress"
+                },
+                {
+                    "name": "phoneNumber"
+                }
+            ],
+            [
+                {
+                    "name": "address"
+                },
+                false
+            ],
+            [
+                {
+                    "name": "description",
+                    "fullWidth": true
+                }
+            ]
+        ]
+    }
+]

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

@@ -0,0 +1,25 @@
+[
+    {
+        "label": "",
+        "rows": [
+            [
+                {
+                    "name": "name",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "emailAddress",
+                    "fullWidth": true
+                }
+            ],
+            [
+                {
+                    "name": "phoneNumber",
+                    "fullWidth": true
+                }
+            ]
+        ]
+    }
+]

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

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

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

@@ -4,6 +4,7 @@
     "tab": true,
     "acl": true,
     "aclPortal": true,
+    "aclPortalLevelList": ["all", "account", "own", "no"],
     "customizable": true,
     "importable": true,
     "notifications": true

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

@@ -0,0 +1,26 @@
+{
+    "controller": "controllers/record",
+    "boolFilterList": ["onlyMy"],
+    "sidePanels": {
+        "detail": [
+            {
+                "name": "activities",
+                "label": "Activities",
+                "view": "crm:views/record/panels/activities",
+                "aclScope": "Activities"
+            },
+            {
+                "name": "history",
+                "label": "History",
+                "view": "crm:views/record/panels/history",
+                "aclScope": "Activities"
+            },
+            {
+                "name": "tasks",
+                "label": "Tasks",
+                "view": "crm:views/record/panels/tasks",
+                "aclScope": "Task"
+            }
+        ]
+    }
+}

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

@@ -0,0 +1,89 @@
+{
+    "fields": {
+        "name": {
+            "type": "varchar",
+            "required": true,
+            "trim": true
+        },
+        "description": {
+            "type": "text"
+        },
+        "createdAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "modifiedAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "createdBy": {
+            "type": "link",
+            "readOnly": true,
+            "view": "views/fields/user"
+        },
+        "modifiedBy": {
+            "type": "link",
+            "readOnly": true,
+            "view": "views/fields/user"
+        },
+        "assignedUser": {
+            "type": "link",
+            "required": true,
+            "view": "views/fields/assigned-user"
+        },
+        "teams": {
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
+        }
+    },
+    "links": {
+        "createdBy": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "modifiedBy": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "assignedUser": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "teams": {
+            "type": "hasMany",
+            "entity": "Team",
+            "relationName": "EntityTeam",
+            "layoutRelationshipsDisabled": true
+        },
+        "meetings": {
+            "type": "hasMany",
+            "entity": "Meeting",
+            "foreign": "parent",
+            "layoutRelationshipsDisabled": true
+        },
+        "calls": {
+            "type": "hasMany",
+            "entity": "Call",
+            "foreign": "parent",
+            "layoutRelationshipsDisabled": true
+        },
+        "tasks": {
+            "type": "hasChildren",
+            "entity": "Task",
+            "foreign": "parent",
+            "layoutRelationshipsDisabled": true
+        }
+    },
+    "collection": {
+        "sortBy": "createdAt",
+        "asc": false
+    },
+    "indexes": {
+        "name": {
+            "columns": ["name", "deleted"]
+        },
+        "assignedUser": {
+            "columns": ["assignedUserId", "deleted"]
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+{
+    "entity": true,
+    "layouts": true,
+    "tab": true,
+    "acl": true,
+    "aclPortal": true,
+    "aclPortalLevelList": ["all", "account", "own", "no"],
+    "customizable": true,
+    "importable": true,
+    "notifications": true
+}

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

@@ -1,6 +1,6 @@
 {
-    "controller": "Controllers.RecordTree",
-    "collection": "Collections.Tree",
+    "controller": "controllers/record-tree",
+    "collection": "collections/tree",
     "menu": {
         "listTree": {
             "buttons": [

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

@@ -0,0 +1,26 @@
+{
+    "controller": "controllers/record",
+    "boolFilterList": ["onlyMy"],
+    "sidePanels": {
+        "detail": [
+            {
+                "name": "activities",
+                "label": "Activities",
+                "view": "crm:views/record/panels/activities",
+                "aclScope": "Activities"
+            },
+            {
+                "name": "history",
+                "label": "History",
+                "view": "crm:views/record/panels/history",
+                "aclScope": "Activities"
+            },
+            {
+                "name": "tasks",
+                "label": "Tasks",
+                "view": "crm:views/record/panels/tasks",
+                "aclScope": "Task"
+            }
+        ]
+    }
+}

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

@@ -0,0 +1,141 @@
+{
+    "fields": {
+        "name": {
+            "type": "varchar",
+            "required": true,
+            "trim": true
+        },
+        "description": {
+            "type": "text"
+        },
+        "website": {
+            "type": "url"
+        },
+        "emailAddress": {
+            "type": "email"
+        },
+        "phoneNumber": {
+            "type": "phone",
+            "typeList": ["Office", "Mobile", "Fax", "Other"],
+            "defaultType": "Office"
+        },
+        "billingAddress": {
+            "type": "address"
+        },
+        "billingAddressStreet": {
+            "type": "text",
+            "maxLength": 255,
+            "dbType": "varchar"
+        },
+        "billingAddressCity": {
+            "type": "varchar"
+        },
+        "billingAddressState": {
+            "type": "varchar"
+        },
+        "billingAddressCountry": {
+            "type": "varchar"
+        },
+        "billingAddressPostalCode": {
+            "type": "varchar"
+        },
+        "shippingAddress": {
+            "type": "address",
+            "view": "crm:views/account/fields/shipping-address"
+        },
+        "shippingAddressStreet": {
+            "type": "text",
+            "maxLength": 255,
+            "dbType": "varchar"
+        },
+        "shippingAddressCity": {
+            "type": "varchar"
+        },
+        "shippingAddressState": {
+            "type": "varchar"
+        },
+        "shippingAddressCountry": {
+            "type": "varchar"
+        },
+        "shippingAddressPostalCode": {
+            "type": "varchar"
+        },
+        "createdAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "modifiedAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "createdBy": {
+            "type": "link",
+            "readOnly": true,
+            "view": "views/fields/user"
+        },
+        "modifiedBy": {
+            "type": "link",
+            "readOnly": true,
+            "view": "views/fields/user"
+        },
+        "assignedUser": {
+            "type": "link",
+            "required": false,
+            "view": "views/fields/assigned-user"
+        },
+        "teams": {
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
+        }
+    },
+    "links": {
+        "createdBy": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "modifiedBy": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "assignedUser": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "teams": {
+            "type": "hasMany",
+            "entity": "Team",
+            "relationName": "EntityTeam",
+            "layoutRelationshipsDisabled": true
+        },
+        "meetings": {
+            "type": "hasMany",
+            "entity": "Meeting",
+            "foreign": "parent",
+            "layoutRelationshipsDisabled": true
+        },
+        "calls": {
+            "type": "hasMany",
+            "entity": "Call",
+            "foreign": "parent",
+            "layoutRelationshipsDisabled": true
+        },
+        "tasks": {
+            "type": "hasChildren",
+            "entity": "Task",
+            "foreign": "parent",
+            "layoutRelationshipsDisabled": true
+        }
+    },
+    "collection": {
+        "sortBy": "createdAt",
+        "asc": false
+    },
+    "indexes": {
+        "name": {
+            "columns": ["name", "deleted"]
+        },
+        "assignedUser": {
+            "columns": ["assignedUserId", "deleted"]
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+{
+    "entity": true,
+    "layouts": true,
+    "tab": true,
+    "acl": true,
+    "aclPortal": true,
+    "aclPortalLevelList": ["all", "account", "own", "no"],
+    "customizable": true,
+    "importable": true,
+    "notifications": true
+}

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

@@ -0,0 +1,20 @@
+{
+    "controller": "controllers/record",
+    "boolFilterList": ["onlyMy"],
+    "activityDefs": {
+        "activitiesCreate": true,
+        "historyCreate": true
+    },
+    "filterList": [
+        {
+            "name":"planned"
+        },
+        {
+            "name":"held",
+            "style": "success"
+        },
+        {
+            "name":"todays"
+        }
+    ]
+}

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

@@ -0,0 +1,121 @@
+{
+    "fields": {
+        "name": {
+            "type": "varchar",
+            "required": true,
+            "trim": true
+        },
+        "status": {
+            "type": "enum",
+            "options": ["Planned", "Held", "Not Held"],
+            "default": "Planned",
+            "view": "views/fields/enum-styled",
+            "style": {
+                "Held": "success"
+            },
+            "audited": true
+        },
+        "dateStart": {
+            "type": "datetime",
+            "required": true,
+            "default": "javascript: return this.dateTime.getNow(15);",
+            "audited": true
+        },
+        "dateEnd": {
+            "type": "datetime",
+            "required": true,
+            "after": "dateStart"
+        },
+        "duration": {
+            "type": "duration",
+            "start": "dateStart",
+            "end": "dateEnd",
+            "options": [300, 600, 900, 1800, 2700, 3600, 7200],
+            "default": 300,
+            "notStorable": true
+        },
+        "parent": {
+            "type": "linkParent",
+            "entityList": ["Account", "Lead"]
+        },
+        "description": {
+            "type": "text"
+        },
+        "reminders": {
+            "type": "jsonArray",
+            "notStorable": true,
+            "view": "crm:views/meeting/fields/reminders"
+        },
+        "createdAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "modifiedAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "createdBy": {
+            "type": "link",
+            "readOnly": true,
+            "view": "views/fields/user"
+        },
+        "modifiedBy": {
+            "type": "link",
+            "readOnly": true,
+            "view": "views/fields/user"
+        },
+        "assignedUser": {
+            "type": "link",
+            "required": false,
+            "view": "views/fields/assigned-user"
+        },
+        "teams": {
+            "type": "linkMultiple",
+            "view": "views/fields/teams"
+        }
+    },
+    "links": {
+        "parent": {
+            "type": "belongsToParent"
+        },
+        "createdBy": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "modifiedBy": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "assignedUser": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "teams": {
+            "type": "hasMany",
+            "entity": "Team",
+            "relationName": "EntityTeam",
+            "layoutRelationshipsDisabled": true
+        }
+    },
+    "collection": {
+        "sortBy": "dateStart",
+        "asc": false
+    },
+    "indexes": {
+        "dateStartStatus": {
+            "columns": ["dateStart", "status"]
+        },
+        "dateStart": {
+            "columns": ["dateStart", "deleted"]
+        },
+        "status": {
+            "columns": ["status", "deleted"]
+        },
+        "assignedUser": {
+            "columns": ["assignedUserId", "deleted"]
+        },
+        "assignedUserStatus": {
+            "columns": ["assignedUserId", "status"]
+        }
+    }
+}

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

@@ -0,0 +1,16 @@
+{
+    "entity": true,
+    "layouts": true,
+    "tab": true,
+    "acl": true,
+    "aclPortal": true,
+    "aclPortalLevelList": ["all", "account", "contact", "own", "no"],
+    "customizable": true,
+    "importable": true,
+    "calendar": true,
+    "activity": true,
+    "notifications": true,
+    "activityStatusList": ["Planned"],
+    "historyStatusList": ["Held", "Not Held"],
+    "statusField": "status"
+}

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

@@ -1,4 +1,26 @@
 {
-   "controller": "Controllers.Record",
-   "boolFilterList": ["onlyMy"]
+    "controller": "controllers/record",
+    "boolFilterList": ["onlyMy"],
+    "sidePanels": {
+        "detail": [
+            {
+                "name": "activities",
+                "label": "Activities",
+                "view": "crm:views/record/panels/activities",
+                "aclScope": "Activities"
+            },
+            {
+                "name": "history",
+                "label": "History",
+                "view": "crm:views/record/panels/history",
+                "aclScope": "Activities"
+            },
+            {
+                "name": "tasks",
+                "label": "Tasks",
+                "view": "crm:views/record/panels/tasks",
+                "aclScope": "Task"
+            }
+        ]
+    }
 }

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

@@ -21,10 +21,6 @@
         "description": {
             "type": "text"
         },
-        "createdAt": {
-            "type": "datetime",
-            "readOnly": true
-        },
         "emailAddress": {
             "type": "email"
         },
@@ -53,6 +49,10 @@
         "addressPostalCode": {
             "type": "varchar"
         },
+        "createdAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
         "modifiedAt": {
             "type": "datetime",
             "readOnly": true
@@ -95,6 +95,24 @@
             "entity": "Team",
             "relationName": "EntityTeam",
             "layoutRelationshipsDisabled": true
+        },
+        "meetings": {
+            "type": "hasMany",
+            "entity": "Meeting",
+            "foreign": "parent",
+            "layoutRelationshipsDisabled": true
+        },
+        "calls": {
+            "type": "hasMany",
+            "entity": "Call",
+            "foreign": "parent",
+            "layoutRelationshipsDisabled": true
+        },
+        "tasks": {
+            "type": "hasChildren",
+            "entity": "Task",
+            "foreign": "parent",
+            "layoutRelationshipsDisabled": true
         }
     },
     "collection": {

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

@@ -4,6 +4,7 @@
     "tab": true,
     "acl": true,
     "aclPortal": true,
+    "aclPortalLevelList": ["all", "account", "own", "no"],
     "customizable": true,
     "importable": true,
     "notifications": true

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

@@ -0,0 +1,37 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Templates\Repositories;
+
+
+class BasePlus extends \Espo\Core\ORM\Repositories\RDB
+{
+
+}
+

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

@@ -0,0 +1,35 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Templates\Repositories;
+
+class Company extends \Espo\Core\ORM\Repositories\RDB
+{
+
+}

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

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

application/Espo/Core/Templates/SelectManagers/Event.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/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Templates\SelectManagers;
+
+class Event extends \Espo\Core\SelectManagers\Base
+{
+    protected function filterPlanned(&$result)
+    {
+        $result['whereClause'][] = array(
+            'status' => 'Planned'
+        );
+    }
+
+    protected function filterHeld(&$result)
+    {
+        $result['whereClause'][] = array(
+            'status' => 'Held'
+        );
+    }
+
+    protected function filterTodays(&$result)
+    {
+        $result['whereClause'][] = $this->convertDateTimeWhere(array(
+            'type' => 'today',
+            'attribute' => 'dateStart',
+            'timeZone' => $this->getUserTimeZone()
+        ));
+    }
+}
+

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

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

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

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

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

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

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

@@ -29,9 +29,43 @@
 
 namespace Espo\Core\Templates\Services;
 
+use \Espo\ORM\Entity;
 
 class Person extends \Espo\Services\Record
 {
+    protected function getDuplicateWhereClause(Entity $entity, $data = array())
+    {
+        $data = array(
+            'OR' => array(
+                array(
+                    'firstName' => $entity->get('firstName'),
+                    'lastName' => $entity->get('lastName'),
+                )
+            )
+        );
+        if (
+            ($entity->get('emailAddress') || $entity->get('emailAddressData'))
+            &&
+            ($entity->isNew() || $entity->isFieldChanged('emailAddress') || $entity->isFieldChanged('emailAddressData'))
+        ) {
+            if ($entity->get('emailAddress')) {
+                $list = [$entity->get('emailAddress')];
+            }
+            if ($entity->get('emailAddressData')) {
+                foreach ($entity->get('emailAddressData') as $row) {
+                    if (!in_array($row->emailAddress, $list)) {
+                        $list[] = $row->emailAddress;
+                    }
+                }
+            }
+            foreach ($list as $emailAddress) {
+                $data['OR'][] = array(
+                    'emailAddress' => $emailAddress
+                );
+            }
+        }
 
+        return $data;
+    }
 }
 

application/Espo/Core/Templates/i18n/cs_CZ/Base.json

@@ -0,0 +1,5 @@
+{
+    "labels": {
+        "Create {entityType}": "Vytvořit {entityTypeTranslated}"
+    }
+}

application/Espo/Core/Templates/i18n/cs_CZ/BasePlus.json

@@ -0,0 +1,5 @@
+{
+    "labels": {
+        "Create {entityType}": "Vytvořit {entityTypeTranslated}"
+    }
+}

application/Espo/Core/Templates/i18n/cs_CZ/Company.json

@@ -0,0 +1,5 @@
+{
+    "labels": {
+        "Create {entityType}": "Vytvořit {entityTypeTranslated}"
+    }
+}