fix application set

it_IT lang fixes
email inline attachment cleanable
2017-09-12 16:51:54 +03:00 · 2017-09-12 10:45:21 +03:00 · 2017-09-08 11:02:06 +03:00 · 2017-09-06 12:09:13 +03:00 · 2017-09-06 12:03:46 +03:00 · 2017-09-06 11:45:05 +03:00
2748 changed files with 101514 additions and 16351 deletions
@@ -0,0 +1,11 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
@@ -14,7 +14,13 @@
 /client/css/sakura-vertical.css
 /client/css/violet.css
 /client/css/violet-vertical.css
-/tests/testData/cache/*
+/client/css/espo-rtl.css
+/client/css/hazyblue.css
+/client/css/hazyblue-vertical.css
+
+/tests/unit/testData/cache/*
+!/tests/unit/testData/cache/.data
+/tests/integration/config.php
 composer.phar
 vendor/
 /custom/Espo/Custom/*
@@ -1,3 +1,9 @@
+## Pull Requests
+
 Before we can merge your pull request you need to accept our CLA [here](https://github.com/espocrm/cla). It's very simple to do.

-[Code Style Guidelines](https://github.com/espocrm/espocrm/wiki/Code-Style-Guidelines).
+[Code Style Guidelines](https://github.com/espocrm/espocrm/wiki/Code-Style-Guidelines).
+
+## Issues
+
+We don't provide developer help or any kind of support on github. Please use our [forum](http://forum.espocrm.com/) for this.
@@ -2,7 +2,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -76,6 +76,30 @@ module.exports = function (grunt) {
                    'client/css/espo-vertical.css': 'frontend/less/espo-vertical/main.less',
                }
            },
+            espoRtl: {
+                options: {
+                    yuicompress: true
+                },
+                files: {
+                    'client/css/espo-rtl.css': 'frontend/less/espo-rtl/main.less'
+                }
+            },
+            hazyblueVertical: {
+                options: {
+                    yuicompress: true,
+                },
+                files: {
+                    'client/css/hazyblue-vertical.css': 'frontend/less/hazyblue-vertical/main.less',
+                }
+            },
+            hazyblue: {
+                options: {
+                    yuicompress: true,
+                },
+                files: {
+                    'client/css/hazyblue.css': 'frontend/less/hazyblue/main.less',
+                }
+            },
            sakura: {
                options: {
                    yuicompress: true,
@@ -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)

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -0,0 +1,42 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Acl;
+
+use \Espo\Entities\User as EntityUser;
+use \Espo\ORM\Entity;
+
+class ActionHistoryRecord extends \Espo\Core\Acl\Base
+{
+    public function checkIsOwner(EntityUser $user, Entity $entity)
+    {
+        return $entity->get('userId') === $user->id;
+    }
+}
+
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -0,0 +1,61 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Acl;
+
+use \Espo\Entities\User as EntityUser;
+use \Espo\ORM\Entity;
+
+class ScheduledJob extends \Espo\Core\Acl\Base
+{
+    public function checkEntityRead(EntityUser $user, Entity $entity, $data)
+    {
+        if ($entity->get('isInternal')) return false;
+        return $this->checkEntity($user, $entity, $data, 'read');
+    }
+
+    public function checkEntityEdit(EntityUser $user, Entity $entity, $data)
+    {
+        if ($entity->get('isInternal')) return false;
+        return $this->checkEntity($user, $entity, $data, 'edit');
+    }
+
+    public function checkEntityDelete(EntityUser $user, Entity $entity, $data)
+    {
+        if ($entity->get('isInternal')) return false;
+        return $this->checkEntity($user, $entity, $data, 'delete');
+    }
+
+    public function checkEntityCreate(EntityUser $user, Entity $entity, $data)
+    {
+        if ($entity->get('isInternal')) return false;
+        return $this->checkEntity($user, $entity, $data, 'create');
+    }
+}
+
@@ -0,0 +1,41 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2017 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);
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -0,0 +1,71 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Controllers;
+
+use \Espo\Core\Exceptions\Forbidden;
+
+class ActionHistoryRecord extends \Espo\Core\Controllers\Record
+{
+    public function actionUpdate($params, $data, $request)
+    {
+        throw new Forbidden();
+    }
+
+    public function actionCreate($params, $data, $request)
+    {
+        throw new Forbidden();
+    }
+
+    public function actionListLinked($params, $data, $request)
+    {
+        throw new Forbidden();
+    }
+
+    public function actionMassUpdate($params, $data, $request)
+    {
+        throw new Forbidden();
+    }
+
+    public function actionCreateLink($params, $data, $request)
+    {
+        throw new Forbidden();
+    }
+
+    public function actionRemoveLink($params, $data, $request)
+    {
+        throw new Forbidden();
+    }
+
+    public function actionMassDelete($params, $data, $request)
+    {
+        throw new Forbidden();
+    }
+}
+
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -63,7 +63,7 @@ class Admin extends \Espo\Core\Controllers\Base
    {
        $scheduledJob = $this->getContainer()->get('scheduledJob');

-        return $scheduledJob->getAllNamesOnly();
+        return $scheduledJob->getAvailableList();
    }

    public function postActionUploadUpgradePackage($params, $data)
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -60,11 +60,20 @@ class App extends \Espo\Core\Controllers\Base
        }
        $userData['emailAddressList'] = $emailAddressList;

+        $settings = (object)[];
+        foreach ($this->getConfig()->get('userItems') as $item) {
+            $settings->$item = $this->getConfig()->get($item);
+        }
+
+        unset($userData['authTokenId']);
+        unset($userData['password']);
+
        return array(
            'user' => $userData,
            'acl' => $this->getAcl()->getMap(),
            'preferences' => $preferences,
-            'token' => $this->getUser()->get('token')
+            'token' => $this->getUser()->get('token'),
+            'settings' => $settings
        );
    }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -44,12 +44,17 @@ 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);
-        $this->getContainer()->get('fileManager')->putContents('data/upload/' . $attachment->id, $contents);
+        $this->getContainer()->get('fileStorageManager')->putContents($attachment, $contents);

        return array(
            'attachmentId' => $attachment->id
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -40,32 +40,49 @@ class AuthToken extends \Espo\Core\Controllers\Record
        }
    }

-    public function actionUpdate($params, $data)
+    public function actionUpdate($params, $data, $request)
+    {
+        if (
+            is_array($data) &&
+            array_key_exists('isActive', $data) &&
+            $data['isActive'] === false &&
+            count(array_keys($data)) === 1)
+        {
+            return parent::actionUpdate($params, $data, $request);
+        }
+        throw new Forbidden();
+    }
+
+    public function actionMassUpdate($params, $data, $request)
+    {
+        if (empty($data['attributes'])) {
+            throw new BadRequest();
+        }
+
+        $attributes = $data['attributes'];
+
+        if (
+            is_object($attributes) &&
+            isset($attributes->isActive) &&
+            $attributes->isActive === false &&
+            count(array_keys(get_object_vars($attributes))) === 1
+        ) {
+            return parent::actionMassUpdate($params, $data, $request);
+        }
+        throw new Forbidden();
+    }
+
+    public function actionCreate($params, $data, $request)
    {
        throw new Forbidden();
    }

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

-    public function actionListLinked($params, $data)
-    {
-        throw new Forbidden();
-    }
-
-    public function actionMassUpdate($params, $data)
-    {
-        throw new Forbidden();
-    }
-
-    public function actionCreateLink($params, $data)
-    {
-        throw new Forbidden();
-    }
-
-    public function actionRemoveLink($params, $data)
+    public function actionRemoveLink($params, $data, $request)
    {
        throw new Forbidden();
    }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 *
 * In accordance with Section 7(b) of the GNU General Public License version 3,
 * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Controllers;

@@ -34,17 +34,19 @@ use \Espo\Core\Exceptions\Error;
 class EmailTemplate extends \Espo\Core\Controllers\Record
 {
    public function actionParse($params, $data, $request)
-    {        
+    {
        $id = $request->get('id');
        $emailAddress = $request->get('emailAddress');
        if (empty($id)) {
            throw new Error();
        }
-        
+
        return $this->getRecordService()->parse($id, array(
            'emailAddress' => $request->get('emailAddress'),
            'parentType' => $request->get('parentType'),
            'parentId' => $request->get('parentId'),
+            'relatedType' => $request->get('relatedType'),
+            'relatedId' => $request->get('relatedId')
        ), true);
    }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -198,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) {
@@ -242,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) {
@@ -278,5 +292,23 @@ class EntityManager extends \Espo\Core\Controllers\Base

        return true;
    }
+
+    public function postActionFormula($params, $data, $request)
+    {
+        if (empty($data['scope'])) {
+            throw new BadRequest();
+        }
+        if (!array_key_exists('data', $data)) {
+            throw new BadRequest();
+        }
+
+        $formulaData = get_object_vars($data['data']);
+
+        $this->getContainer()->get('entityManagerUtil')->setFormulaData($data['scope'], $formulaData);
+
+        $this->getContainer()->get('dataManager')->clearCache();
+
+        return true;
+    }
 }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -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();
    }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -29,9 +29,10 @@

 namespace Espo\Controllers;

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

 class FieldManager extends \Espo\Core\Controllers\Base
 {
@@ -44,38 +45,46 @@ class FieldManager extends \Espo\Core\Controllers\Base

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

        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');
-        $fieldManager->create($data['name'], $data, $params['scope']);
+        $fieldManager->create($params['scope'], $data['name'], $data);

        try {
            $this->getContainer()->get('dataManager')->rebuild($params['scope']);
        } catch (Error $e) {
-            $fieldManager->delete($data['name'], $params['scope']);
+            $fieldManager->delete($params['scope'], $data['name']);
            throw new Error($e->getMessage());
        }

-        return $fieldManager->read($data['name'], $params['scope']);
+        return $fieldManager->read($params['scope'], $data['name']);
    }

-    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']);
+        $fieldManager->update($params['scope'], $params['name'], $data);

        if ($fieldManager->isChanged()) {
            $this->getContainer()->get('dataManager')->rebuild($params['scope']);
@@ -83,17 +92,33 @@ class FieldManager extends \Espo\Core\Controllers\Base
            $this->getContainer()->get('dataManager')->clearCache();
        }

-        return $fieldManager->read($params['name'], $params['scope']);
+        return $fieldManager->read($params['scope'], $params['name']);
    }

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

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

-        return $res;
+        return $result;
    }

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

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -68,9 +68,9 @@ class Import extends \Espo\Core\Controllers\Record
        throw new BadRequest();
    }

-    protected function getFileManager()
+    protected function getFileStorageManager()
    {
-        return $this->getContainer()->get('fileManager');
+        return $this->getContainer()->get('fileStorageManager');
    }

    protected function getEntityManager()
@@ -92,7 +92,7 @@ class Import extends \Espo\Core\Controllers\Record
        $attachment->set('name', 'import-file.csv');
        $this->getEntityManager()->saveEntity($attachment);

-        $this->getFileManager()->putContents('data/upload/' . $attachment->id, $contents);
+        $this->getFileStorageManager()->putContents($attachment, $contents);

        return array(
            'attachmentId' => $attachment->id
@@ -127,17 +127,65 @@ 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();
+        }
+
+        $timezone = 'UTC';
+        if (isset($data['timezone'])) {
+           $timezone = $data['timezone'];
+        }
+
        $importParams = array(
-            'headerRow' => $data['headerRow'],
+            'headerRow' => !empty($data['headerRow']),
            'fieldDelimiter' => $data['fieldDelimiter'],
            'textQualifier' => $data['textQualifier'],
            'dateFormat' => $data['dateFormat'],
            'timeFormat' => $data['timeFormat'],
+            'timezone' => $timezone,
            'personNameFormat' => $data['personNameFormat'],
            'decimalMark' => $data['decimalMark'],
            'currency' => $data['currency'],
            'defaultValues' => $data['defaultValues'],
            'action' => $data['action'],
+            'skipDuplicateChecking' => !empty($data['skipDuplicateChecking']),
+            'idleMode' => !empty($data['idleMode'])
        );

        if (array_key_exists('updateBy', $data)) {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -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();
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -0,0 +1,78 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2017 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\Utils as Utils;
+use \Espo\Core\Exceptions\NotFound;
+use \Espo\Core\Exceptions\Error;
+use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\BadRequest;
+
+class LabelManager extends \Espo\Core\Controllers\Base
+{
+    protected function checkControllerAccess()
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+    }
+
+    public function postActionGetScopeList($params)
+    {
+        $labelManager = $this->getContainer()->get('injectableFactory')->createByClassName('\\Espo\\Core\\Utils\\LabelManager');
+
+        return $labelManager->getScopeList();
+    }
+
+    public function postActionGetScopeData($params, $data, $request)
+    {
+        if (empty($data['scope']) || empty($data['language'])) {
+            throw new BadRequest();
+        }
+        $labelManager = $this->getContainer()->get('injectableFactory')->createByClassName('\\Espo\\Core\\Utils\\LabelManager');
+        return $labelManager->getScopeData($data['language'], $data['scope']);
+    }
+
+    public function postActionSaveLabels($params, $data)
+    {
+        if (empty($data['scope']) || empty($data['language']) || !isset($data['labels'])) {
+            throw new BadRequest();
+        }
+
+        $labels = get_object_vars($data['labels']);
+
+        $labelManager = $this->getContainer()->get('injectableFactory')->createByClassName('\\Espo\\Core\\Utils\\LabelManager');
+        $returnData = $labelManager->saveLabels($data['language'], $data['scope'], $labels);
+
+        $this->getContainer()->get('dataManager')->clearCache();
+
+        return $returnData;
+    }
+}
@@ -0,0 +1,46 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Controllers;
+
+use \Espo\Core\Exceptions\Forbidden;
+
+class LastViewed extends \Espo\Core\Controllers\Base
+{
+    public function getActionIndex($params, $data, $request)
+    {
+        $result = $this->getServiceFactory()->create('LastViewed')->get();
+
+        return [
+            'total' => $result['total'],
+            'list' => isset($result['collection']) ? $result['collection']->toArray() : $result['list']
+        ];
+    }
+}
+
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -25,15 +25,27 @@
 *
 * In accordance with Section 7(b) of the GNU General Public License version 3,
 * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/ 
+ ************************************************************************/

 namespace Espo\Controllers;

