fix install

PHPUnit for "Route : possibility to replace routes in modules"

.gitignore

@@ -8,15 +8,6 @@
 /node_modules
 /test.php
 /main.html
-/client/css/espo.css
-/client/css/espo-vertical.css
-/client/css/sakura.css
-/client/css/sakura-vertical.css
-/client/css/violet.css
-/client/css/violet-vertical.css
-/client/css/espo-rtl.css
-/client/css/hazyblue.css
-/client/css/hazyblue-vertical.css
 
 /tests/unit/testData/cache/*
 !/tests/unit/testData/cache/.data

Gruntfile.js

@@ -2,7 +2,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -41,6 +41,35 @@ module.exports = function (grunt) {
         'client/src/utils.js'
     ];
 
+    function camelCaseToHyphen (string){
+        if (string == null) {
+            return string;
+        }
+        return string.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+    }
+
+    var fs = require('fs');
+
+    var themeList = [];
+    fs.readdirSync('application/Espo/Resources/metadata/themes').forEach(function (file) {
+        themeList.push(file.substr(0, file.length - 5));
+    });
+
+    var lessData = {};
+    themeList.forEach(function (theme) {
+        var name = camelCaseToHyphen(theme);
+        var files = {};
+        files['client/css/espo/'+name+'.css'] = 'frontend/less/'+name+'/main.less';
+        files['client/css/espo/'+name+'-iframe.css'] = 'frontend/less/'+name+'/iframe/main.less';
+        var o = {
+            options: {
+                yuicompress: true,
+            },
+            files: files
+        };
+        lessData[theme] = o;
+    });
+
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
 
@@ -59,89 +88,7 @@ module.exports = function (grunt) {
             start: ['build/*'],
             final: ['build/tmp'],
         },
-        less: {
-            espo: {
-                options: {
-                    yuicompress: true,
-                },
-                files: {
-                    'client/css/espo.css': 'frontend/less/espo/main.less',
-                }
-            },
-            espoVertical: {
-                options: {
-                    yuicompress: true,
-                },
-                files: {
-                    '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,
-                },
-                files: {
-                    'client/css/sakura.css': 'frontend/less/sakura/main.less',
-                }
-            },
-            sakuraVertical: {
-                options: {
-                    yuicompress: true,
-                },
-                files: {
-                    'client/css/sakura-vertical.css': 'frontend/less/sakura-vertical/main.less',
-                }
-            },
-            violet: {
-                options: {
-                    yuicompress: true,
-                },
-                files: {
-                    'client/css/violet.css': 'frontend/less/violet/main.less',
-                }
-            },
-            violetVertical: {
-                options: {
-                    yuicompress: true,
-                },
-                files: {
-                    'client/css/violet-vertical.css': 'frontend/less/violet-vertical/main.less',
-                }
-            }
-        },
-        cssmin: {
-            minify: {
-                files: {
-                    'build/tmp/client/css/espo.css': [
-                        'client/css/espo.css',
-                    ]
-                }
-            },
-        },
+        less: lessData,
         uglify: {
             options: {
                 mangle: false,
@@ -168,10 +115,6 @@ module.exports = function (grunt) {
                 ],
                 dest: 'build/tmp/client',
             },
-            frontendHtml: {
-                src: 'frontend/reset.html',
-                dest: 'build/tmp/reset.html'
-            },
             frontendLib: {
                 expand: true,
                 dot: true,
@@ -311,10 +254,8 @@ module.exports = function (grunt) {
         'clean:start',
         'mkdir:tmp',
         'less',
-        'cssmin',
         'uglify',
         'copy:frontendFolders',
-        'copy:frontendHtml',
         'copy:frontendLib',
         'copy:backend',
         'replace',

README.md

@@ -8,10 +8,14 @@ Download the latest release from our [website](http://www.espocrm.com).
 
 ### Requirements
 
-* PHP 5.5 or above (with pdo, json, gd, mcrypt extensions);
+* PHP 5.6 or above (with pdo, json, gd, openssl, zip, imap, mbstring, curl extensions);
 * MySQL 5.1 or above.
 
-For more information about server configuration see [this article](http://blog.espocrm.com/administration/server-configuration-for-espocrm/).
+For more information about server configuration see [this article](https://www.espocrm.com/documentation/administration/server-configuration/).
+
+### Documentation
+
+Documentation for administrators, users and developers is available [here](https://www.espocrm.com/documentation/).
 
 ### How to report bug
 

api/v1/index.php

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

api/v1/portal-access/index.php

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

application/Espo/Acl/ActionHistoryRecord.php

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

application/Espo/Acl/Attachment.php

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

application/Espo/Acl/Email.php

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

application/Espo/Acl/EmailFilter.php

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

application/Espo/Acl/Notification.php

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

application/Espo/Acl/ScheduledJob.php

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

application/Espo/Acl/Team.php

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

application/Espo/Acl/User.php

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

application/Espo/AclPortal/Attachment.php

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

application/Espo/AclPortal/Email.php

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

application/Espo/AclPortal/Notification.php

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

application/Espo/AclPortal/User.php

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

application/Espo/Controllers/ActionHistoryRecord.php

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

application/Espo/Controllers/Admin.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -53,7 +53,7 @@ class Admin extends \Espo\Core\Controllers\Base
         return $result;
     }
 
-    public function postActionClearCache($params, $data)
+    public function postActionClearCache($params)
     {
         $result = $this->getContainer()->get('dataManager')->clearCache();
         return $result;
@@ -93,15 +93,19 @@ class Admin extends \Espo\Core\Controllers\Base
         }
 
         $upgradeManager = new \Espo\Core\UpgradeManager($this->getContainer());
-        $upgradeManager->install($data);
+        $upgradeManager->install(get_object_vars($data));
 
         return true;
     }
 
-    public function actionCronMessage($params, $data)
+    public function actionCronMessage($params)
     {
         return $this->getContainer()->get('scheduledJob')->getSetupMessage();
     }
 
+    public function actionAdminNotificationList($params)
+    {
+        $adminNotificationManager = new \Espo\Core\Utils\AdminNotificationManager($this->getContainer());
+        return $adminNotificationManager->getNotificationList();
+    }
 }
-

application/Espo/Controllers/App.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -35,57 +35,16 @@ class App extends \Espo\Core\Controllers\Base
 {
     public function actionUser()
     {
-        $preferences = $this->getPreferences()->getValues();
-        unset($preferences['smtpPassword']);
-
-        $user = $this->getUser();
-        if (!$user->has('teamsIds')) {
-            $user->loadLinkMultipleField('teams');
-        }
-        if ($user->get('isPortalUser')) {
-            $user->loadAccountField();
-            $user->loadLinkMultipleField('accounts');
-        }
-
-        $userData = $user->getValues();
-
-        $emailAddressList = [];
-        foreach ($user->get('emailAddresses') as $emailAddress) {
-            if ($emailAddress->get('invalid')) continue;
-            if ($user->get('emailAddrses') === $emailAddress->get('name')) continue;
-            $emailAddressList[] = $emailAddress->get('name');
-        }
-        if ($user->get('emailAddrses')) {
-            array_unshift($emailAddressList, $user->get('emailAddrses'));
-        }
-        $userData['emailAddressList'] = $emailAddressList;
-
-        $settings = (object)[];
-        foreach ($this->getConfig()->get('userItems') as $item) {
-            $settings->$item = $this->getConfig()->get($item);
-        }
-
-        unset($userData['authTokenId']);
-        unset($userData['password']);
-
-        return array(
-            'user' => $userData,
-            'acl' => $this->getAcl()->getMap(),
-            'preferences' => $preferences,
-            'token' => $this->getUser()->get('token'),
-            'settings' => $settings
-        );
+        return $this->getServiceFactory()->create('App')->getUserData();
     }
 
     public function postActionDestroyAuthToken($params, $data)
     {
-        $token = $data['token'];
-        if (empty($token)) {
+        if (empty($data->token)) {
             throw new BadRequest();
         }
 
         $auth = new \Espo\Core\Utils\Auth($this->getContainer());
-        return $auth->destroyAuthToken($token);
+        return $auth->destroyAuthToken($data->token);
     }
 }
-

application/Espo/Controllers/Attachment.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -34,32 +34,5 @@ use \Espo\Core\Exceptions\BadRequest;
 
 class Attachment extends \Espo\Core\Controllers\Record
 {
-    public function actionUpload($params, $data, $request)
-    {
-        if (!$request->isPost()) {
-            throw new BadRequest();
-        }
-
-        if (!$this->getAcl()->checkScope('Attachment', 'create')) {
-            throw new Forbidden();
-        }
-
-        $arr = explode(',', $data);
-        if (count($arr) > 1) {
-            list($prefix, $contents) = $arr;
-            $contents = base64_decode($contents);
-        } else {
-            $contents = '';
-        }
-
-        $attachment = $this->getEntityManager()->getEntity('Attachment');
-        $this->getEntityManager()->saveEntity($attachment);
-        $this->getContainer()->get('fileStorageManager')->putContents($attachment, $contents);
-
-        return array(
-            'attachmentId' => $attachment->id
-        );
-    }
 
 }
-

application/Espo/Controllers/AuthToken.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -42,12 +42,17 @@ class AuthToken extends \Espo\Core\Controllers\Record
 
     public function actionUpdate($params, $data, $request)
     {
+        $dataAr = get_object_vars($data);
+
         if (
-            is_array($data) &&
-            array_key_exists('isActive', $data) &&
-            $data['isActive'] === false &&
-            count(array_keys($data)) === 1)
-        {
+            is_object($data)
+            &&
+            isset($data->isActive)
+            &&
+            $data->isActive === false
+            &&
+            count(array_keys($dataAr)) === 1
+        ) {
             return parent::actionUpdate($params, $data, $request);
         }
         throw new Forbidden();
@@ -55,16 +60,19 @@ class AuthToken extends \Espo\Core\Controllers\Record
 
     public function actionMassUpdate($params, $data, $request)
     {
-        if (empty($data['attributes'])) {
+        if (empty($data->attributes)) {
             throw new BadRequest();
         }
 
-        $attributes = $data['attributes'];
+        $attributes = $data->attributes;
 
         if (
-            is_object($attributes) &&
-            isset($attributes->isActive) &&
-            $attributes->isActive === false &&
+            is_object($attributes)
+            &&
+            isset($attributes->isActive)
+            &&
+            $attributes->isActive === false
+            &&
             count(array_keys(get_object_vars($attributes))) === 1
         ) {
             return parent::actionMassUpdate($params, $data, $request);
@@ -87,4 +95,3 @@ class AuthToken extends \Espo\Core\Controllers\Record
         throw new Forbidden();
     }
 }
-

application/Espo/Controllers/Email.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -38,10 +38,10 @@ class Email extends \Espo\Core\Controllers\Record
 {
     public function postActionGetCopiedAttachments($params, $data, $request)
     {
-        if (empty($data['id'])) {
+        if (empty($data->id)) {
             throw new BadRequest();
         }
-        $id = $data['id'];
+        $id = $data->id;
 
         return $this->getRecordService()->getCopiedAttachments($id);
     }
@@ -56,25 +56,25 @@ class Email extends \Espo\Core\Controllers\Record
             throw new Forbidden();
         }
 
-        if (is_null($data['password'])) {
-            if ($data['type'] == 'preferences') {
-                if (!$this->getUser()->isAdmin() && $data['id'] !== $this->getUser()->id) {
+        if (is_null($data->password)) {
+            if ($data->type == 'preferences') {
+                if (!$this->getUser()->isAdmin() && $data->id !== $this->getUser()->id) {
                     throw new Forbidden();
                 }
-                $preferences = $this->getEntityManager()->getEntity('Preferences', $data['id']);
+                $preferences = $this->getEntityManager()->getEntity('Preferences', $data->id);
                 if (!$preferences) {
                     throw new NotFound();
                 }
 
-                if (is_null($data['password'])) {
-                    $data['password'] = $this->getContainer()->get('crypt')->decrypt($preferences->get('smtpPassword'));
+                if (is_null($data->password)) {
+                    $data->password = $this->getContainer()->get('crypt')->decrypt($preferences->get('smtpPassword'));
                 }
-            } else if ($data['type'] == 'emailAccount') {
+            } else if ($data->type == 'emailAccount') {
                 if (!$this->getAcl()->checkScope('EmailAccount')) {
                     throw new Forbidden();
                 }
-                if (!empty($data['id'])) {
-                    $emailAccount = $this->getEntityManager()->getEntity('EmailAccount', $data['id']);
+                if (!empty($data->id)) {
+                    $emailAccount = $this->getEntityManager()->getEntity('EmailAccount', $data->id);
                     if (!$emailAccount) {
                         throw new NotFound();
                     }
@@ -83,49 +83,62 @@ class Email extends \Espo\Core\Controllers\Record
                             throw new Forbidden();
                         }
                     }
-                    if (is_null($data['password'])) {
-                        $data['password'] = $this->getContainer()->get('crypt')->decrypt($emailAccount->get('smtpPassword'));
+                    if (is_null($data->password)) {
+                        $data->password = $this->getContainer()->get('crypt')->decrypt($emailAccount->get('smtpPassword'));
+                    }
+                }
+            } else if ($data->type == 'inboundEmail') {
+                if (!$this->getUser()->isAdmin()) {
+                    throw new Forbidden();
+                }
+                if (!empty($data->id)) {
+                    $emailAccount = $this->getEntityManager()->getEntity('InboundEmail', $data->id);
+                    if (!$emailAccount) {
+                        throw new NotFound();
+                    }
+                    if (is_null($data->password)) {
+                        $data->password = $this->getContainer()->get('crypt')->decrypt($emailAccount->get('smtpPassword'));
                     }
                 }
             } else {
                 if (!$this->getUser()->isAdmin()) {
                     throw new Forbidden();
                 }
-                if (is_null($data['password'])) {
-                    $data['password'] = $this->getConfig()->get('smtpPassword');
+                if (is_null($data->password)) {
+                    $data->password = $this->getConfig()->get('smtpPassword');
                 }
             }
         }
 
-        return $this->getRecordService()->sendTestEmail($data);
+        return $this->getRecordService()->sendTestEmail(get_object_vars($data));
     }
 
     public function postActionMarkAsRead($params, $data, $request)
     {
-        if (!empty($data['ids'])) {
-            $ids = $data['ids'];
+        if (!empty($data->ids)) {
+            $idList = $data->ids;
         } else {
-            if (!empty($data['id'])) {
-                $ids = [$data['id']];
+            if (!empty($data->id)) {
+                $idList = [$data->id];
             } else {
                 throw new BadRequest();
             }
         }
-        return $this->getRecordService()->markAsReadByIdList($ids);
+        return $this->getRecordService()->markAsReadByIdList($idList);
     }
 
     public function postActionMarkAsNotRead($params, $data, $request)
     {
-        if (!empty($data['ids'])) {
-            $ids = $data['ids'];
+        if (!empty($data->ids)) {
+            $idList = $data->ids;
         } else {
-            if (!empty($data['id'])) {
-                $ids = [$data['id']];
+            if (!empty($data->id)) {
+                $idList = [$data->id];
             } else {
                 throw new BadRequest();
             }
         }
-        return $this->getRecordService()->markAsNotReadByIdList($ids);
+        return $this->getRecordService()->markAsNotReadByIdList($idList);
     }
 
     public function postActionMarkAllAsRead($params, $data, $request)
@@ -135,58 +148,58 @@ class Email extends \Espo\Core\Controllers\Record
 
     public function postActionMarkAsImportant($params, $data, $request)
     {
-        if (!empty($data['ids'])) {
-            $ids = $data['ids'];
+        if (!empty($data->ids)) {
+            $idList = $data->ids;
         } else {
-            if (!empty($data['id'])) {
-                $ids = [$data['id']];
+            if (!empty($data->id)) {
+                $idList = [$data->id];
             } else {
                 throw new BadRequest();
             }
         }
-        return $this->getRecordService()->markAsImportantByIdList($ids);
+        return $this->getRecordService()->markAsImportantByIdList($idList);
     }
 
     public function postActionMarkAsNotImportant($params, $data, $request)
     {
-        if (!empty($data['ids'])) {
-            $ids = $data['ids'];
+        if (!empty($data->ids)) {
+            $idList = $data->ids;
         } else {
-            if (!empty($data['id'])) {
-                $ids = [$data['id']];
+            if (!empty($data->id)) {
+                $idList = [$data->id];
             } else {
                 throw new BadRequest();
             }
         }
-        return $this->getRecordService()->markAsNotImportantByIdList($ids);
+        return $this->getRecordService()->markAsNotImportantByIdList($idList);
     }
 
     public function postActionMoveToTrash($params, $data)
     {
-        if (!empty($data['ids'])) {
-            $ids = $data['ids'];
+        if (!empty($data->ids)) {
+            $idList = $data->ids;
         } else {
-            if (!empty($data['id'])) {
-                $ids = [$data['id']];
+            if (!empty($data->id)) {
+                $idList = [$data->id];
             } else {
                 throw new BadRequest();
             }
         }
-        return $this->getRecordService()->moveToTrashByIdList($ids);
+        return $this->getRecordService()->moveToTrashByIdList($idList);
     }
 
     public function postActionRetrieveFromTrash($params, $data)
     {
-        if (!empty($data['ids'])) {
-            $ids = $data['ids'];
+        if (!empty($data->ids)) {
+            $idList = $data->ids;
         } else {
-            if (!empty($data['id'])) {
-                $ids = [$data['id']];
+            if (!empty($data->id)) {
+                $idList = [$data->id];
             } else {
                 throw new BadRequest();
             }
         }
-        return $this->getRecordService()->retrieveFromTrashByIdList($ids);
+        return $this->getRecordService()->retrieveFromTrashByIdList($idList);
     }
 
     public function getActionGetFoldersNotReadCounts(&$params, $request, $data)
@@ -206,20 +219,19 @@ class Email extends \Espo\Core\Controllers\Record
 
     public function postActionMoveToFolder($params, $data)
     {
-        if (!empty($data['ids'])) {
-            $ids = $data['ids'];
+        if (!empty($data->ids)) {
+            $idList = $data->ids;
         } else {
-            if (!empty($data['id'])) {
-                $ids = [$data['id']];
+            if (!empty($data->id)) {
+                $idList = [$data->id];
             } else {
                 throw new BadRequest();
             }
         }
 
-        if (empty($data['folderId'])) {
+        if (empty($data->folderId)) {
             throw new BadRequest();
         }
-        return $this->getRecordService()->moveToFolderByIdList($ids, $data['folderId']);
+        return $this->getRecordService()->moveToFolderByIdList($idList, $data->folderId);
     }
 }
-

application/Espo/Controllers/EmailAccount.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -59,9 +59,9 @@ class EmailAccount extends \Espo\Core\Controllers\Record
             throw new BadRequest();
         }
 
-        if (is_null($data['password'])) {
-            $emailAccount = $this->getEntityManager()->getEntity('EmailAccount', $data['id']);
-            if (!$emailAccount) {
+        if (is_null($data->password)) {
+            $emailAccount = $this->getEntityManager()->getEntity('EmailAccount', $data->id);
+            if (!$emailAccount || !$emailAccount->id) {
                 throw new Error();
             }
 
@@ -69,10 +69,10 @@ class EmailAccount extends \Espo\Core\Controllers\Record
                 throw new Forbidden();
             }
 
-            $data['password'] = $this->getContainer()->get('crypt')->decrypt($emailAccount->get('password'));
+            $data->password = $this->getContainer()->get('crypt')->decrypt($emailAccount->get('password'));
         }
 
-        return $this->getRecordService()->testConnection($data);
+        return $this->getRecordService()->testConnection(get_object_vars($data));
     }
 }
 

application/Espo/Controllers/EmailAddress.php

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

application/Espo/Controllers/EmailFilter.php

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

application/Espo/Controllers/EmailFolder.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -35,22 +35,22 @@ class EmailFolder extends \Espo\Core\Controllers\Record
 {
     public function postActionMoveUp($params, $data, $request)
     {
-        if (empty($data['id'])) {
+        if (empty($data->id)) {
             throw new BadRequest();
         }
 
-        $this->getRecordService()->moveUp($data['id']);
+        $this->getRecordService()->moveUp($data->id);
 
         return true;
     }
 
     public function postActionMoveDown($params, $data, $request)
     {
-        if (empty($data['id'])) {
+        if (empty($data->id)) {
             throw new BadRequest();
         }
 
-        $this->getRecordService()->moveDown($data['id']);
+        $this->getRecordService()->moveDown($data->id);
 
         return true;
     }
@@ -60,4 +60,3 @@ class EmailFolder extends \Espo\Core\Controllers\Record
         return $this->getRecordService()->listAll();
     }
 }
-

application/Espo/Controllers/EmailTemplate.php

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

application/Espo/Controllers/EntityManager.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -44,6 +44,8 @@ class EntityManager extends \Espo\Core\Controllers\Base
 
     public function actionCreateEntity($params, $data, $request)
     {
+        $data = get_object_vars($data);
+
         if (!$request->isPost()) {
             throw new BadRequest();
         }
@@ -103,6 +105,8 @@ class EntityManager extends \Espo\Core\Controllers\Base
 
     public function actionUpdateEntity($params, $data, $request)
     {
+        $data = get_object_vars($data);
+
         if (!$request->isPost()) {
             throw new BadRequest();
         }
@@ -129,6 +133,8 @@ class EntityManager extends \Espo\Core\Controllers\Base
 
     public function actionRemoveEntity($params, $data, $request)
     {
+        $data = get_object_vars($data);
+
         if (!$request->isPost()) {
             throw new BadRequest();
         }
@@ -160,6 +166,8 @@ class EntityManager extends \Espo\Core\Controllers\Base
 
     public function actionCreateLink($params, $data, $request)
     {
+        $data = get_object_vars($data);
+
         if (!$request->isPost()) {
             throw new BadRequest();
         }
@@ -218,6 +226,8 @@ class EntityManager extends \Espo\Core\Controllers\Base
 
     public function actionUpdateLink($params, $data, $request)
     {
+        $data = get_object_vars($data);
+
         if (!$request->isPost()) {
             throw new BadRequest();
         }
@@ -269,6 +279,8 @@ class EntityManager extends \Espo\Core\Controllers\Base
 
     public function actionRemoveLink($params, $data, $request)
     {
+        $data = get_object_vars($data);
+
         if (!$request->isPost()) {
             throw new BadRequest();
         }
@@ -295,20 +307,19 @@ class EntityManager extends \Espo\Core\Controllers\Base
 
     public function postActionFormula($params, $data, $request)
     {
-        if (empty($data['scope'])) {
+        if (empty($data->scope)) {
             throw new BadRequest();
         }
-        if (!array_key_exists('data', $data)) {
+        if (!property_exists($data, 'data')) {
             throw new BadRequest();
         }
 
-        $formulaData = get_object_vars($data['data']);
+        $formulaData = get_object_vars($data->data);
 
-        $this->getContainer()->get('entityManagerUtil')->setFormulaData($data['scope'], $formulaData);
+        $this->getContainer()->get('entityManagerUtil')->setFormulaData($data->scope, $formulaData);
 
         $this->getContainer()->get('dataManager')->clearCache();
 
         return true;
     }
 }
-

application/Espo/Controllers/Extension.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -73,7 +73,7 @@ class Extension extends \Espo\Core\Controllers\Record
 
         $manager = new \Espo\Core\ExtensionManager($this->getContainer());
 
-        $manager->install($data);
+        $manager->install(get_object_vars($data));
 
         return true;
     }
@@ -90,7 +90,7 @@ class Extension extends \Espo\Core\Controllers\Record
         }
 
         $manager = new \Espo\Core\ExtensionManager($this->getContainer());
-        $manager->uninstall($data);
+        $manager->uninstall(get_object_vars($data));
         return true;
     }
 
@@ -149,4 +149,3 @@ class Extension extends \Espo\Core\Controllers\Record
         throw new Forbidden();
     }
 }
-

application/Espo/Controllers/ExternalAccount.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -65,7 +65,6 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
         $id = $request->get('id');
         list($integration, $userId) = explode('__', $id);
 
-
         if ($this->getUser()->id != $userId) {
             throw new Forbidden();
         }
@@ -109,8 +108,8 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
             throw new Forbidden();
         }
 
-        if (isset($data['enabled']) && !$data['enabled']) {
-            $data['data'] = null;
+        if (isset($data->enabled) && !$data->enabled) {
+            $data->data = null;
         }
 
         $entity = $this->getEntityManager()->getEntity('ExternalAccount', $params['id']);
@@ -126,8 +125,8 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
             throw new Error('Bad HTTP method type.');
         }
 
-        $id = $data['id'];
-        $code = $data['code'];
+        $id = $data->id;
+        $code = $data->code;
 
         list($integration, $userId) = explode('__', $id);
 
@@ -139,4 +138,3 @@ class ExternalAccount extends \Espo\Core\Controllers\Record
         return $service->authorizationCode($integration, $userId, $code);
     }
 }
-

application/Espo/Controllers/FieldManager.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -60,21 +60,21 @@ class FieldManager extends \Espo\Core\Controllers\Base
 
     public function postActionCreate($params, $data)
     {
-        if (empty($params['scope']) || empty($data['name'])) {
+        if (empty($params['scope']) || empty($data->name)) {
             throw new BadRequest();
         }
 
         $fieldManager = $this->getContainer()->get('fieldManager');
-        $fieldManager->create($params['scope'], $data['name'], $data);
+        $fieldManager->create($params['scope'], $data->name, get_object_vars($data));
 
         try {
             $this->getContainer()->get('dataManager')->rebuild($params['scope']);
         } catch (Error $e) {
-            $fieldManager->delete($params['scope'], $data['name']);
+            $fieldManager->delete($params['scope'], $data->name);
             throw new Error($e->getMessage());
         }
 
-        return $fieldManager->read($params['scope'], $data['name']);
+        return $fieldManager->read($params['scope'], $data->name);
     }
 
     public function putActionUpdate($params, $data)
@@ -84,7 +84,7 @@ class FieldManager extends \Espo\Core\Controllers\Base
         }
 
         $fieldManager = $this->getContainer()->get('fieldManager');
-        $fieldManager->update($params['scope'], $params['name'], $data);
+        $fieldManager->update($params['scope'], $params['name'], get_object_vars($data));
 
         if ($fieldManager->isChanged()) {
             $this->getContainer()->get('dataManager')->rebuild($params['scope']);
@@ -110,15 +110,14 @@ class FieldManager extends \Espo\Core\Controllers\Base
 
     public function postActionResetToDefault($params, $data)
     {
-        if (empty($data['scope']) || empty($data['name'])) {
+        if (empty($data->scope) || empty($data->name)) {
             throw new BadRequest();
         }
 
-        $this->getContainer()->get('fieldManager')->resetToDefault($data['scope'], $data['name']);
+        $this->getContainer()->get('fieldManager')->resetToDefault($data->scope, $data->name);
 
         $this->getContainer()->get('dataManager')->rebuildMetadata();
 
         return true;
     }
 }
-

application/Espo/Controllers/GlobalSearch.php

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

application/Espo/Controllers/I18n.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -31,8 +31,11 @@ namespace Espo\Controllers;
 
 class I18n extends \Espo\Core\Controllers\Base
 {
-    public function actionRead($params, $data)
+    public function actionRead($params, $data, $request)
     {
+        if ($request->get('default')) {
+            return $this->getContainer()->get('defaultLanguage')->getAll();
+        }
         return $this->getContainer()->get('language')->getAll();
     }
 }

application/Espo/Controllers/Import.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -101,24 +101,24 @@ class Import extends \Espo\Core\Controllers\Record
 
     public function actionRevert($params, $data, $request)
     {
-        if (empty($data['id'])) {
+        if (empty($data->id)) {
             throw new BadRequest();
         }
         if (!$request->isPost()) {
             throw new BadRequest();
         }
-        return $this->getService('Import')->revert($data['id']);
+        return $this->getService('Import')->revert($data->id);
     }
 
     public function actionRemoveDuplicates($params, $data, $request)
     {
-        if (empty($data['id'])) {
+        if (empty($data->id)) {
             throw new BadRequest();
         }
         if (!$request->isPost()) {
             throw new BadRequest();
         }
-        return $this->getService('Import')->removeDuplicates($data['id']);
+        return $this->getService('Import')->removeDuplicates($data->id);
     }
 
     public function actionCreate($params, $data, $request)
@@ -127,87 +127,90 @@ class Import extends \Espo\Core\Controllers\Record
             throw new BadRequest();
         }
 
-        if (!isset($data['fieldDelimiter'])) {
+        if (!isset($data->fieldDelimiter)) {
             throw new BadRequest();
         }
 
-        if (!isset($data['textQualifier'])) {
+        if (!isset($data->textQualifier)) {
             throw new BadRequest();
         }
 
-        if (!isset($data['dateFormat'])) {
+        if (!isset($data->dateFormat)) {
             throw new BadRequest();
         }
 
-        if (!isset($data['timeFormat'])) {
+        if (!isset($data->timeFormat)) {
             throw new BadRequest();
         }
 
-        if (!isset($data['personNameFormat'])) {
+        if (!isset($data->personNameFormat)) {
             throw new BadRequest();
         }
 
-        if (!isset($data['decimalMark'])) {
+        if (!isset($data->decimalMark)) {
             throw new BadRequest();
         }
 
-        if (!isset($data['defaultValues'])) {
+        if (!isset($data->defaultValues)) {
             throw new BadRequest();
         }
 
-        if (!isset($data['action'])) {
+        if (!isset($data->action)) {
             throw new BadRequest();
         }
 
-        if (!isset($data['attachmentId'])) {
+        if (!isset($data->attachmentId)) {
             throw new BadRequest();
         }
 
-        if (!isset($data['entityType'])) {
+        if (!isset($data->entityType)) {
+            throw new BadRequest();
+        }
+
+        if (!isset($data->fields)) {
             throw new BadRequest();
         }
 
         $timezone = 'UTC';
-        if (isset($data['timezone'])) {
-           $timezone = $data['timezone'];
+        if (isset($data->timezone)) {
+           $timezone = $data->timezone;
         }
 
         $importParams = array(
-            'headerRow' => !empty($data['headerRow']),
-            'fieldDelimiter' => $data['fieldDelimiter'],
-            'textQualifier' => $data['textQualifier'],
-            'dateFormat' => $data['dateFormat'],
-            'timeFormat' => $data['timeFormat'],
+            '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'])
+            '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)) {
-            $importParams['updateBy'] = $data['updateBy'];
+        if (property_exists($data, 'updateBy')) {
+            $importParams['updateBy'] = $data->updateBy;
         }
 
-        $attachmentId = $data['attachmentId'];
+        $attachmentId = $data->attachmentId;
 
-        if (!$this->getAcl()->check($data['entityType'], 'edit')) {
+        if (!$this->getAcl()->check($data->entityType, 'edit')) {
             throw new Forbidden();
         }
 
-        return $this->getService('Import')->import($data['entityType'], $data['fields'], $attachmentId, $importParams);
+        return $this->getService('Import')->import($data->entityType, $data->fields, $attachmentId, $importParams);
     }
 
     public function postActionUnmarkAsDuplicate($params, $data)
     {
-        if (empty($data['id']) || empty($data['entityType']) || empty($data['entityId'])) {
+        if (empty($data->id) || empty($data->entityType) || empty($data->entityId)) {
             throw new BadRequest();
         }
-        $this->getService('Import')->unmarkAsDuplicate($data['id'], $data['entityType'], $data['entityId']);
+        $this->getService('Import')->unmarkAsDuplicate($data->id, $data->entityType, $data->entityId);
         return true;
     }
 }
-

application/Espo/Controllers/InboundEmail.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -59,15 +59,15 @@ class InboundEmail extends \Espo\Core\Controllers\Record
             throw new BadRequest();
         }
 
-        if (is_null($data['password'])) {
-            $inboundEmail = $this->getEntityManager()->getEntity('InboundEmail', $data['id']);
-            if (!$inboundEmail) {
+        if (is_null($data->password)) {
+            $inboundEmail = $this->getEntityManager()->getEntity('InboundEmail', $data->id);
+            if (!$inboundEmail || !$inboundEmail->id) {
                 throw new Error();
             }
-            $data['password'] = $this->getContainer()->get('crypt')->decrypt($inboundEmail->get('password'));
+            $data->password = $this->getContainer()->get('crypt')->decrypt($inboundEmail->get('password'));
         }
 
-        return $this->getRecordService()->testConnection($data);
+        return $this->getRecordService()->testConnection(get_object_vars($data));
     }
 
 }

application/Espo/Controllers/Integration.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -79,7 +79,6 @@ class Integration extends \Espo\Core\Controllers\Record
 
         $this->getConfig()->save();
 
-
         return $entity->toArray();
     }
 }

application/Espo/Controllers/Job.php

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

application/Espo/Controllers/LabelManager.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -53,23 +53,23 @@ class LabelManager extends \Espo\Core\Controllers\Base
 
     public function postActionGetScopeData($params, $data, $request)
     {
-        if (empty($data['scope']) || empty($data['language'])) {
+        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']);
+        return $labelManager->getScopeData($data->language, $data->scope);
     }
 
     public function postActionSaveLabels($params, $data)
     {
-        if (empty($data['scope']) || empty($data['language']) || !isset($data['labels'])) {
+        if (empty($data->scope) || empty($data->language) || !isset($data->labels)) {
             throw new BadRequest();
         }
 
-        $labels = get_object_vars($data['labels']);
+        $labels = get_object_vars($data->labels);
 
         $labelManager = $this->getContainer()->get('injectableFactory')->createByClassName('\\Espo\\Core\\Utils\\LabelManager');
-        $returnData = $labelManager->saveLabels($data['language'], $data['scope'], $labels);
+        $returnData = $labelManager->saveLabels($data->language, $data->scope, $labels);
 
         $this->getContainer()->get('dataManager')->clearCache();
 

application/Espo/Controllers/LastViewed.php

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

application/Espo/Controllers/Layout.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -48,6 +48,10 @@ class Layout extends \Espo\Core\Controllers\Base
 
     public function actionUpdate($params, $data, $request)
     {
+        if (is_object($data)) {
+            $data = get_object_vars($data);
+        }
+
         if (!$this->getUser()->isAdmin()) {
             throw new Forbidden();
         }
@@ -79,10 +83,10 @@ class Layout extends \Espo\Core\Controllers\Base
         if (!$request->isPost()) {
             throw new BadRequest();
         }
-        if (empty($data['scope']) || empty($data['name'])) {
+        if (empty($data->scope) || empty($data->name)) {
             throw new BadRequest();
         }
 
-        return $this->getContainer()->get('layout')->resetToDefault($data['scope'], $data['name']);
+        return $this->getContainer()->get('layout')->resetToDefault($data->scope, $data->name);
     }
 }

application/Espo/Controllers/Metadata.php

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

application/Espo/Controllers/Note.php

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

application/Espo/Controllers/Notification.php

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

application/Espo/Controllers/Portal.php

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

application/Espo/Controllers/PortalRole.php

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

application/Espo/Controllers/Preferences.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -93,11 +93,11 @@ class Preferences extends \Espo\Core\Controllers\Base
         }
 
         foreach ($this->getAcl()->getScopeForbiddenAttributeList('Preferences', 'edit') as $attribute) {
-            unset($data[$attribute]);
+            unset($data->$attribute);
         }
 
-        if (array_key_exists('smtpPassword', $data)) {
-            $data['smtpPassword'] = $this->getCrypt()->encrypt($data['smtpPassword']);
+        if (property_exists($data, 'smtpPassword')) {
+            $data->smtpPassword = $this->getCrypt()->encrypt($data->smtpPassword);
         }
 
         $user = $this->getEntityManager()->getEntity('User', $userId);
@@ -113,7 +113,7 @@ class Preferences extends \Espo\Core\Controllers\Base
 
             $entity->clear('smtpPassword');
 
-            return $entity->toArray();
+            return $entity->getValueMap();
         }
         throw new Error();
     }
@@ -140,7 +140,7 @@ class Preferences extends \Espo\Core\Controllers\Base
             $entity->clear($attribute);
         }
 
-        return $entity->toArray();
+        return $entity->getValueMap();
     }
 }
 

application/Espo/Controllers/Role.php

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

application/Espo/Controllers/ScheduledJob.php

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

application/Espo/Controllers/ScheduledJobLogRecord.php

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

application/Espo/Controllers/Settings.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -46,7 +46,7 @@ class Settings extends \Espo\Core\Controllers\Base
         $fieldDefs = $this->getMetadata()->get('entityDefs.Settings.fields');
 
         foreach ($fieldDefs as $field => $d) {
-            if ($d['type'] == 'password') {
+            if ($d['type'] === 'password') {
                 unset($data[$field]);
             }
         }
@@ -77,9 +77,9 @@ class Settings extends \Espo\Core\Controllers\Base
         }
 
         if (
-            (isset($data['useCache']) && $data['useCache'] != $this->getConfig()->get('useCache'))
+            (isset($data->useCache) && $data->useCache !== $this->getConfig()->get('useCache'))
             ||
-            (isset($data['aclStrictMode']) && $data['aclStrictMode'] !== $this->getConfig()->get('aclStrictMode'))
+            (isset($data->aclStrictMode) && $data->aclStrictMode !== $this->getConfig()->get('aclStrictMode'))
         ) {
             $this->getContainer()->get('dataManager')->clearCache();
         }
@@ -91,8 +91,8 @@ class Settings extends \Espo\Core\Controllers\Base
         }
 
         /** Rebuild for Currency Settings */