+use \Espo\Core\Exceptions\Forbidden;
+
 class Metadata extends \Espo\Core\Controllers\Base
 {

    public function actionRead($params, $data)
    {
-        return $this->getMetadata()->getAll(true);
+        return $this->getMetadata()->getAllForFrontend();
+    }
+
+    public function getActionGet($params, $data, $request)
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new \Forbidden();
+        }
+        $key = $request->get('key');
+
+        return $this->getMetadata()->get($key, false);
    }
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -43,6 +43,10 @@ class Notification extends \Espo\Core\Controllers\Record
        $maxSize = intval($request->get('maxSize'));
        $after = $request->get('after');

+        if (empty($maxSize)) {
+            $maxSize = self::MAX_SIZE_LIMIT;
+        }
+
        $params = array(
            'offset' => $offset,
            'maxSize' => $maxSize,
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -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');

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

-        if (isset($data['useCache']) && $data['useCache'] != $this->getConfig()->get('useCache')) {
+        if (
+            (isset($data['useCache']) && $data['useCache'] != $this->getConfig()->get('useCache'))
+            ||
+            (isset($data['aclStrictMode']) && $data['aclStrictMode'] !== $this->getConfig()->get('aclStrictMode'))
+        ) {
            $this->getContainer()->get('dataManager')->clearCache();
        }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -69,6 +69,11 @@ class Acl
        return $this->getAclManager()->get($this->getUser(), $permission);
    }

+    public function checkReadNo($scope)
+    {
+        return $this->getAclManager()->checkReadNo($this->getUser(), $scope);
+    }
+
    public function checkReadOnlyTeam($scope)
    {
        return $this->getAclManager()->checkReadOnlyTeam($this->getUser(), $scope);
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -106,6 +106,14 @@ class Base implements Injectable
        return $data->read === 'team';
    }

+    public function checkReadNo(User $user, $data)
+    {
+        if (empty($data) || !is_object($data) || !isset($data->read)) {
+            return false;
+        }
+        return $data->read === 'no';
+    }
+
    public function checkReadOnlyOwn(User $user, $data)
    {
        if (empty($data) || !is_object($data) || !isset($data->read)) {
@@ -155,7 +163,7 @@ class Base implements Injectable
        }

        if (!isset($data->$action)) {
-            return true;
+            return false;
        }

        $value = $data->$action;
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -36,7 +36,7 @@ use \Espo\Entities\User;

 use \Espo\Core\Utils\Config;
 use \Espo\Core\Utils\Metadata;
-use \Espo\Core\Utils\FieldManager;
+use \Espo\Core\Utils\FieldManagerUtil;
 use \Espo\Core\Utils\File\Manager as FileManager;

 class Table
@@ -77,7 +77,9 @@ class Table

    protected $forbiddenFieldsCache = array();

-    public function __construct(User $user, Config $config = null, FileManager $fileManager = null, Metadata $metadata = null, FieldManager $fieldManager = null)
+    protected $isStrictMode = false;
+
+    public function __construct(User $user, Config $config = null, FileManager $fileManager = null, Metadata $metadata = null, FieldManagerUtil $fieldManager = null)
    {
        $this->data = (object) [
            'table' => (object) [],
@@ -85,6 +87,8 @@ class Table
            'fieldTableQuickAccess' => (object) [],
        ];

+        $this->isStrictMode = $config->get('aclStrictMode', false);
+
        $this->user = $user;

        $this->metadata = $metadata;
@@ -135,11 +139,6 @@ class Table
        return $this->fieldManager;
    }

-    protected function getConfig()
-    {
-        return $this->config;
-    }
-
    public function getMap()
    {
        return $this->data;
@@ -177,7 +176,7 @@ class Table
                return $this->data->table->$scope->$action;
            }
        }
-        return false;
+        return 'no';
    }

    private function load()