-        if (isset($data['baseCurrency']) || isset($data['currencyRates'])) {
-            $this->getContainer()->get('dataManager')->rebuildDatabase(array());
+        if (isset($data->baseCurrency) || isset($data->currencyRates)) {
+            $this->getContainer()->get('dataManager')->rebuildDatabase([]);
         }
         /** END Rebuild for Currency Settings */
 
@@ -105,10 +105,12 @@ class Settings extends \Espo\Core\Controllers\Base
             throw new Forbidden();
         }
 
-        if (!isset($data['password'])) {
-            $data['password'] = $this->getConfig()->get('ldapPassword');
+        if (!isset($data->password)) {
+            $data->password = $this->getConfig()->get('ldapPassword');
         }
 
+        $data = get_object_vars($data);
+
         $ldapUtils = new \Espo\Core\Utils\Authentication\LDAP\Utils();
         $options = $ldapUtils->normalizeOptions($data);
 

application/Espo/Controllers/Stream.php

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

application/Espo/Controllers/Team.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -31,6 +31,4 @@ namespace Espo\Controllers;
 
 class Team extends \Espo\Core\Controllers\Record
 {
-
-
 }

application/Espo/Controllers/Template.php

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

application/Espo/Controllers/User.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -57,20 +57,20 @@ class User extends \Espo\Core\Controllers\Record
 
     public function postActionChangeOwnPassword($params, $data, $request)
     {
-        if (!array_key_exists('password', $data) || !array_key_exists('currentPassword', $data)) {
+        if (!property_exists($data, 'password') || !property_exists($data, 'currentPassword')) {
             throw new BadRequest();
         }
-        return $this->getService('User')->changePassword($this->getUser()->id, $data['password'], true, $data['currentPassword']);
+        return $this->getService('User')->changePassword($this->getUser()->id, $data->password, true, $data->currentPassword);
     }
 
     public function postActionChangePasswordByRequest($params, $data, $request)
     {
-        if (empty($data['requestId']) || empty($data['password'])) {
+        if (empty($data->requestId) || empty($data->password)) {
             throw new BadRequest();
         }
 
         $p = $this->getEntityManager()->getRepository('PasswordChangeRequest')->where(array(
-            'requestId' => $data['requestId']
+            'requestId' => $data->requestId
         ))->findOne();
 
         if (!$p) {
@@ -83,7 +83,7 @@ class User extends \Espo\Core\Controllers\Record
 
         $this->getEntityManager()->removeEntity($p);
 
-        if ($this->getService('User')->changePassword($userId, $data['password'])) {
+        if ($this->getService('User')->changePassword($userId, $data->password)) {
             return array(
                 'url' => $p->get('url')
             );
@@ -92,15 +92,15 @@ class User extends \Espo\Core\Controllers\Record
 
     public function postActionPasswordChangeRequest($params, $data, $request)
     {
-        if (empty($data['userName']) || empty($data['emailAddress'])) {
+        if (empty($data->userName) || empty($data->emailAddress)) {
             throw new BadRequest();
         }
 
-        $userName = $data['userName'];
-        $emailAddress = $data['emailAddress'];
+        $userName = $data->userName;
+        $emailAddress = $data->emailAddress;
         $url = null;
-        if (!empty($data['url'])) {
-            $url = $data['url'];
+        if (!empty($data->url)) {
+            $url = $data->url;
         }
 
         return $this->getService('User')->passwordChangeRequest($userName, $emailAddress, $url);

application/Espo/Core/Acl.php

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

application/Espo/Core/Acl/Base.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -260,7 +260,11 @@ class Base implements Injectable
 
         if (is_object($data)) {
             if ($data->edit !== 'no' || $data->create !== 'no') {
-                if ($entity->has('createdById') && $entity->get('createdById') == $user->id) {
+                if (
+                    $this->getConfig()->get('aclAllowDeleteCreated')
+                    &&
+                    $entity->has('createdById') && $entity->get('createdById') == $user->id
+                ) {
                     if (!$entity->has('assignedUserId')) {
                         return true;
                     } else {

application/Espo/Core/Acl/Table.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -59,13 +59,9 @@ class Table
 
     protected $fieldLevelList = ['yes', 'no'];
 
-    protected $valuePermissionList = ['assignmentPermission', 'userPermission', 'portalPermission'];
+    protected $valuePermissionHighestLevels = array();
 
-    protected $valuePrtmissionHighestLevels = array(
-        'assignmentPermission' => 'all',
-        'userPermission' => 'all',
-        'portalPermission' => 'yes'
-    );
+    protected $valuePermissionList = [];
 
     private $fileManager;
 
@@ -104,7 +100,8 @@ class Table
         if ($fileManager) {
             $this->fileManager = $fileManager;
         }
-        $this->valuePermissionList = $this->metadata->get('app.' . $this->type . '.defs.valuePermissionList', $this->valuePermissionList);
+        $this->valuePermissionList = $this->metadata->get(['app', $this->type, 'valuePermissionList'], []);
+        $this->valuePermissionHighestLevels = $this->metadata->get(['app', $this->type, 'valuePermissionHighestLevels'], array());
 
         $this->initCacheFilePath();
 
@@ -241,8 +238,12 @@ class Table
         $this->fillFieldTableQuickAccess();
 
         if (!$this->getUser()->isAdmin()) {
+            $permissionsDefaultsGroupName = 'permissionsDefaults';
+            if ($this->isStrictMode) {
+                $permissionsDefaultsGroupName = 'permissionsStrictDefaults';
+            }
             foreach ($this->valuePermissionList as $permission) {
-                $this->data->$permission = $this->mergeValueList($valuePermissionLists->$permission, $this->metadata->get('app.'.$this->type.'.default.' . $permission, 'yes'));
+                $this->data->$permission = $this->mergeValueList($valuePermissionLists->$permission, $this->metadata->get(['app', $this->type, $permissionsDefaultsGroupName, $permission, 'yes']));
                 if ($this->metadata->get('app.'.$this->type.'.mandatory.' . $permission)) {
                     $this->data->$permission = $this->metadata->get('app.'.$this->type.'.mandatory.' . $permission);
                 }
@@ -250,8 +251,8 @@ class Table
 
         } else {
             foreach ($this->valuePermissionList as $permission) {
-                if (isset($this->valuePrtmissionHighestLevels[$permission])) {
-                    $this->data->$permission = $this->valuePrtmissionHighestLevels[$permission];
+                if (isset($this->valuePermissionHighestLevels[$permission])) {
+                    $this->data->$permission = $this->valuePermissionHighestLevels[$permission];
                     continue;
                 }
                 $this->data->$permission = 'all';

application/Espo/Core/AclManager.php

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

application/Espo/Core/AclPortal/Base.php

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

application/Espo/Core/AclPortal/Table.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -50,8 +50,6 @@ class Table extends \Espo\Core\Acl\Table
 
     protected $levelList = ['yes', 'all', 'account', 'contact', 'own', 'no'];
 
-    protected $valuePermissionList = [];
-
     public function __construct(User $user, Portal $portal, Config $config = null, FileManager $fileManager = null, Metadata $metadata = null, FieldManagerUtil $fieldManager = null)
     {
         if (empty($portal)) {

application/Espo/Core/Application.php

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

application/Espo/Core/Container.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -298,7 +298,7 @@ class Container
     protected function loadDefaultLanguage()
     {
         return new \Espo\Core\Utils\Language(
-            null,
+            \Espo\Core\Utils\Language::detectLanguage($this->get('config')),
             $this->get('fileManager'),
             $this->get('metadata'),
             $this->get('useCache')

application/Espo/Core/ControllerManager.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -76,11 +76,6 @@ class ControllerManager
             $data = json_decode($data);
         }
 
-
-        if ($data instanceof \stdClass) {
-            $data = get_object_vars($data);
-        }
-
         if (!class_exists($controllerClassName)) {
             throw new NotFound("Controller '$controllerName' is not found");
         }
@@ -109,6 +104,13 @@ class ControllerManager
             throw new NotFound("Action '$actionName' (".$request->getMethod().") does not exist in controller '$controllerName'");
         }
 
+        // TODO Remove in 5.1.0
+        if ($data instanceof \stdClass) {
+            if ($this->getMetadata()->get(['app', 'deprecatedControllerActions', $controllerName, $primaryActionMethodName])) {
+                $data = get_object_vars($data);
+            }
+        }
+
         if (method_exists($controller, $beforeMethodName)) {
             $controller->$beforeMethodName($params, $data, $request);
         }
@@ -125,6 +127,4 @@ class ControllerManager
 
         return $result;
     }
-
 }
-

application/Espo/Core/Controllers/Base.php

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

application/Espo/Core/Controllers/Record.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -73,7 +73,7 @@ class Record extends Base
             throw new NotFound();
         }
 
-        return $entity->toArray();
+        return $entity->getValueMap();
     }
 
     public function actionPatch($params, $data, $request)
@@ -94,7 +94,7 @@ class Record extends Base
         $service = $this->getRecordService();
 
         if ($entity = $service->createEntity($data)) {
-            return $entity->toArray();
+            return $entity->getValueMap();
         }
 
         throw new Error();
@@ -113,7 +113,7 @@ class Record extends Base
         $id = $params['id'];
 
         if ($entity = $this->getRecordService()->updateEntity($id, $data)) {
-            return $entity->toArray();
+            return $entity->getValueMap();
         }
 
         throw new Error();
@@ -156,7 +156,7 @@ class Record extends Base
 
         return array(
             'total' => $result['total'],
-            'list' => isset($result['collection']) ? $result['collection']->toArray() : $result['list']
+            'list' => isset($result['collection']) ? $result['collection']->getValueMapList() : $result['list']
         );
     }
 
@@ -209,7 +209,7 @@ class Record extends Base
 
         return array(
             'total' => $result['total'],
-            'list' => isset($result['collection']) ? $result['collection']->toArray() : $result['list']
+            'list' => isset($result['collection']) ? $result['collection']->getValueMapList() : $result['list']
         );
     }
 
@@ -237,14 +237,18 @@ class Record extends Base
             throw new Forbidden();
         }
 
+        if ($this->getAcl()->get('exportPermission') !== 'yes' && !$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+
         if (!$this->getAcl()->check($this->name, 'read')) {
             throw new Forbidden();
         }
 
-        $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;
+        $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) {
@@ -254,16 +258,16 @@ class Record extends Base
             $params['ids'] = $ids;
         }
 
-        if (isset($data['attributeList'])) {
-            $params['attributeList'] = $data['attributeList'];
+        if (isset($data->attributeList)) {
+            $params['attributeList'] = $data->attributeList;
         }
 
-        if (isset($data['fieldList'])) {
-            $params['fieldList'] = $data['fieldList'];
+        if (isset($data->fieldList)) {
+            $params['fieldList'] = $data->fieldList;
         }
 
-        if (isset($data['format'])) {
-            $params['format'] = $data['format'];
+        if (isset($data->format)) {
+            $params['format'] = $data->format;
         }
 
         return array(
@@ -280,21 +284,21 @@ class Record extends Base
         if (!$this->getAcl()->check($this->name, 'edit')) {
             throw new Forbidden();
         }
-        if (empty($data['attributes'])) {
+        if (empty($data->attributes)) {
             throw new BadRequest();
         }
 
         $params = array();
-        if (array_key_exists('where', $data) && !empty($data['byWhere'])) {
-            $params['where'] = json_decode(json_encode($data['where']), true);
-            if (array_key_exists('selectData', $data)) {
-                $params['selectData'] = json_decode(json_encode($data['selectData']), true);
+        if (property_exists($data, 'where') && !empty($data->byWhere)) {
+            $params['where'] = json_decode(json_encode($data->where), true);
+            if (property_exists($data, 'selectData')) {
+                $params['selectData'] = json_decode(json_encode($data->selectData), true);
             }
-        } else if (array_key_exists('ids', $data)) {
-            $params['ids'] = $data['ids'];
+        } else if (property_exists($data, 'ids')) {
+            $params['ids'] = $data->ids;
         }
 
-        $attributes = $data['attributes'];
+        $attributes = $data->attributes;
 
         $idsUpdated = $this->getRecordService()->massUpdate($attributes, $params);
 
@@ -311,15 +315,15 @@ class Record extends Base
         }
 
         $params = array();
-        if (array_key_exists('where', $data) && !empty($data['byWhere'])) {
-            $where = json_decode(json_encode($data['where']), true);
+        if (property_exists($data, 'where') && !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 (property_exists($data, 'selectData')) {
+                $params['selectData'] = json_decode(json_encode($data->selectData), true);
             }
         }
-        if (array_key_exists('ids', $data)) {
-            $params['ids'] = $data['ids'];
+        if (property_exists($data, 'ids')) {
+            $params['ids'] = $data->ids;
         }
 
         return $this->getRecordService()->massRemove($params);
@@ -338,25 +342,25 @@ class Record extends Base
         $id = $params['id'];
         $link = $params['link'];
 
-        if (!empty($data['massRelate'])) {
-            if (!is_array($data['where'])) {
+        if (!empty($data->massRelate)) {
+            if (!is_array($data->where)) {
                 throw new BadRequest();
             }
-            $where = json_decode(json_encode($data['where']), true);
+            $where = json_decode(json_encode($data->where), true);
 
             $selectData = null;
-            if (isset($data['selectData']) && is_array($data['selectData'])) {
-                $selectData = json_decode(json_encode($data['selectData']), true);
+            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'])) {
-                $foreignIdList[] = $data['id'];
+            if (isset($data->id)) {
+                $foreignIdList[] = $data->id;
             }
-            if (isset($data['ids']) && is_array($data['ids'])) {
-                foreach ($data['ids'] as $foreignId) {
+            if (isset($data->ids) && is_array($data->ids)) {
+                foreach ($data->ids as $foreignId) {
                     $foreignIdList[] = $foreignId;
                 }
             }
@@ -388,18 +392,18 @@ class Record extends Base
             throw new BadRequest();
         }
 
-        $foreignIds = array();
-        if (isset($data['id'])) {
-            $foreignIds[] = $data['id'];
+        $foreignIdList = [];
+        if (isset($data->id)) {
+            $foreignIdList[] = $data->id;
         }
-        if (isset($data['ids']) && is_array($data['ids'])) {
-            foreach ($data['ids'] as $foreignId) {
-                $foreignIds[] = $foreignId;
+        if (isset($data->ids) && is_array($data->ids)) {
+            foreach ($data->ids as $foreignId) {
+                $foreignIdList[] = $foreignId;
             }
         }
 
         $result = false;
-        foreach ($foreignIds as $foreignId) {
+        foreach ($foreignIdList as $foreignId) {
             if ($this->getRecordService()->unlinkEntity($id, $link, $foreignId)) {
                 $result = $result || true;
             }
@@ -441,12 +445,12 @@ class Record extends Base
             throw new BadRequest();
         }
 
-        if (empty($data['targetId']) || empty($data['sourceIds']) || !is_array($data['sourceIds']) || !($data['attributes'] instanceof \StdClass)) {
+        if (empty($data->targetId) || empty($data->sourceIds) || !is_array($data->sourceIds) || !($data->attributes instanceof \StdClass)) {
             throw new BadRequest();
         }
-        $targetId = $data['targetId'];
-        $sourceIds = $data['sourceIds'];
-        $attributes = get_object_vars($data['attributes']);
+        $targetId = $data->targetId;
+        $sourceIds = $data->sourceIds;
+        $attributes = $data->attributes;
 
         if (!$this->getAcl()->check($this->name, 'edit')) {
             throw new Forbidden();
@@ -457,7 +461,7 @@ class Record extends Base
 
     public function postActionGetDuplicateAttributes($params, $data, $request)
     {
-        if (empty($data['id'])) {
+        if (empty($data->id)) {
             throw new BadRequest();
         }
 
@@ -468,7 +472,7 @@ class Record extends Base
             throw new Forbidden();
         }
 
-        return $this->getRecordService()->getDuplicateAttributes($data['id']);
+        return $this->getRecordService()->getDuplicateAttributes($data->id);
     }
 
     public function postActionMassFollow($params, $data, $request)
@@ -477,8 +481,8 @@ class Record extends Base
             throw new Forbidden();
         }
 
-        if (array_key_exists('ids', $data)) {
-            $params['ids'] = $data['ids'];
+        if (property_exists($data, 'ids')) {
+            $params['ids'] = $data->ids;
         }
 
         return $this->getRecordService()->massFollow($params);
@@ -490,11 +494,10 @@ class Record extends Base
             throw new Forbidden();
         }
 
-        if (array_key_exists('ids', $data)) {
-            $params['ids'] = $data['ids'];
+        if (property_exists($data, 'ids')) {
+            $params['ids'] = $data->ids;
         }
 
         return $this->getRecordService()->massUnfollow($params);
     }
 }
-

application/Espo/Core/Controllers/RecordTree.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -61,5 +61,15 @@ class RecordTree extends Record
             'path' => $this->getRecordService()->getTreeItemPath($parentId)
         );
     }
-}
 
+    public function getActionLastChildrenIdList($params, $data, $request)
+    {
+        if (!$this->getAcl()->check($this->name, 'read')) {
+            throw new Forbidden();
+        }
+
+        $parentId = $request->get('parentId');
+
+        return $this->getRecordService()->getLastChildrenIdList($parentId);
+    }
+}

application/Espo/Core/CronManager.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -44,6 +44,10 @@ class CronManager
 
     private $scheduledJobUtil;
 
+    private $cronJobUtil;
+
+    private $cronScheduledJobUtil;
+
     const PENDING = 'Pending';
 
     const RUNNING = 'Running';
@@ -64,8 +68,8 @@ class CronManager
         $this->serviceFactory = $this->container->get('serviceFactory');
 
         $this->scheduledJobUtil = $this->container->get('scheduledJob');
-        $this->cronJob = new \Espo\Core\Utils\Cron\Job($this->config, $this->entityManager);
-        $this->cronScheduledJob = new \Espo\Core\Utils\Cron\ScheduledJob($this->config, $this->entityManager);
+        $this->cronJobUtil = new \Espo\Core\Utils\Cron\Job($this->config, $this->entityManager);
+        $this->cronScheduledJobUtil = new \Espo\Core\Utils\Cron\ScheduledJob($this->config, $this->entityManager);
     }
 
     protected function getContainer()
@@ -98,14 +102,14 @@ class CronManager
         return $this->scheduledJobUtil;
     }
 
-    protected function getCronJob()
+    protected function getCronJobUtil()
     {
-        return $this->cronJob;
+        return $this->cronJobUtil;
     }
 
-    protected function getCronScheduledJob()
+    protected function getCronScheduledJobUtil()
     {
-        return $this->cronScheduledJob;
+        return $this->cronScheduledJobUtil;
     }
 
     protected function getLastRunTime()
@@ -155,58 +159,44 @@ class CronManager
 
         $this->setLastRunTime(time());
 
-        $this->getCronJob()->markFailedJobs();
-        $this->getCronJob()->updateFailedJobAttempts();
+        $this->getCronJobUtil()->markFailedJobs();
+        $this->getCronJobUtil()->updateFailedJobAttempts();
         $this->createJobsFromScheduledJobs();
-        $this->getCronJob()->removePendingJobDuplicates();
+        $this->getCronJobUtil()->removePendingJobDuplicates();
 
-        $pendingJobList = $this->getCronJob()->getPendingJobList();
+        $pendingJobList = $this->getCronJobUtil()->getPendingJobList();
 
         foreach ($pendingJobList as $job) {
-            $jobEntity = $this->getEntityManager()->getEntity('Job', $job['id']);
-
-            if (!isset($jobEntity)) {
-                $GLOBALS['log']->error('CronManager: empty Job entity ['.$job['id'].'].');
-                continue;
-            }
-
-            $jobEntity->set('status', self::RUNNING);
-            $this->getEntityManager()->saveEntity($jobEntity);
+            $job->set('status', self::RUNNING);
+            $this->getEntityManager()->saveEntity($job);
 
             $isSuccess = true;
 
             try {
-                if (!empty($job['scheduled_job_id'])) {
+                if ($job->get('scheduledJobId')) {
                     $this->runScheduledJob($job);
                 } else {
                     $this->runService($job);
                 }
             } catch (\Exception $e) {
                 $isSuccess = false;
-                $GLOBALS['log']->error('CronManager: Failed job running, job ['.$job['id'].']. Error Details: '.$e->getMessage());
+                $GLOBALS['log']->error('CronManager: Failed job running, job ['.$job->id.']. Error Details: '.$e->getMessage());
             }
 
             $status = $isSuccess ? self::SUCCESS : self::FAILED;
 
-            $jobEntity->set('status', $status);
-            $this->getEntityManager()->saveEntity($jobEntity);
+            $job->set('status', $status);
+            $this->getEntityManager()->saveEntity($job);
 
-            if (!empty($job['scheduled_job_id'])) {
-                $this->getCronScheduledJob()->addLogRecord($job['scheduled_job_id'], $status, null, $job['target_id'], $job['target_type']);
+            if ($job->get('scheduledJobId')) {
+                $this->getCronScheduledJobUtil()->addLogRecord($job->get('scheduledJobId'), $status, null, $job->get('targetId'), $job->get('targetType'));
             }
         }
     }
 
-    /**
-     * Run Scheduled Job
-     *
-     * @param  array  $job
-     *
-     * @return void
-     */
-    protected function runScheduledJob(array $job)
+    protected function runScheduledJob($job)
     {
-        $jobName = $job['method'];
+        $jobName = $job->get('scheduledJobJob');
 
         $className = $this->getScheduledJobUtil()->get($jobName);
         if ($className === false) {
@@ -220,14 +210,12 @@ class CronManager
         }
 
         $data = null;
-        if (!empty($job['data'])) {
-            $data = $job['data'];
-            if (Json::isJSON($data)) {
-                $data = Json::decode($data, true);
-            }
+
+        if ($job->get('data')) {
+            $data = $job->get('data');
         }
 
-        $jobClass->$method($data, $job['target_id'], $job['target_type']);
+        $jobClass->$method($data, $job->get('targetId'), $job->get('targetType'));
     }
 
     /**
@@ -237,62 +225,74 @@ class CronManager
      *
      * @return void
      */
-    protected function runService(array $job)
+    protected function runService($job)
     {
-        $serviceName = $job['service_name'];
+        $serviceName = $job->get('serviceName');
+
+        if (!$serviceName) {
+            throw new Error('Job with empty serviceName.');
+        }
 
         if (!$this->getServiceFactory()->checkExists($serviceName)) {
             throw new NotFound();
         }
 
         $service = $this->getServiceFactory()->create($serviceName);
-        $serviceMethod = $job['method'];
 
-        if (!method_exists($service, $serviceMethod)) {
+        $methodNameDeprecated = $job->get('method');
+        $methodName = $job->get('methodName');
+
+        $isDeprecated = false;
+        if (!$methodName) {
+            $isDeprecated = true;
+            $methodName = $methodNameDeprecated;
+        }
+
+        if (!$methodName) {
+            throw new Error('Job with empty methodName.');
+        }
+
+        if (!method_exists($service, $methodName)) {
             throw new NotFound();
         }
 
-        $data = $job['data'];
-        if (Json::isJSON($data)) {
-            $data = Json::decode($data, true);
+        $data = $job->get('data');
+
+        if ($isDeprecated) {
+            $data = Json::decode(Json::encode($data), true);
         }
 
-        $service->$serviceMethod($data, $job['target_id'], $job['target_type']);
+        $service->$methodName($data, $job->get('targetId'), $job->get('targetType'));
     }
 
-    /**
-     * Check scheduled jobs and create related jobs
-     *
-     * @return array  List of created Jobs
-     */
     protected function createJobsFromScheduledJobs()
     {
-        $activeScheduledJobList = $this->getCronScheduledJob()->getActiveScheduledJobList();
+        $activeScheduledJobList = $this->getCronScheduledJobUtil()->getActiveScheduledJobList();
 
-        $runningScheduledJobIdList = $this->getCronJob()->getRunningScheduledJobIdList();
+        $runningScheduledJobIdList = $this->getCronJobUtil()->getRunningScheduledJobIdList();
 
         $createdJobIdList = array();
         foreach ($activeScheduledJobList as $scheduledJob) {
-            $scheduling = $scheduledJob['scheduling'];
+            $scheduling = $scheduledJob->get('scheduling');
 
             try {
                 $cronExpression = \Cron\CronExpression::factory($scheduling);
             } catch (\Exception $e) {
-                $GLOBALS['log']->error('CronManager (ScheduledJob ['.$scheduledJob['id'].']): Scheduling string error - '. $e->getMessage() . '.');
+                $GLOBALS['log']->error('CronManager (ScheduledJob ['.$scheduledJob->id.']): Scheduling string error - '. $e->getMessage() . '.');
                 continue;
             }
 
             try {
                 $nextDate = $cronExpression->getNextRunDate()->format('Y-m-d H:i:s');
             } catch (\Exception $e) {
-                $GLOBALS['log']->error('CronManager (ScheduledJob ['.$scheduledJob['id'].']): Unsupported CRON expression ['.$scheduling.']');
+                $GLOBALS['log']->error('CronManager (ScheduledJob ['.$scheduledJob->id.']): Unsupported CRON expression ['.$scheduling.']');
                 continue;
             }
 
-            $existingJob = $this->getCronJob()->getJobByScheduledJob($scheduledJob['id'], $nextDate);
+            $existingJob = $this->getCronJobUtil()->getJobByScheduledJob($scheduledJob->id, $nextDate);
             if ($existingJob) continue;
 
-            $className = $this->getScheduledJobUtil()->get($scheduledJob['job']);
+            $className = $this->getScheduledJobUtil()->get($scheduledJob->get('job'));
             if ($className) {
                 if (method_exists($className, 'prepare')) {
                     $implementation = new $className($this->container);
@@ -301,24 +301,18 @@ class CronManager
                 }
             }
 
-            if (in_array($scheduledJob['id'], $runningScheduledJobIdList)) {
+            if (in_array($scheduledJob->id, $runningScheduledJobIdList)) {
                 continue;
             }
 
             $jobEntity = $this->getEntityManager()->getEntity('Job');
             $jobEntity->set(array(
-                'name' => $scheduledJob['name'],
+                'name' => $scheduledJob->get('name'),
                 'status' => self::PENDING,
-                'scheduledJobId' => $scheduledJob['id'],
-                'executeTime' => $nextDate,
-                'method' => $scheduledJob['job']
+                'scheduledJobId' => $scheduledJob->id,
+                'executeTime' => $nextDate
             ));
             $this->getEntityManager()->saveEntity($jobEntity);
-
-            $createdJobIdList[] = $jobEntity->id;
         }
-
-        return $createdJobIdList;
     }
 }
-

application/Espo/Core/DataManager.php

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

application/Espo/Core/Entities/CategoryTreeItem.php

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

application/Espo/Core/Entities/Person.php

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

application/Espo/Core/EntryPointManager.php

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

application/Espo/Core/EntryPoints/Base.php

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

application/Espo/Core/Exceptions/BadRequest.php

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

application/Espo/Core/Exceptions/Conflict.php

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

application/Espo/Core/Exceptions/Error.php

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

application/Espo/Core/Exceptions/Forbidden.php

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

application/Espo/Core/Exceptions/InternalServerError.php

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

application/Espo/Core/Exceptions/NotFound.php

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

application/Espo/Core/Exceptions/Unauthorized.php

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

application/Espo/Core/Export/Csv.php

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

application/Espo/Core/Export/Xlsx.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -132,7 +132,7 @@ class Xlsx extends \Espo\Core\Injectable
             $exportName = $this->getInjection('language')->translate($entityType, 'scopeNamesPlural');
         }
 
-        $sheetName = substr($exportName, 0, 30);
+        $sheetName = mb_substr($exportName, 0, 30, 'utf-8');
         $badCharList = ['*', ':', '/', '\\', '?', '[', ']'];
         foreach ($badCharList as $badChar) {
             $sheetName = str_replace($badCharList, ' ', $sheetName);
@@ -249,6 +249,14 @@ class Xlsx extends \Espo\Core\Injectable
                         $type = $this->getInjection('metadata')->get(['entityDefs', $foreignScope, 'fields', $foreignField, 'type'], $type);
                     }
                 }
+                if ($type === 'foreign') {
+                    $linkName = $this->getInjection('metadata')->get(['entityDefs', $entityType, 'fields', $name, 'link']);
+                    $foreignField = $this->getInjection('metadata')->get(['entityDefs', $entityType, 'fields', $name, 'field']);
+                    $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;
@@ -304,8 +312,29 @@ class Xlsx extends \Espo\Core\Injectable
                         $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])));
+                    $value = null;
+                    if ($type == 'datetimeOptional') {
+                        if (isset($row[$name . 'Date']) && $row[$name . 'Date']) {
+                            $value = $row[$name . 'Date'];
+                        }
+                    }
+                    if (!$value) {
+                        if (isset($row[$name])) {
+                            $value = $row[$name];
+                        }
+                    }
+                    if ($value && strlen($value) > 11) {
+                        try {
+                            $timeZone = $this->getInjection('config')->get('timeZone');
+                            $dt = new \DateTime($value);
+                            $dt->setTimezone(new \DateTimeZone($timeZone));
+                            $value = $dt->format($this->getInjection('dateTime')->getInternalDateTimeFormat());
+                        } catch (\Exception $e) {
+                            $value = '';
+                        }
+                    }
+                    if ($value) {
+                        $sheet->setCellValue("$col$rowNumber", \PHPExcel_Shared_Date::PHPToExcel(strtotime($value)));
                     }
                 } else if ($type == 'image') {
                     if (isset($row[$name . 'Id']) && $row[$name . 'Id']) {
@@ -394,11 +423,9 @@ class Xlsx extends \Espo\Core\Injectable
 
         foreach ($fieldList as $i => $name) {
             $col = $azRange[$i];
-
             $type = $typesCache[$name];
 
-
-            switch($type) {
+            switch ($type) {
                 case 'currency':
                 case 'currencyConverted': {
 

application/Espo/Core/ExtensionManager.php

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

application/Espo/Core/ExternalAccount/ClientManager.php

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

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

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

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

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

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

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

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

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

application/Espo/Core/FileStorage/Manager.php

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

application/Espo/Core/FileStorage/Storages/Base.php

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

application/Espo/Core/FileStorage/Storages/EspoUploadDir.php

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

application/Espo/Core/Formula/AttributeFetcher.php

@@ -3,7 +3,7 @@
  * This file is part of EspoCRM.
  *
  * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2018 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
  * Website: http://www.espocrm.com
  *
  * EspoCRM is free software: you can redistribute it and/or modify
@@ -70,6 +70,11 @@ class AttributeFetcher
             if ($parent = $entity->get($relationName)) {
                 return $parent->get('name');
             }
+        } else if ($entity->getAttributeParam($attribute, 'isLinkMultipleIdList') && $methodName == 'get') {
+            $relationName = $entity->getAttributeParam($attribute, 'relation');
+            if (!$entity->has($attribute)) {
+                $entity->loadLinkMultipleField($relationName);
+            }
         }
 
         return $entity->$methodName($attribute);

application/Espo/Core/Formula/Evaluator.php

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

application/Espo/Core/Formula/Formula.php

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

application/Espo/Core/Formula/FunctionFactory.php

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

application/Espo/Core/Formula/Functions/ArrayGroup/IncludesType.php

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

application/Espo/Core/Formula/Functions/ArrayGroup/LengthType.php

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

application/Espo/Core/Formula/Functions/ArrayGroup/PushType.php

@@ -0,0 +1,57 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2018 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\Functions\ArrayGroup;
+
+use \Espo\Core\Exceptions\Error;
+
+class PushType extends \Espo\Core\Formula\Functions\Base
+{
+    public function process(\StdClass $item)
+    {
+        if (!property_exists($item, 'value') || !is_array($item->value)) {
+            throw new Error('Bad \'Array\\push\' definition.');
+        }
+        if (count($item->value) < 2) {
+            throw new Error('Bad arguments passed to \'Array\\push\'.');
+        }
+        $list = $this->evaluate($item->value[0]);
+        if (!is_array($list)) {
+            return false;
+        }
+
+        foreach ($item->value as $i => $v) {
+            if ($i === 0) continue;
+            $element = $this->evaluate($item->value[$i]);
+            $list[] = $element;
+        }
+
+        return $list;
+    }
+}

application/Espo/Core/Formula/Functions/AssignType.php

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

application/Espo/Core/Formula/Functions/AttributeType.php

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