@@ -454,11 +453,26 @@ class Table
                    $aclType = $this->defaultAclType;
                }
                if (!empty($aclType)) {
-                    $defaultValue = $this->metadata->get('app.'.$this->type.'.scopeLevelTypesDefaults.' . $aclType, $this->metadata->get('app.'.$this->type.'.scopeLevelTypesDefaults.record'));
+                    $paramDefaultsName = 'scopeLevelTypesDefaults';
+                    if ($this->isStrictMode) {
+                        $paramDefaultsName = 'scopeLevelTypesStrictDefaults';
+                    }
+                    $defaultValue = $this->metadata->get(['app', $this->type, $paramDefaultsName, $aclType], $this->metadata->get(['app', $this->type, $paramDefaultsName, 'record']));
                    if (is_array($defaultValue)) {
                        $defaultValue = (object) $defaultValue;
                    }
                    $table->$scope = $defaultValue;
+
+                    if (is_object($table->$scope)) {
+                        $actionList = $this->getMetadata()->get(['scopes', $scope, $this->type . 'ActionList']);
+                        if ($actionList) {
+                            foreach (get_object_vars($table->$scope) as $action => $level) {
+                                if (!in_array($action, $actionList)) {
+                                    unset($table->$scope->$action);
+                                }
+                            }
+                        }
+                    }
                }
            }
        }
@@ -606,7 +620,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)) {
@@ -623,7 +639,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;
                                    }
                                }
@@ -684,11 +700,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);
@@ -703,6 +720,6 @@ class Table
        }

        return $result;
-    }
+    }*/
 }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -107,7 +107,7 @@ class AclManager
            $config = $this->getContainer()->get('config');
            $fileManager = $this->getContainer()->get('fileManager');
            $metadata = $this->getContainer()->get('metadata');
-            $fieldManager = $this->getContainer()->get('fieldManager');
+            $fieldManager = $this->getContainer()->get('fieldManagerUtil');

            $this->tableHashMap[$key] = new $this->tableClassName($user, $config, $fileManager, $metadata, $fieldManager);
        }
@@ -133,6 +133,15 @@ class AclManager
        return $this->getTable($user)->get($permission);
    }

+    public function checkReadNo(User $user, $scope)
+    {
+        if ($user->isAdmin()) {
+            return false;
+        }
+        $data = $this->getTable($user)->getScopeData($scope);
+        return $this->getImplementation($scope)->checkReadNo($user, $data);
+    }
+
    public function checkReadOnlyTeam(User $user, $scope)
    {
        if ($user->isAdmin()) {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -71,7 +71,7 @@ class Base extends \Espo\Core\Acl\Base
        }

        if (!isset($data->$action)) {
-            return true;
+            return false;
        }

        $value = $data->$action;
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -37,7 +37,7 @@ use \Espo\Entities\Portal;

 use \Espo\Core\Utils\Config;
 use \Espo\Core\Utils\Metadata;
-use \Espo\Core\Utils\FieldManager;
+use \Espo\Core\Utils\FieldManagerUtil;
 use \Espo\Core\Utils\File\Manager as FileManager;

 class Table extends \Espo\Core\Acl\Table
@@ -52,7 +52,7 @@ class Table extends \Espo\Core\Acl\Table

    protected $valuePermissionList = [];

-    public function __construct(User $user, Portal $portal, Config $config = null, FileManager $fileManager = null, Metadata $metadata = null, FieldManager $fieldManager = null)
+    public function __construct(User $user, Portal $portal, Config $config = null, FileManager $fileManager = null, Metadata $metadata = null, FieldManagerUtil $fieldManager = null)
    {
        if (empty($portal)) {
            throw new Error("No portal was passed to AclPortal\\Table constructor.");
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -134,7 +134,7 @@ class Application
    public function runCron()
    {
        $auth = $this->createAuth();
-        $auth->useNoAuth(true);
+        $auth->useNoAuth();

        $cronManager = new \Espo\Core\CronManager($this->container);
        $cronManager->run();
@@ -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) {
@@ -327,6 +327,7 @@ class Application
    public function setupSystemUser()
    {
        $user = $this->getContainer()->get('entityManager')->getEntity('User', 'system');
+        $user->set('isAdmin', true);
        $this->getContainer()->setUser($user);
        $this->getContainer()->get('entityManager')->setUser($user);
    }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -93,6 +93,24 @@ class Container
        return $className;
    }

+    protected function loadContainer()
+    {
+        return $this;
+    }
+
+    protected function loadSlim()
+    {
+        return new \Espo\Core\Utils\Api\Slim();
+    }
+
+    protected function loadFileStorageManager()
+    {
+        return new \Espo\Core\FileStorage\Manager(
+            $this->get('metadata')->get(['app', 'fileStorage', 'implementationClassNameMap']),
+            $this
+        );
+    }
+
    protected function loadLog()
    {
        $config = $this->get('config');
@@ -118,16 +136,6 @@ class Container
        return $log;
    }

-    protected function loadContainer()
-    {
-        return $this;
-    }
-
-    protected function loadSlim()
-    {
-        return new \Espo\Core\Utils\Api\Slim();
-    }
-
    protected function loadFileManager()
    {
        return new \Espo\Core\Utils\File\Manager(
@@ -135,6 +143,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 +196,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 +224,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 +262,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 +288,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')
        );
    }

@@ -300,6 +335,13 @@ class Container
        );
    }

+    protected function loadFieldManagerUtil()
+    {
+        return new \Espo\Core\Utils\FieldManagerUtil(
+            $this->get('metadata')
+        );
+    }
+
    protected function loadThemeManager()
    {
        return new \Espo\Core\Utils\ThemeManager(
@@ -316,6 +358,13 @@ class Container
        );
    }

+    protected function loadInjectableFactory()
+    {
+        return new \Espo\Core\InjectableFactory(
+            $this
+        );
+    }
+
    public function setUser(\Espo\Entities\User $user)
    {
        $this->set('user', $user);
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -60,9 +60,9 @@ class ControllerManager

    public function process($controllerName, $actionName, $params, $data, $request)
    {
-        $customeClassName = '\\Espo\\Custom\\Controllers\\' . Util::normilizeClassName($controllerName);
-        if (class_exists($customeClassName)) {
-            $controllerClassName = $customeClassName;
+        $customClassName = '\\Espo\\Custom\\Controllers\\' . Util::normilizeClassName($controllerName);
+        if (class_exists($customClassName)) {
+            $controllerClassName = $customClassName;
        } else {
            $moduleName = $this->metadata->getScopeModuleName($controllerName);
            if ($moduleName) {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -67,7 +67,7 @@ class Record extends Base
    public function actionRead($params, $data, $request)
    {
        $id = $params['id'];
-        $entity = $this->getRecordService()->getEntity($id);
+        $entity = $this->getRecordService()->readEntity($id);

        if (empty($entity)) {
            throw new NotFound();
@@ -168,6 +168,9 @@ class Record extends Base
        if ($request->get('boolFilterList')) {
            $params['boolFilterList'] = $request->get('boolFilterList');
        }
+        if ($request->get('filterList')) {
+            $params['filterList'] = $request->get('filterList');
+        }
    }

    public function actionListLinked($params, $data, $request)
@@ -226,6 +229,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 +241,31 @@ 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'];
+        }
+
+        if (isset($data['fieldList'])) {
+            $params['fieldList'] = $data['fieldList'];
+        }
+
+        if (isset($data['format'])) {
+            $params['format'] = $data['format'];
+        }
+
        return array(
            'id' => $this->getRecordService()->export($params)
        );
@@ -266,6 +287,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,14 +314,15 @@ 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'];
        }

-        $idsRemoved = $this->getRecordService()->massRemove($params);
-
-        return $idsRemoved;
+        return $this->getRecordService()->massRemove($params);
    }

    public function actionCreateLink($params, $data, $request)
@@ -318,7 +343,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'])) {
@@ -439,5 +470,31 @@ class Record extends Base

        return $this->getRecordService()->getDuplicateAttributes($data['id']);
    }
+
+    public function postActionMassFollow($params, $data, $request)
+    {
+        if (!$this->getAcl()->check($this->name, 'stream')) {
+            throw new Forbidden();
+        }
+
+        if (array_key_exists('ids', $data)) {
+            $params['ids'] = $data['ids'];
+        }
+
+        return $this->getRecordService()->massFollow($params);
+    }
+
+    public function postActionMassUnfollow($params, $data, $request)
+    {
+        if (!$this->getAcl()->check($this->name, 'stream')) {
+            throw new Forbidden();
+        }
+
+        if (array_key_exists('ids', $data)) {
+            $params['ids'] = $data['ids'];
+        }
+
+        return $this->getRecordService()->massUnfollow($params);
+    }
 }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -283,24 +283,20 @@ class CronManager
            }

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

-            if ($cronExpression->isDue()) {
-                $previousDate = date('Y-m-d H:i:s');
-            }
-
-            $existingJob = $this->getCronJob()->getJobByScheduledJob($scheduledJob['id'], $previousDate);
+            $existingJob = $this->getCronJob()->getJobByScheduledJob($scheduledJob['id'], $nextDate);
            if ($existingJob) continue;

            $className = $this->getScheduledJobUtil()->get($scheduledJob['job']);
            if ($className) {
                if (method_exists($className, 'prepare')) {
                    $implementation = new $className($this->container);
-                    $implementation->prepare($scheduledJob, $previousDate);
+                    $implementation->prepare($scheduledJob, $nextDate);
                    continue;
                }
            }
@@ -314,7 +310,7 @@ class CronManager
                'name' => $scheduledJob['name'],
                'status' => self::PENDING,
                'scheduledJobId' => $scheduledJob['id'],
-                'executeTime' => $previousDate,
+                'executeTime' => $nextDate,
                'method' => $scheduledJob['job']
            ));
            $this->getEntityManager()->saveEntity($jobEntity);
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -28,6 +28,7 @@
 ************************************************************************/

 namespace Espo\Core;
+
 class DataManager
 {
    private $container;
@@ -58,6 +59,8 @@ class DataManager

        $result &= $this->rebuildDatabase($entityList);

+        $this->rebuildScheduledJobs();
+
        return $result;
    }

@@ -113,11 +116,45 @@ 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;
+    }
+
+    public function rebuildScheduledJobs()
+    {
+        $metadata = $this->getContainer()->get('metadata');
+        $entityManager = $this->getContainer()->get('entityManager');
+
+        $jobs = $metadata->get(['entityDefs', 'ScheduledJob', 'jobs'], array());
+
+        foreach ($jobs as $jobName => $defs) {
+            if ($jobName && !empty($defs['isSystem']) && !empty($defs['scheduling'])) {
+                if (!$entityManager->getRepository('ScheduledJob')->where(array(
+                    'job' => $jobName,
+                    'status' => 'Active',
+                    'scheduling' => $defs['scheduling']
+                ))->findOne()) {
+                    $job = $entityManager->getRepository('ScheduledJob')->where(array(
+                        'job' => $jobName
+                    ))->findOne();
+                    if ($job) {
+                        $entityManager->removeEntity($job);
+                    }
+                    $job = $entityManager->getEntity('ScheduledJob');
+                    $job->set(array(
+                        'job' => $jobName,
+                        'status' => 'Active',
+                        'scheduling' => $defs['scheduling'],
+                        'isInternal' => true,
+                        'name' => $jobName
+                    ));
+                    $entityManager->saveEntity($job);
+                }
+            }
+        }
    }

    /**
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -0,0 +1,65 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2017 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\Export;
+
+use \Espo\Core\Exceptions\Error;
+
+class Csv extends \Espo\Core\Injectable
+{
+    protected $dependencyList = [
+        'config',
+        'preferences'
+    ];
+
+    public function process($entityType, $params, $dataList)
+    {
+        if (!is_array($params['attributeList'])) {
+            throw new Error();
+        }
+
+        $attributeList = $params['attributeList'];
+
+        $delimiter = $this->getInjection('preferences')->get('exportDelimiter');
+        if (empty($delimiter)) {
+            $delimiter = $this->getInjection('config')->get('exportDelimiter', ';');
+        }
+
+        $fp = fopen('php://temp', 'w');
+        fputcsv($fp, $attributeList, $delimiter);
+        foreach ($dataList as $row) {
+            fputcsv($fp, $row, $delimiter);
+        }
+        rewind($fp);
+        $csv = stream_get_contents($fp);
+        fclose($fp);
+
+        return $csv;
+    }
+}
@@ -0,0 +1,458 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2017 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\Export;
+
+use \Espo\ORM\Entity;
+use \Espo\Core\Exceptions\Error;
+
+class Xlsx extends \Espo\Core\Injectable
+{
+    protected $dependencyList = [
+        'language',
+        'metadata',
+        'config',
+        'dateTime',
+        'entityManager',
+        'fileStorageManager',
+        'fileManager'
+    ];
+
+    protected function getConfig()
+    {
+        return $this->getInjection('config');
+    }
+
+    protected function getMetadata()
+    {
+        return $this->getInjection('metadata');
+    }
+
+    protected function getEntityManager()
+    {
+        return $this->getInjection('entityManager');
+    }
+
+    public function loadAdditionalFields(Entity $entity, $fieldList)
+    {
+        foreach ($entity->getRelationList() as $link) {
+            if ($entity->getRelationType($link) === 'belongsToParent') {
+                if (in_array($link, $fieldList)) {
+                    $parent = $entity->get($link);
+                    if ($parent instanceof Entity) {
+                        $entity->set($link . 'Name', $parent->get('name'));
+                    }
+                }
+            } else if ($entity->getRelationType($link) === 'belongsTo' && $entity->getRelationParam($link, 'noJoin') && $entity->hasField($link . 'Name')) {
+                if (in_array($link, $fieldList)) {
+                    $related = $entity->get($link);
+                    if ($related instanceof Entity) {
+                        $entity->set($link . 'Name', $related->get('name'));
+                    }
+                }
+            }
+        }
+    }
+
+    public function addAdditionalAttributes($entityType, &$attributeList, $fieldList)
+    {
+        $linkList = [];
+
+        if (!in_array('id', $attributeList)) {
+            $attributeList[] = 'id';
+        }
+
+        $linkDefs = $this->getMetadata()->get(['entityDefs', $entityType, 'links']);
+        if (is_array($linkDefs)) {
+            foreach ($linkDefs as $link => $defs) {
+                if (empty($defs['type'])) continue;
+                if ($defs['type'] === 'belongsToParent') {
+                    $linkList[] = $link;
+                } else if ($defs['type'] === 'belongsTo' && !empty($defs['noJoin'])) {
+                    if ($this->getMetadata()->get(['entityDefs', $entityType, 'fields', $link])) {
+                        $linkList[] = $link;
+                    }
+                }
+            }
+        }
+        foreach ($linkList as $item) {
+            if (in_array($item, $fieldList) && !in_array($item . 'Name', $attributeList)) {
+                $attributeList[] = $item . 'Name';
+            }
+        }
+
+        foreach ($fieldList as $field) {
+            $type = $this->getMetadata()->get(['entityDefs', $entityType, 'fields', $field, 'type']);
+            if ($type === 'currencyConverted') {
+                if (!in_array($field, $attributeList)) {
+                    $attributeList[] = $field;
+                }
+            }
+        }
+    }
+
+    public function process($entityType, $params, $dataList)
+    {
+        if (!is_array($params['fieldList'])) {
+            throw new Error();
+        }
+
+        $phpExcel = new \PHPExcel();
+        $sheet = $phpExcel->setActiveSheetIndex(0);
+
+        if (isset($params['exportName'])) {
+            $exportName = $params['exportName'];
+        } else {
+            $exportName = $this->getInjection('language')->translate($entityType, 'scopeNamesPlural');
+        }
+
+        $sheetName = substr($exportName, 0, 30);
+        $badCharList = ['*', ':', '/', '\\', '?', '[', ']'];
+        foreach ($badCharList as $badChar) {
+            $sheetName = str_replace($badCharList, ' ', $sheetName);
+        }
+        $sheetName = str_replace('\'', '', $sheetName);
+
+        $sheet->setTitle($sheetName);
+
+        $fieldList = $params['fieldList'];
+
+        $titleStyle = array(
+            'font' => array(
+               'bold' => true,
+               'size' => 12
+            )
+        );
+        $dateStyle = array(
+            'font'  => array(
+               'size' => 12
+            )
+        );
+
+        $sheet->setCellValue('A1', $exportName);
+
+        $sheet->setCellValue('B1', \PHPExcel_Shared_Date::PHPToExcel(strtotime(date('Y-m-d H:i:s'))));
+
+
+        $sheet->getStyle('A1')->applyFromArray($titleStyle);
+        $sheet->getStyle('B1')->applyFromArray($dateStyle);
+
+        $sheet->getStyle('B1')->getNumberFormat()
+                            ->setFormatCode($this->getInjection('dateTime')->getDateTimeFormat());
+
+        $azRange = range('A', 'Z');
+        $azRangeCopied = $azRange;
+        foreach ($azRangeCopied as $i => $char1) {
+            foreach ($azRangeCopied as $j => $char2) {
+                $azRange[] = $char1 . $char2;
+                if ($i * count($azRangeCopied) + $j === count($fieldList)) {
+                    break 2;
+                }
+            }
+        }
+
+        $rowNumber = 3;
+
+        $linkColList = [];
+
+        $lastIndex = 0;
+
+        foreach ($fieldList as $i => $name) {
+            $col = $azRange[$i];
+
+            $defs = $this->getInjection('metadata')->get(['entityDefs', $entityType, 'fields', $name]);
+
+            if (!$defs) {
+                $defs['type'] = 'base';
+            }
+
+            $label = $name;
+            if (strpos($name, '_') !== false) {
+                list($linkName, $foreignField) = explode('_', $name);
+                $foreignScope = $this->getInjection('metadata')->get(['entityDefs', $entityType, 'links', $linkName, 'entity']);
+                if ($foreignScope) {
+                    $label = $this->getInjection('language')->translate($linkName, 'links', $entityType) . '.' . $this->getInjection('language')->translate($foreignField, 'fields', $foreignScope);
+                }
+            } else {
+                $label = $this->getInjection('language')->translate($name, 'fields', $entityType);
+            }
+
+            $sheet->setCellValue($col . $rowNumber, $label);
+            $sheet->getColumnDimension($col)->setAutoSize(true);
+            if (in_array($defs['type'], ['phone', 'email', 'url', 'link', 'linkParent'])) {
+                $linkColList[] = $col;
+            } else if ($name == 'name') {
+                $linkColList[] = $col;
+            }
+            $lastIndex = $i;
+        }
+
+        $col = $azRange[$i];
+
+        $headerStyle = array(
+            'font'  => array(
+                'bold'  => true,
+                'size'  => 12
+            )
+        );
+
+        $sheet->getStyle("A$rowNumber:$col$rowNumber")->applyFromArray($headerStyle);
+        $sheet->setAutoFilter("A$rowNumber:$col$rowNumber");
+
+        $typesCache = array();
+
+        $rowNumber++;
+        foreach ($dataList as $row) {
+            $i = 0;
+            foreach ($fieldList as $i => $name) {
+                $col = $azRange[$i];
+
+                $defs = $this->getInjection('metadata')->get(['entityDefs', $entityType, 'fields', $name]);
+                if (!$defs) {
+                    $defs = array();
+                    $defs['type'] = 'base';
+                }
+
+                $type = $defs['type'];
+                $foreignField = $name;
+                $linkName = null;
+                if (strpos($name, '_') !== false) {
+                    list($linkName, $foreignField) = explode('_', $name);
+                    $foreignScope = $this->getInjection('metadata')->get(['entityDefs', $entityType, 'links', $linkName, 'entity']);
+                    if ($foreignScope) {
+                        $type = $this->getInjection('metadata')->get(['entityDefs', $foreignScope, 'fields', $foreignField, 'type'], $type);
+                    }
+                }
+                $typesCache[$name] = $type;
+
+                $link = null;
+                if ($type == 'link') {
+                    if (array_key_exists($name.'Name', $row)) {
+                        $sheet->setCellValue("$col$rowNumber", $row[$name.'Name']);
+                    }
+                } else if ($type == 'linkParent') {
+                    if (array_key_exists($name.'Name', $row)) {
+                        $sheet->setCellValue("$col$rowNumber", $row[$name.'Name']);
+                    }
+                } else if ($type == 'int') {
+                    $sheet->setCellValue("$col$rowNumber", $row[$name] ?: 0);
+                } else if ($type == 'currency') {
+                    if (array_key_exists($name.'Currency', $row) && array_key_exists($name, $row)) {
+                        $sheet->setCellValue("$col$rowNumber", $row[$name] ? $row[$name] : '');
+                        $currency = $row[$name . 'Currency'];
+                        $currencySymbol = $this->getMetadata()->get(['app', 'currency', 'symbolMap', $currency], '');
+
+                        $sheet->getStyle("$col$rowNumber")
+                            ->getNumberFormat()
+                            ->setFormatCode('[$'.$currencySymbol.'-409]#,##0.00;-[$'.$currencySymbol.'-409]#,##0.00');
+                    }
+                } else if ($type == 'currencyConverted') {
+                    if (array_key_exists($name, $row)) {
+                        $currency = $this->getConfig()->get('baseCurrency');
+                        $currencySymbol = $this->getMetadata()->get(['app', 'currency', 'symbolMap', $currency], '');
+
+                        $sheet->getStyle("$col$rowNumber")
+                            ->getNumberFormat()
+                            ->setFormatCode('[$'.$currencySymbol.'-409]#,##0.00;-[$'.$currencySymbol.'-409]#,##0.00');
+
+                        $sheet->setCellValue("$col$rowNumber", $row[$name] ? $row[$name] : '');
+                    }
+                } else if ($type == 'personName') {
+                    if (!empty($row['name'])) {
+                        $sheet->setCellValue("$col$rowNumber", $row['name']);
+                    } else {
+                        $personName = '';
+                        if (!empty($row['firstName'])) {
+                            $personName .= $row['firstName'];
+                        }
+                        if (!empty($row['lastName'])) {
+                            if (!empty($row['firstName'])) {
+                                $personName .= ' ';
+                            }
+                            $personName .= $row['lastName'];
+                        }
+                        $sheet->setCellValue("$col$rowNumber", $personName);
+                    }
+                } else if ($type == 'date') {
+                    if (isset($row[$name])) {
+                        $sheet->setCellValue("$col$rowNumber", \PHPExcel_Shared_Date::PHPToExcel(strtotime($row[$name])));
+                    }
+                } else if ($type == 'datetime' || $type == 'datetimeOptional') {
+                    if (isset($row[$name])) {
+                        $sheet->setCellValue("$col$rowNumber", \PHPExcel_Shared_Date::PHPToExcel(strtotime($row[$name])));
+                    }
+                } else if ($type == 'image') {
+                    if (isset($row[$name . 'Id']) && $row[$name . 'Id']) {
+                        $attachment = $this->getEntityManager()->getEntity('Attachment', $row[$name . 'Id']);
+
+                        if ($attachment) {
+                            $objDrawing = new \PHPExcel_Worksheet_Drawing();
+                            $filePath = $this->getInjection('fileStorageManager')->getLocalFilePath($attachment);
+
+                            if ($filePath && file_exists($filePath)) {
+                                $objDrawing->setPath($filePath);
+                                $objDrawing->setHeight(100);
+                                $objDrawing->setCoordinates("$col$rowNumber");
+                                $objDrawing->setWorksheet($sheet);
+                                $sheet->getRowDimension($rowNumber)->setRowHeight(100);
+                            }
+                        }
+                    }
+
+                } else if ($type == 'file') {
+                    if (array_key_exists($name.'Name', $row)) {
+                        $sheet->setCellValue("$col$rowNumber", $row[$name.'Name']);
+                    }
+                } else if ($type == 'enum') {
+                    if (array_key_exists($name, $row)) {
+                        if ($linkName) {
+                            $value = $this->getInjection('language')->translateOption($row[$name], $foreignField, $foreignScope);
+                        } else {
+                            $value = $this->getInjection('language')->translateOption($row[$name], $name, $entityType);
+                        }
+                        $sheet->setCellValue("$col$rowNumber", $value);
+                    }
+                } else {
+                    if (array_key_exists($name, $row)) {
+                        $sheet->setCellValue("$col$rowNumber", $row[$name]);
+                    }
+                }
+
+                $link = false;
+
+                if ($name == 'name') {
+                    if (array_key_exists('id', $row)) {
+                        $link = $this->getConfig()->getSiteUrl() . "/#".$entityType . "/view/" . $row['id'];
+                    }
+                } else if ($type == 'url') {
+                    if (array_key_exists($name, $row) && filter_var($row[$name], FILTER_VALIDATE_URL)) {
+                        $link = $row[$name];
+                    }
+                } else if ($type == 'link') {
+                    if (array_key_exists($name.'Id', $row)) {
+                        $foreignEntity = $this->getMetadata()->get(['entityDefs', $entityType, 'links', $name, 'entity']);
+                        if ($foreignEntity) {
+                            $link = $this->getConfig()->getSiteUrl() . "/#" . $foreignEntity. "/view/". $row[$name.'Id'];
+                        }
+                    }
+                } else if ($type == 'file') {
+                    if (array_key_exists($name.'Id', $row)) {
+                        $link = $this->getConfig()->getSiteUrl() . "/?entryPoint=download&id=" . $row[$name.'Id'];
+                    }
+                } else if ($type == 'linkParent') {
+                    if (array_key_exists($name.'Id', $row) && array_key_exists($name.'Type', $row)) {
+                        $link = $this->getConfig()->getSiteUrl() . "/#".$row[$name.'Type']."/view/". $row[$name.'Id'];
+                    }
+                } else if ($type == 'phone') {
+                    if (array_key_exists($name, $row)) {
+                        $link = "tel:".$row[$name];
+                    }
+                } else if ($type == 'email' && array_key_exists($name, $row)) {
+                    if (array_key_exists($name, $row)) {
+                        $link = "mailto:".$row[$name];
+                    }
+                }
+                if ($link) {
+                    $sheet->getCell("$col$rowNumber")->getHyperlink()->setUrl($link);
+                    $sheet->getCell("$col$rowNumber")->getHyperlink()->setTooltip($link);
+                }
+            }
+            $rowNumber++;
+        }
+
+        $sheet->getStyle("A2:A$rowNumber")
+            ->getNumberFormat()
+            ->setFormatCode(\PHPExcel_Style_NumberFormat::FORMAT_TEXT);
+
+        $startingRowNumber = 4;
+
+        foreach ($fieldList as $i => $name) {
+            $col = $azRange[$i];
+
+            $type = $typesCache[$name];
+
+
+            switch($type) {
+                case 'currency':
+                case 'currencyConverted': {
+
+                } break;
+                case 'int': {
+                    $sheet->getStyle($col.$startingRowNumber.':'.$col.$rowNumber)
+                        ->getNumberFormat()
+                        ->setFormatCode('0');
+                } break;
+                case 'date': {
+                    $sheet->getStyle($col.$startingRowNumber.':'.$col.$rowNumber)
+                        ->getNumberFormat()
+                        ->setFormatCode($this->getInjection('dateTime')->getDateFormat());
+                } break;
+                case 'datetime': {
+                    $sheet->getStyle($col.$startingRowNumber.':'.$col.$rowNumber)
+                        ->getNumberFormat()
+                        ->setFormatCode($this->getInjection('dateTime')->getDateTimeFormat());
+                } break;
+                case 'datetimeOptional': {
+                    $sheet->getStyle($col.$startingRowNumber.':'.$col.$rowNumber)
+                        ->getNumberFormat()
+                        ->setFormatCode($this->getInjection('dateTime')->getDateTimeFormat());
+                } break;
+                default: {
+                    $sheet->getStyle($col.$startingRowNumber.':'.$col.$rowNumber)
+                        ->getNumberFormat()
+                        ->setFormatCode('@');
+                } break;
+            }
+        }
+
+        $linkStyle = [
+            'font'  => [
+                'color' => ['rgb' => '345b7c'],
+                'underline' => 'single'
+            ]
+        ];
+        foreach ($linkColList as $linkColumn) {
+            $sheet->getStyle($linkColumn.$startingRowNumber.':'.$linkColumn.$rowNumber)->applyFromArray($linkStyle);
+        }
+
+        $objWriter = \PHPExcel_IOFactory::createWriter($phpExcel, 'Excel2007');
+
+        if (!$this->getInjection('fileManager')->isDir('data/cache/')) {
+            $this->getInjection('fileManager')->mkdir('data/cache/');
+        }
+        $tempFileName = 'data/cache/' . 'export_' . substr(md5(rand()), 0, 7);
+
+        $objWriter->save($tempFileName);
+        $fp = fopen($tempFileName, 'r');
+        $xlsx = stream_get_contents($fp);
+        $this->getInjection('fileManager')->unlink($tempFileName);
+
+        return $xlsx;
+    }
+}
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -42,6 +42,11 @@ class ExtensionManager extends Upgrades\Base
            'after' => 'AfterInstall',
            'beforeUninstall' => 'BeforeUninstall',
            'afterUninstall' => 'AfterUninstall',
+        ),
+
+        'customDirNames' => array(
+            'before' => 'beforeInstallFiles',
+            'after' => 'afterInstallFiles',
        )
    );
 }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -0,0 +1,115 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2017 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\FileStorage;
+
+use \Espo\Entities\Attachment;
+
+use \Espo\Core\Exceptions\Error;
+
+class Manager
+{
+    private $implementations = array();
+
+    private $implementationClassNameMap = array();
+
+    private $container;
+
+    public function __construct(array $implementationClassNameMap, $container)
+    {
+        $this->implementationClassNameMap = $implementationClassNameMap;
+        $this->container = $container;
+    }
+
+    private function getImplementation($storage = null)
+    {
+        if (!$storage) {
+            $storage = 'EspoUploadDir';
+        }
+
+        if (array_key_exists($storage, $this->implementations)) {
+            return $this->implementations[$storage];
+        }
+
+        if (!array_key_exists($storage, $this->implementationClassNameMap)) {
+            throw new Error("FileStorageManager: Unknown storage '{$storage}'");
+        }
+        $className = $this->implementationClassNameMap[$storage];
+
+        $implementation = new $className();
+        foreach ($implementation->getDependencyList() as $dependencyName) {
+            $implementation->inject($dependencyName, $this->container->get($dependencyName));
+        }
+        $this->implementations[$storage] = $implementation;
+
+        return $implementation;
+    }
+
+    public function isFile(Attachment $attachment)
+    {
+        $implementation = $this->getImplementation($attachment->get('storage'));
+        return $implementation->isFile($attachment);
+    }
+
+    public function getContents(Attachment $attachment)
+    {
+        $implementation = $this->getImplementation($attachment->get('storage'));
+        return $implementation->getContents($attachment);
+    }
+
+    public function putContents(Attachment $attachment, $contents)
+    {
+        $implementation = $this->getImplementation($attachment->get('storage'));
+        return $implementation->putContents($attachment, $contents);
+    }
+
+    public function unlink(Attachment $attachment)
+    {
+        $implementation = $this->getImplementation($attachment->get('storage'));
+        return $implementation->unlink($attachment);
+    }
+
+    public function getLocalFilePath(Attachment $attachment)
+    {
+        $implementation = $this->getImplementation($attachment->get('storage'));
+        return $implementation->getLocalFilePath($attachment);
+    }
+
+    public function hasDownloadUrl(Attachment $attachment)
+    {
+        $implementation = $this->getImplementation($attachment->get('storage'));
+        return $implementation->hasDownloadUrl($attachment);
+    }
+
+    public function getDownloadUrl(Attachment $attachment)
+    {
+        $implementation = $this->getImplementation($attachment->get('storage'));
+        return $implementation->getDownloadUrl($attachment);
+    }
+}
@@ -0,0 +1,89 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2017 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\FileStorage\Storages;
+
+use \Espo\Core\Interfaces\Injectable;
+
+abstract class Base implements Injectable
+{
+    protected $dependencyList = [];
+
+    protected $injections = array();
+
+    public function inject($name, $object)
+    {
+        $this->injections[$name] = $object;
+    }
+
+    public function __construct()
+    {
+        $this->init();
+    }
+
+    protected function init()
+    {
+    }
+
+    protected function getInjection($name)
+    {
+        return $this->injections[$name];
+    }
+
+    protected function addDependency($name)
+    {
+        $this->dependencyList[] = $name;
+    }
+
+    protected function addDependencyList(array $list)
+    {
+        foreach ($list as $item) {
+            $this->addDependency($item);
+        }
+    }
+
+    public function getDependencyList()
+    {
+        return $this->dependencyList;
+    }
+
+    abstract public function hasDownloadUrl(\Espo\Entities\Attachment $attachment);
+
+    abstract public function getDownloadUrl(\Espo\Entities\Attachment $attachment);
+
+    abstract public function unlink(\Espo\Entities\Attachment $attachment);
+
+    abstract public function getContents(\Espo\Entities\Attachment $attachment);
+
+    abstract public function isFile(\Espo\Entities\Attachment $attachment);
+
+    abstract public function putContents(\Espo\Entities\Attachment $attachment, $contents);
+
+    abstract public function getLocalFilePath(\Espo\Entities\Attachment $attachment);
+}
@@ -0,0 +1,85 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2017 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\FileStorage\Storages;
+
+use \Espo\Entities\Attachment;
+
+use \Espo\Core\Exceptions\Error;
+
+class EspoUploadDir extends Base
+{
+    protected $dependencyList = ['fileManager'];
+
+    protected function getFileManager()
+    {
+        return $this->getInjection('fileManager');
+    }
+
+    public function unlink(Attachment $attachment)
+    {
+        return $this->getFileManager()->unlink($this->getFilePath($attachment));
+    }
+
+    public function isFile(Attachment $attachment)
+    {
+        return $this->getFileManager()->isFile($this->getFilePath($attachment));
+    }
+
+    public function getContents(Attachment $attachment)
+    {
+        return $this->getFileManager()->getContents($this->getFilePath($attachment));
+    }
+
+    public function putContents(Attachment $attachment, $contents)
+    {
+        return $this->getFileManager()->putContents($this->getFilePath($attachment), $contents);
+    }
+
+    public function getLocalFilePath(Attachment $attachment)
+    {
+        return $this->getFilePath($attachment);
+    }
+
+    protected function getFilePath(Attachment $attachment)
+    {
+        $sourceId = $attachment->getSourceId();
+        return 'data/upload/' . $sourceId;
+    }
+
+    public function getDownloadUrl(Attachment $attachment)
+    {
+        throw new Error();
+    }
+
+    public function hasDownloadUrl(Attachment $attachment)
+    {
+        return false;
+    }
+}
@@ -0,0 +1,87 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2017 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\Formula;
+
+use \Espo\ORM\Entity;
+use \Espo\Core\Exceptions\Error;
+
+class AttributeFetcher
+{
+    private $relatedEntitiesCacheMap = array();
+
+    public function __construct()
+    {
+    }
+
+    public function fetch(Entity $entity, $attribute, $getFetchedAttribute = false)
+    {
+        if (!is_string($attribute)) {
+            throw new Error();
+        }
+
+        if (strpos($attribute, '.') !== false) {
+            $arr = explode('.', $attribute);
+
+            $key = $this->buildKey($entity, $arr[0]);
+            if (!array_key_exists($key, $this->relatedEntitiesCacheMap)) {
+                $this->relatedEntitiesCacheMap[$key] = $entity->get($arr[0]);
+            }
+            $relatedEntity = $this->relatedEntitiesCacheMap[$key];
+            if ($relatedEntity && ($relatedEntity instanceof Entity) && count($arr) > 0) {
+                return $this->fetch($relatedEntity, $arr[1]);
+            }
+            return null;
+        }
+
+        $methodName = 'get';
+        if ($getFetchedAttribute) {
+            $methodName = 'getFetched';
+        }
+
+        if ($entity->getAttributeParam($attribute, 'isParentName') && $methodName == 'get') {
+            $relationName = $entity->getAttributeParam($attribute, 'relation');
+            if ($parent = $entity->get($relationName)) {
+                return $parent->get('name');
+            }
+        }
+
+        return $entity->$methodName($attribute);
+    }
+
+    public function resetRuntimeCache()
+    {
+        $this->relatedEntitiesCacheMap = array();
+    }
+
+    protected function buildKey(Entity $entity, $link)
+    {
+        return spl_object_hash($entity) . '-' . $link;
+    }
+}
@@ -0,0 +1,66 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2017 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\Formula;
+
+use \Espo\Core\Exceptions\Error;
+
+class Evaluator
+{
+    private $functionFactory;
+
+    private $formula;
+
+    private $parser;
+
+    private $parsedHash;
+
+    public function __construct($container = null, array $functionClassNameMap = array(), array $parsedHash = array())
+    {
+        $this->functionFactory = new \Espo\Core\Formula\FunctionFactory($container, $functionClassNameMap);
+        $this->formula = new \Espo\Core\Formula\Formula($this->functionFactory);
+        $this->parser = new \Espo\Core\Formula\Parser();
+        $this->parsedHash = array();
+    }
+
+    public function process($expression, $entity = null, $variables = null)
+    {
+        if (!array_key_exists($expression, $this->parsedHash)) {
+            $item = $this->parser->parse($expression);
+            $this->parsedHash[$expression] = $item;
+        } else {
+            $item = $this->parsedHash[$expression];
+        }
+
+        if (!$item || !($item instanceof \StdClass)) {
+            throw new Error();
+        }
+        return $this->formula->process($item, $entity, $variables);
+    }
+}
--- a/Show More
+++ b/Show More