fix ref

.gitignore

@@ -15,3 +15,4 @@
 /client
 /test.php
 /main.html
+/tests/testData/Utils/Config/config.php

.htaccess

@@ -1,8 +1,27 @@
+<ifModule mod_headers.c>
+  Header always set Access-Control-Allow-Methods "POST, GET, PUT, PATCH, DELETE"
+</ifModule>
+
 DirectoryIndex index.php index.html
 
-RedirectMatch 403 \.config$
+# PROTECTED DIRECTORIES
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteCond %{REQUEST_FILENAME} -d
+  RewriteRule (?i)(data|api) - [F]
+</IfModule>
+RedirectMatch 403 (?i)/data/config\.php$
+RedirectMatch 403 (?i)/data/logs
+RedirectMatch 403 (?i)/data/cache
+RedirectMatch 403 (?i)/data/upload
+RedirectMatch 403 (?i)/application
+RedirectMatch 403 (?i)/custom
+RedirectMatch 403 (?i)/vendor
+#END PROTECTED DIRECTORIES
 
 <IfModule mod_rewrite.c>
-RewriteEngine On
-RewriteRule reset/?$ reset.html [QSA,L]
+  RewriteEngine On
+  RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
+
+  RewriteRule reset/?$ reset.html [QSA,L]
 </IfModule>

Gruntfile.js

@@ -1,4 +1,50 @@
 module.exports = function (grunt) {
+
+	var jsFilesToMinify = [
+					'client/lib/jquery-2.0.2.min.js',
+					'client/lib/underscore-min.js',
+					'client/lib/backbone-min.js',
+					'client/lib/handlebars.js',
+					'client/lib/base64.js',
+					'client/lib/jquery-ui.min.js',
+					'client/lib/moment.min.js',
+					'client/lib/moment-timezone-with-data.min.js',
+					'client/lib/jquery.timepicker.min.js',
+					'client/lib/jquery.autocomplete.js',
+					'client/lib/bootstrap.min.js',
+					'client/lib/bootstrap-datepicker.js',
+					'client/lib/bull.min.js',					
+					'client/src/namespace.js',
+					'client/src/exceptions.js',
+					'client/src/app.js',
+					'client/src/utils.js',
+					'client/src/storage.js',
+					'client/src/loader.js',
+					'client/src/pre-loader.js',
+					'client/src/ui.js',
+					'client/src/acl.js',
+					'client/src/model.js',
+					'client/src/model-offline.js',
+					'client/src/metadata.js',
+					'client/src/language.js',
+					'client/src/cache.js',
+					'client/src/controller.js',
+					'client/src/router.js',
+					'client/src/date-time.js',
+					'client/src/field-manager.js',
+					'client/src/search-manager.js',
+					'client/src/collection.js',
+					'client/src/multi-collection.js',
+					'client/src/view-helper.js',
+					'client/src/layout-manager.js',
+					'client/src/model-factory.js',
+					'client/src/collection-factory.js',
+					'client/src/models/settings.js',
+					'client/src/models/user.js',
+					'client/src/models/preferences.js',
+					'client/src/controllers/base.js',
+					'client/src/view.js',
+	];
 	
 	grunt.initConfig({
 		pkg: grunt.file.readJSON('package.json'),
@@ -44,57 +90,9 @@ module.exports = function (grunt) {
 				mangle: false,
 				banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
 			},
-			'build/tmp/client/espo.min.js': [
-					'frontend/client/lib/jquery-2.0.2.min.js',
-					'frontend/client/lib/underscore-min.js',
-					'frontend/client/lib/backbone-min.js',
-					'frontend/client/lib/handlebars.js',
-					'frontend/client/lib/base64.js',
-					'frontend/client/lib/jquery-ui.min.js',
-					'frontend/client/lib/moment.min.js',
-					'frontend/client/lib/moment-timezone.min.js',
-					'frontend/client/lib/moment-timezone-data.js',
-					'frontend/client/lib/jquery.timepicker.min.js',
-					'frontend/client/lib/jquery.autocomplete.js',
-					'frontend/client/lib/bootstrap.min.js',
-					'frontend/client/lib/bootstrap-datepicker.js',
-					'frontend/client/lib/bull.min.js',					
-					'frontend/client/src/namespace.js',
-					'frontend/client/src/exceptions.js',
-					'frontend/client/src/app.js',
-					'frontend/client/src/utils.js',
-					'frontend/client/src/storage.js',
-					'frontend/client/src/loader.js',
-					'frontend/client/src/pre-loader.js',
-					'frontend/client/src/ui.js',
-					'frontend/client/src/acl.js',
-					'frontend/client/src/model.js',
-					'frontend/client/src/model-offline.js',
-					'frontend/client/src/metadata.js',
-					'frontend/client/src/language.js',
-					'frontend/client/src/cache.js',
-					'frontend/client/src/controller.js',
-					'frontend/client/src/router.js',
-					'frontend/client/src/date-time.js',
-					'frontend/client/src/field-manager.js',
-					'frontend/client/src/search-manager.js',
-					'frontend/client/src/collection.js',
-					'frontend/client/src/multi-collection.js',
-					'frontend/client/src/view-helper.js',
-					'frontend/client/src/layout-manager.js',
-					'frontend/client/src/model-factory.js',
-					'frontend/client/src/collection-factory.js',
-					'frontend/client/src/models/settings.js',
-					'frontend/client/src/models/user.js',
-					'frontend/client/src/models/preferences.js',
-					'frontend/client/src/controllers/base.js',
-					'frontend/client/src/controllers/record.js',
-					'frontend/client/src/controllers/role.js',
-					'frontend/client/src/controllers/admin.js',
-					'frontend/client/src/view.js',
-					'frontend/client/src/views/base.js',
-					'frontend/client/src/views/login.js',
-			]
+			'build/tmp/client/espo.min.js': jsFilesToMinify.map(function (item) {
+				return 'frontend/' + item;
+			})
 		},
 		copy: {
 			frontendFolders: {
@@ -138,7 +136,7 @@ module.exports = function (grunt) {
 					'index.php',
 					'LICENSE.txt',
 					'.htaccess',
-					'Web.config',
+					'web.config',
 				],
 				dest: 'build/tmp/',
 			},
@@ -150,6 +148,27 @@ module.exports = function (grunt) {
 				dest: 'build/EspoCRM-<%= pkg.version %>/',
 			},
 		},
+		chmod: {
+			options: {
+				mode: '755'
+			},
+			php: {			
+				options: {
+					mode: '644'
+				},
+				src: [
+					'build/EspoCRM-<%= pkg.version %>/**/*.php',
+					'build/EspoCRM-<%= pkg.version %>/**/*.json',
+					'build/EspoCRM-<%= pkg.version %>/**/*.config',
+					'build/EspoCRM-<%= pkg.version %>/**/.htaccess',					
+					'build/EspoCRM-<%= pkg.version %>/client/**/*.js',
+					'build/EspoCRM-<%= pkg.version %>/client/**/*.css',
+					'build/EspoCRM-<%= pkg.version %>/client/**/*.tpl',
+					'build/EspoCRM-<%= pkg.version %>/**/*.html',
+					'build/EspoCRM-<%= pkg.version %>/**/*.txt',
+				]
+			}
+		},
 		replace: {
 			timestamp: {
 				options: {
@@ -205,6 +224,7 @@ module.exports = function (grunt) {
 	grunt.loadNpmTasks('grunt-contrib-copy');
 	grunt.loadNpmTasks('grunt-replace');
 	grunt.loadNpmTasks('grunt-contrib-compress');
+	grunt.loadNpmTasks('grunt-chmod');
 
 	grunt.registerTask('default', [
 		'clean:start',
@@ -218,8 +238,8 @@ module.exports = function (grunt) {
 		'copy:backend',
 		'replace',
 		'copy:final',
+		'chmod',
 		'clean:final',
-		//'compress',
 	]);		
 
 };

Web.config

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-    <system.webServer>
-        <rewrite>
-            <rules>
-                <rule name="rule 1X" stopProcessing="true">
-                    <match url="reset/?$"  />
-                    <action type="Rewrite" url="reset.html"  appendQueryString="true" />
-                </rule>
-            </rules>
-        </rewrite>
-
-        <defaultDocument>
-            <files>
-                <clear />
-                <add value="index.php" />
-            </files>
-        </defaultDocument>
-    </system.webServer>
-
-</configuration>

api/v1/.htaccess

@@ -6,5 +6,7 @@ RewriteEngine On
 #
 # RewriteBase /
 
+RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
+
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^ index.php [QSA,L]

application/.htaccess

@@ -1,2 +0,0 @@
-Order Deny,Allow
-Deny from all

application/Espo/Controllers/AuthToken.php

@@ -0,0 +1,66 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Controllers;
+
+use \Espo\Core\Exceptions\Forbidden;
+
+class AuthToken extends \Espo\Core\Controllers\Record
+{	
+	protected function checkControllerAccess()
+	{
+		if (!$this->getUser()->isAdmin()) {
+			throw new Forbidden();
+		}
+	}
+	
+	public function actionUpdate($params, $data)
+	{
+		throw new Forbidden();
+	}	
+	
+	public function actionCreate($params, $data)
+	{
+		throw new Forbidden();
+	}
+	
+	public function actionListLinked($params, $data)
+	{
+		throw new Forbidden();
+	}
+	
+	public function actionMassUpdate($params, $data)
+	{
+		throw new Forbidden();
+	}
+	
+	public function actionCreateLink($params, $data)
+	{
+		throw new Forbidden();
+	}
+	
+	public function actionRemoveLink($params, $data)
+	{
+		throw new Forbidden();
+	}	
+}
+

application/Espo/Controllers/Email.php

@@ -24,5 +24,11 @@ namespace Espo\Controllers;
 
 class Email extends \Espo\Core\Controllers\Record
 {
-
+	public function actionGetCopiedAttachments($params, $data, $request)
+	{		
+		$id = $request->get('id');
+		
+		return $this->getRecordService()->getCopiedAttachments($id);
+	}
 }
+

application/Espo/Controllers/EmailAccount.php

@@ -0,0 +1,40 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Controllers;
+
+class EmailAccount extends \Espo\Core\Controllers\Record
+{
+	public function actionGetFolders($params, $data, $request)
+	{		
+		return $this->getRecordService()->getFolders(array(
+			'host' => $request->get('host'),
+			'port' => $request->get('port'),
+			'ssl' => $request->get('ssl'),
+			'username' => $request->get('username'),
+			'password' => $request->get('password'),
+			'id' => $request->get('id')
+		));
+
+	}
+}
+

application/Espo/Controllers/EmailAddress.php

@@ -24,5 +24,14 @@ namespace Espo\Controllers;
 
 class EmailAddress extends \Espo\Core\Controllers\Record
 {
-
+	public function actionSearchInAddressBook($params, $data, $request)
+	{
+		$q = $request->get('q');
+		$limit = intval($request->get('limit'));
+		if (empty($limit) || $limit > 30) {
+			$limit = 5;
+		}
+		return $this->getRecordService()->searchInAddressBook($q, $limit);
+	}
 }
+

application/Espo/Controllers/ExternalAccount.php

@@ -0,0 +1,104 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Controllers;
+
+use \Espo\Core\Exceptions\Error;
+use \Espo\Core\Exceptions\Forbidden;
+
+class ExternalAccount extends \Espo\Core\Controllers\Record
+{
+	public static $defaultAction = 'list';
+	
+	public function actionList($params, $data, $request)
+	{
+		$integrations = $this->getEntityManager()->getRepository('Integration')->find();	
+		$arr = array();
+		foreach ($integrations as $entity) {
+			if ($entity->get('enabled') && $this->getMetadata()->get('integrations.' . $entity->id .'.allowUserAccounts')) {				
+				$arr[] = array(
+					'id' => $entity->id
+				);
+			}
+		}
+		return array(
+			'list' => $arr
+		);
+	}
+	
+	public function actionGetOAuthCredentials($params, $data, $request)
+	{
+		$id = $request->get('id');
+		list($integration, $userId) = explode('__', $id);
+		
+		if (!$this->getUser()->isAdmin()) {
+			if ($this->getUser()->id != $userId) {
+				throw new Forbidden();
+			}
+		}
+		
+		$entity = $this->getEntityManager()->getEntity('Integration', $integration);
+		if ($entity) {
+			return array(
+				'clientId' => $entity->get('clientId'),
+				'redirectUri' => $this->getConfig()->get('siteUrl') . '/oauthcallback'
+			);
+		}
+	}
+
+	public function actionRead($params, $data, $request)
+	{
+		list($integration, $userId) = explode('__', $params['id']);
+		
+		if (!$this->getUser()->isAdmin()) {
+			if ($this->getUser()->id != $userId) {
+				throw new Forbidden();
+			}
+		}
+		
+		$entity = $this->getEntityManager()->getEntity('ExternalAccount', $params['id']);		
+		return $entity->toArray();
+	}
+	
+	public function actionUpdate($params, $data)
+	{
+		return $this->actionPatch($params, $data);
+	}
+	
+	public function actionPatch($params, $data)
+	{
+		list($integration, $userId) = explode('__', $params['id']);
+		
+		if (!$this->getUser()->isAdmin()) {
+			if ($this->getUser()->id != $userId) {
+				throw new Forbidden();
+			}
+		}
+		
+		$entity = $this->getEntityManager()->getEntity('ExternalAccount', $params['id']);
+		$entity->set($data);
+		$this->getEntityManager()->saveEntity($entity);
+		
+		return $entity->toArray();		
+	}
+}
+

application/Espo/Controllers/Import.php

@@ -44,7 +44,8 @@ class Import extends \Espo\Core\Controllers\Base
 		$contents = $data;
 		
 		$attachment = $this->getEntityManager()->getEntity('Attachment');
-		$attachment->set('type', 'text/csv');		
+		$attachment->set('type', 'text/csv');
+		$attachment->set('role', 'Import File');		
 		$this->getEntityManager()->saveEntity($attachment);
 		
 		$this->getFileManager()->putContents('data/upload/' . $attachment->id, $contents);

application/Espo/Controllers/Integration.php

@@ -0,0 +1,61 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Controllers;
+
+use \Espo\Core\Exceptions\Error;
+
+class Integration extends \Espo\Core\Controllers\Record
+{	
+	protected function checkControllerAccess()
+	{
+		if (!$this->getUser()->isAdmin()) {
+			throw new Forbidden();
+		}
+	}
+	
+	public function actionIndex($params, $data, $request)
+	{
+		return false;
+	}
+
+	public function actionRead($params, $data, $request)
+	{
+		$entity = $this->getEntityManager()->getEntity('Integration', $params['id']);		
+		return $entity->toArray();
+	}
+	
+	public function actionUpdate($params, $data)
+	{
+		return $this->actionPatch($params, $data);
+	}
+	
+	public function actionPatch($params, $data)
+	{
+		$entity = $this->getEntityManager()->getEntity('Integration', $params['id']);
+		$entity->set($data);
+		$this->getEntityManager()->saveEntity($entity);
+		
+		return $entity->toArray();		
+	}
+}
+

application/Espo/Controllers/Layout.php

@@ -25,6 +25,7 @@ namespace Espo\Controllers;
 use Espo\Core\Utils as Utils;
 use \Espo\Core\Exceptions\NotFound;
 use \Espo\Core\Exceptions\Error;
+use \Espo\Core\Exceptions\Forbidden;
 
 class Layout extends \Espo\Core\Controllers\Base
 {
@@ -39,6 +40,10 @@ class Layout extends \Espo\Core\Controllers\Base
 
 	public function actionUpdate($params, $data)
 	{
+        if (!$this->getUser()->isAdmin()) {
+        	throw new Forbidden();
+        }
+        
         $result = $this->getContainer()->get('layout')->set($data, $params['scope'], $params['name']);
 
 		if ($result === false) {

application/Espo/Controllers/Notification.php

@@ -54,7 +54,13 @@ class Notification extends \Espo\Core\Controllers\Base
 	public function actionNotReadCount()
 	{
 		$userId = $this->getUser()->id;
-		return $this->getService('Notification')->getNotReadCount($userId);	
+		return $this->getService('Notification')->getNotReadCount($userId);
+	}
+	
+	public function actionMarkAllRead($params, $data, $request)
+	{
+		$userId = $this->getUser()->id;
+		return $this->getService('Notification')->markAllRead($userId);
 	}
 }
 

application/Espo/Controllers/Preferences.php

@@ -68,6 +68,8 @@ class Preferences extends \Espo\Core\Controllers\Base
 			$entity->set('smtpEmailAddress', $user->get('emailAddress'));			
 			$entity->set('name', $user->get('name'));
 			
+			$entity->clear('smtpPassword');
+			
 			return $entity->toArray();		
 		}
 		throw new Error();
@@ -83,6 +85,9 @@ class Preferences extends \Espo\Core\Controllers\Base
 		
 		$entity->set('smtpEmailAddress', $user->get('emailAddress'));
 		$entity->set('name', $user->get('name'));
+		
+		$entity->clear('smtpPassword');
+		
 		if ($entity) {
 			return $entity->toArray();		
 		}

application/Espo/Controllers/Settings.php

@@ -30,9 +30,9 @@ class Settings extends \Espo\Core\Controllers\Base
 	protected function getConfigData()
 	{
 		$data = $this->getConfig()->getData($this->getUser()->isAdmin());
-		
+
 		$fieldDefs = $this->getMetadata()->get('entityDefs.Settings.fields');
-		
+
 		foreach ($fieldDefs as $field => $d) {
 			if ($d['type'] == 'password') {
 				unset($data[$field]);
@@ -40,7 +40,7 @@ class Settings extends \Espo\Core\Controllers\Base
 		}
 		return $data;
 	}
-	
+
 	public function actionRead($params, $data)
 	{
 		return $this->getConfigData();
@@ -52,16 +52,23 @@ class Settings extends \Espo\Core\Controllers\Base
 	}
 
 	public function actionPatch($params, $data)
-	{	   
+	{
 		if (!$this->getUser()->isAdmin()) {
 			throw new Forbidden();
 		}
-		
-		$result = $this->getConfig()->setData($data, $this->getUser()->isAdmin());
+
+		$this->getConfig()->setData($data, $this->getUser()->isAdmin());
+		$result = $this->getConfig()->save();
 		if ($result === false) {
 			throw new Error('Cannot save settings');
 		}
 
+		/** Rebuild for Currency Settings */
+		if (isset($data['baseCurrency']) || isset($data['currencyRates'])) {
+			$this->getContainer()->get('dataManager')->rebuildDatabase(array());
+		}
+		/** END Rebuild for Currency Settings */
+
 		return $this->getConfigData();
 	}
 }

application/Espo/Controllers/User.php

@@ -44,8 +44,14 @@ class User extends \Espo\Core\Controllers\Record
 			throw new NotFound();
 		}
 		
-		$acl = new \Espo\Core\Acl($user);
+		$acl = new \Espo\Core\Acl($user, $this->getConfig(), $this->getContainer()->get('fileManager'), $this->getMetadata());
 		
 		return $acl->toArray();					
 	}
+	
+	public function actionChangeOwnPassword($params, $data)
+	{
+		return $this->getService('User')->changePassword($this->getUser()->id, $data['password']);
+	}
 }
+

application/Espo/Core/Acl.php

@@ -34,11 +34,15 @@ class Acl
 
 	private $levelList = array('all', 'team', 'own', 'no');
 	
-	private $fileManager;
+	protected $fileManager;
+	
+	protected $metadata;
 
-	public function __construct(\Espo\Entities\User $user, $config = null, $fileManager = null)
+	public function __construct(\Espo\Entities\User $user, $config = null, $fileManager = null, $metadata = null)
 	{
-		$this->user = $user;		
+		$this->user = $user;
+		
+		$this->metadata = $metadata;		
 		
 		if (!$this->user->isFetched()) {
 			throw new Error();
@@ -197,27 +201,11 @@ class Acl
 	
 	private function initSolid()
 	{
-		$this->data['User'] = array(
-			'read' => 'all',
-			'edit' => 'no',
-			'delete' => 'no',					
-		);
-		$this->data['Team'] = array(
-			'read' => 'all',
-			'edit' => 'no',
-			'delete' => 'no',					
-		);
-		$this->data['Role'] = false;
-		$this->data['Note'] = array(
-			'read' => 'own',
-			'edit' => 'own',
-			'delete' => 'own',					
-		);
-		$this->data['EmailAddress'] = array(
-			'read' => 'no',
-			'edit' => 'no',
-			'delete' => 'no',					
-		);
+		$data = $this->metadata->get('app.acl.solid', array());
+		
+		foreach ($data as $entityName => $item) {
+			$this->data[$entityName] = $item;
+		}
 	}
 
 	private function merge($tables)

application/Espo/Core/Application.php

@@ -128,12 +128,9 @@ class Application
     	$cronManager = new \Espo\Core\CronManager($this->container);
 		$cronManager->run();
     }
-    
+
     public function runRebuild()
     {
-    	$auth = $this->getAuth();
-    	$auth->useNoAuth(true);
-
     	$dataManager = $this->getContainer()->get('dataManager');
 		$dataManager->rebuild();
     }

application/Espo/Core/Container.php

@@ -51,7 +51,6 @@ class Container
     		$obj = $this->$loadMethod();
     		$this->data[$name] = $obj;
     	} else {
-            //external loader class \Espo\Core\Loaders\<className> or \Espo\Custom\Core\Loaders\<className> with load() method
 			$className = '\Espo\Custom\Core\Loaders\\'.ucfirst($name);
             if (!class_exists($className)) {
             	$className = '\Espo\Core\Loaders\\'.ucfirst($name);
@@ -63,13 +62,18 @@ class Container
 			}
     	}
 
-		// TODO throw an exception
     	return null;
     }
+    
+    protected function getServiceClassName($name, $default)
+    {
+    	$metadata = $this->get('metadata');
+    	$className = $metadata->get('app.serviceContainer.classNames.' . $name, $default);
+    	return $className;
+    }
 
     private function loadSlim()
     {
-        //return new \Slim\Slim();
         return new \Espo\Core\Utils\Api\Slim();
     }
 
@@ -108,7 +112,8 @@ class Container
 
 	private function loadMailSender()
     {
-    	return new \Espo\Core\Mail\Sender(
+    	$className = $this->getServiceClassName('mailSernder', '\\Espo\\Core\\Mail\\Sender');
+    	return new $className(
 			$this->get('config')
 		);
     }
@@ -157,10 +162,12 @@ class Container
 
 	private function loadAcl()
 	{
-		return new \Espo\Core\Acl(
+		$className = $this->getServiceClassName('acl', '\\Espo\\Core\\Acl');
+		return new $className(
 			$this->get('user'),
 			$this->get('config'),
-			$this->get('fileManager')
+			$this->get('fileManager'),
+			$this->get('metadata')
 		);
 	}
 

application/Espo/Core/ControllerManager.php

@@ -78,7 +78,7 @@ class ControllerManager
 			throw new NotFound("Controller '$controllerName' is not found");
 		}
 
-		$controller = new $controllerClassName($this->container);
+		$controller = new $controllerClassName($this->container, $request->getMethod());
 
 		if ($actionName == 'index') {
 			$actionName = $controllerClassName::$defaultAction;

application/Espo/Core/Controllers/Base.php

@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Controllers;
 
@@ -29,15 +29,21 @@ use \Espo\Core\Utils\Util;
 abstract class Base
 {
 	protected $name;
-	
+
 	private $container;
-	
+
+	private $requestMethod;
+
 	public static $defaultAction = 'index';
 
-	public function __construct(Container $container)
+	public function __construct(Container $container, $requestMethod = null)
 	{
 		$this->container = $container;
-		
+
+		if (isset($requestMethod)) {
+			$this->setRequestMethod($requestMethod);
+		}
+
 		if (empty($this->name)) {
 			$name = get_class($this);
 			if (preg_match('@\\\\([\w]+)$@', $name, $matches)) {
@@ -45,40 +51,55 @@ abstract class Base
 			}
 			$this->name = $name;
     	}
-    	
+
     	$this->checkControllerAccess();
 	}
-	
+
 	protected function checkControllerAccess()
 	{
 		return;
 	}
-	
+
 	protected function getContainer()
 	{
 		return $this->container;
 	}
-	
+
+	/**
+	 * Get request method name (Uppercase)
+	 *
+	 * @return string
+	 */
+	protected function getRequestMethod()
+	{
+		return $this->requestMethod;
+	}
+
+	protected function setRequestMethod($requestMethod)
+	{
+		$this->requestMethod = strtoupper($requestMethod);
+	}
+
 	protected function getUser()
 	{
 		return $this->container->get('user');
 	}
-	
+
 	protected function getAcl()
 	{
 		return $this->container->get('acl');
 	}
-	
+
 	protected function getConfig()
 	{
 		return $this->container->get('config');
 	}
-	
+
 	protected function getPreferences()
 	{
 		return $this->container->get('preferences');
 	}
-	
+
 	protected function getMetadata()
 	{
 		return $this->container->get('metadata');
@@ -88,7 +109,7 @@ abstract class Base
 	{
 		return $this->container->get('serviceFactory');
 	}
-	
+
 	protected function getService($name)
 	{
 		return $this->getServiceFactory()->create($name);

application/Espo/Core/Controllers/Record.php

@@ -38,13 +38,17 @@ class Record extends Base
 		return $this->getContainer()->get('entityManager');
 	}
 	
-	protected function getRecordService()
+	protected function getRecordService($name = null)
 	{
-    	if ($this->getServiceFactory()->checkExists($this->name)) {
-    		$service = $this->getServiceFactory()->create($this->name);
+    	if (empty($name)) {
+    		$name = $this->name;
+    	}
+    	
+    	if ($this->getServiceFactory()->checkExists($name)) {
+    		$service = $this->getServiceFactory()->create($name);
     	} else {
     		$service = $this->getServiceFactory()->create('Record');
-    		$service->setEntityName($this->name);
+    		$service->setEntityName($name);
     	}		
 		
 		return $service;
@@ -178,8 +182,10 @@ class Record extends Base
 	}
 	
 	public function actionExport($params, $data, $request)
-	{
-		// TODO move to service
+	{		
+		if ($this->getConfig()->get('disableExport') && !$this->getUser()->isAdmin()) {
+			throw new Forbidden();
+		}
 		
 		if (!$this->getAcl()->check($this->name, 'read')) {
 			throw new Forbidden();

application/Espo/Core/Cron/Service.php

@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Cron;
 
@@ -46,22 +46,22 @@ class Service
 		$serviceName = $job['service_name'];
 
 		if (!$this->getServiceFactory()->checkExists($serviceName)) {
-			throw new NotFound(); 										
+			throw new NotFound();
 		}
 
-		$service = $this->getServiceFactory()->create($serviceName);	
-		$serviceMethod = $job['method'];	
+		$service = $this->getServiceFactory()->create($serviceName);
+		$serviceMethod = $job['method'];
 
 		if (!method_exists($service, $serviceMethod)) {
-			throw new NotFound();					
-		}	
+			throw new NotFound();
+		}
 
 		$data = $job['data'];
 		if (Json::isJSON($data)) {
 			$data = Json::decode($data, true);
 		}
 
-		$service->$serviceMethod($data);		
+		$service->$serviceMethod($data);
 	}
 
 }

application/Espo/Core/CronManager.php

@@ -34,6 +34,11 @@ class CronManager
 	private $jobService;
 	private $scheduledJobService;
 
+	const PENDING = 'Pending';
+	const RUNNING = 'Running';
+	const SUCCESS = 'Success';
+	const FAILED = 'Failed';
+
 	protected $lastRunTime = 'data/cache/application/cronLastRunTime.php';
 
 
@@ -128,13 +133,12 @@ class CronManager
 		//Check scheduled jobs and create related jobs
 		$this->createJobsFromScheduledJobs();
 
-
 		$pendingJobs = $this->getJobService()->getPendingJobs();
 
 		foreach ($pendingJobs as $job) {
 
 			$this->getJobService()->updateEntity($job['id'], array(
-				'status' => 'Running',
+				'status' => self::RUNNING,
 			));
 
 			$isSuccess = true;
@@ -150,7 +154,7 @@ class CronManager
 				$GLOBALS['log']->error('Failed job running, job ['.$job['id'].']. Error Details: '.$e->getMessage());
 			}
 
-			$status = $isSuccess ? 'Success' : 'Failed';
+			$status = $isSuccess ? self::SUCCESS : self::FAILED;
 
 			$this->getJobService()->updateEntity($job['id'], array(
 				'status' => $status,
@@ -180,7 +184,6 @@ class CronManager
 			$cronExpression = \Cron\CronExpression::factory($scheduling);
 
 			try {
-				//$nextDate = $cronExpression->getNextRunDate()->format('Y-m-d H:i:s');
 				$prevDate = $cronExpression->getPreviousRunDate()->format('Y-m-d H:i:s');
 			} catch (\Exception $e) {
 				$GLOBALS['log']->error('ScheduledJob ['.$scheduledJob['id'].']: CronExpression - Impossible CRON expression ['.$scheduling.']');
@@ -197,7 +200,7 @@ class CronManager
 				//create a job
 				$data = array(
 					'name' => $scheduledJob['name'],
-					'status' => 'Pending',
+					'status' => self::PENDING,
 					'scheduledJobId' => $scheduledJob['id'],
 					'executeTime' => $prevDate,
 					'method' => $scheduledJob['job'],

application/Espo/Core/Entities/Person.php

@@ -31,7 +31,9 @@ class Person extends \Espo\Core\ORM\Entity
 		$this->setValue('lastName', $value);
 		
 		$firstName = $this->get('firstName');
-		if (!empty($firstName)) {
+		if (empty($firstName)) {
+			$this->setValue('name', $value);
+		} else {
 			$this->setValue('name', $firstName . ' ' . $value);
 		}
 	}
@@ -41,7 +43,9 @@ class Person extends \Espo\Core\ORM\Entity
 		$this->setValue('firstName', $value);
 		
 		$lastName = $this->get('lastName');
-		if (!empty($lastName)) {
+		if (empty($lastName)) {
+			$this->setValue('name', $value);
+		} else {
 			$this->setValue('name', $value . ' ' . $lastName);
 		}
 	}

application/Espo/Core/Loaders/EntityManager.php

@@ -25,7 +25,7 @@ namespace Espo\Core\Loaders;
 use Doctrine\ORM\Tools\Setup,
     Espo\Core\Doctrine\ORM\Mapping\Driver\EspoPHPDriver;
 
-class EntityManager
+class EntityManager implements Loader
 {
 	private $container;
 
@@ -45,6 +45,7 @@ class EntityManager
 
 		$params = array(
 			'host' => $config->get('database.host'),
+			'port' => $config->get('database.port'),
 			'dbname' => $config->get('database.dbname'),
 			'user' => $config->get('database.user'),
 			'password' => $config->get('database.password'),

application/Espo/Core/Loaders/Loader.php

@@ -0,0 +1,31 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
+
+namespace Espo\Core\Loaders;
+
+
+interface Loader
+{
+	public function load();
+
+}
+

application/Espo/Core/Loaders/Log.php

@@ -25,7 +25,7 @@ namespace Espo\Core\Loaders;
 use Espo\Core\Utils,
 	Espo\Core\Utils\Log\Monolog\Handler;
 
-class Log
+class Log implements Loader
 {
 	private $container;
 

application/Espo/Core/Mail/Importer.php

@@ -0,0 +1,244 @@
+<?php
+
+namespace Espo\Core\Mail;
+
+use \Zend\Mime\Mime as Mime;
+
+class Importer
+{	
+	private $entityManager;
+	
+	private $fileManager;
+	
+	public function __construct($entityManager, $fileManager)
+	{
+		$this->entityManager = $entityManager;
+		$this->fileManager = $fileManager;
+	}
+	
+	protected function getEntityManager()
+	{
+		return $this->entityManager;
+	}
+	
+	protected function getFileManager()
+	{
+		return $this->fileManager;
+	}
+	
+	public function importMessage($message, $userId, $teamsIds = array())
+	{
+		try {
+			$email = $this->getEntityManager()->getEntity('Email');
+			
+			$email->set('isHtml', false);		
+			$email->set('name', $message->subject);
+			$email->set('status', 'Archived');
+			$email->set('attachmentsIds', array());			
+			$email->set('assignedUserId', $userId);
+			$email->set('teamsIds', $teamsIds);
+			
+			$fromArr = $this->getAddressListFromMessage($message, 'from');			
+			if (isset($message->from)) {
+				$email->set('fromName', $message->from);
+			}			
+			$email->set('from', $fromArr[0]);
+			$email->set('to', implode(';', $this->getAddressListFromMessage($message, 'to')));		
+			$email->set('cc', implode(';', $this->getAddressListFromMessage($message, 'cc')));
+			
+			if (isset($message->messageId) && !empty($message->messageId)) { 
+				$email->set('messageId', $message->messageId);
+				if (isset($message->deliveredTo)) {
+					$email->set('messageIdInternal', $message->messageId . '-' . $message->deliveredTo);
+				}
+			}
+			
+			if ($this->checkIsDuplicate($email)) {
+				return false;
+			}			
+
+			if (isset($message->date)) {
+				$dt = new \DateTime($message->date);
+				if ($dt) {
+					$dateSent = $dt->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d H:i:s');		
+					$email->set('dateSent', $dateSent);
+				}
+			}
+			if (isset($message->deliveryDate)) {
+				$dt = new \DateTime($message->deliveryDate);
+				if ($dt) {
+					$deliveryDate = $dt->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d H:i:s');		
+					$email->set('deliveryDate', $deliveryDate);
+				}
+			}
+			
+			$inlineIds = array();
+	
+			if ($message->isMultipart()) {				
+				foreach (new \RecursiveIteratorIterator($message) as $part) {
+					$this->importPartDataToEmail($email, $part, $inlineIds);
+				}			
+			} else {
+				$this->importPartDataToEmail($email, $message, $inlineIds);
+			}
+			
+			$body = $email->get('body');
+			if (!empty($body)) {
+				foreach ($inlineIds as $cid => $attachmentId) {
+					$body = str_replace('cid:' . $cid, '?entryPoint=attachment&amp;id=' . $attachmentId, $body);
+				}
+				$email->set('body', $body);
+			}
+
+			$this->getEntityManager()->saveEntity($email);
+			
+			return $email;
+					
+		} catch (\Exception $e) {}
+	}
+	
+	protected function checkIsDuplicate($email)
+	{
+		if ($email->get('messageIdInternal')) {
+			$duplicate = $this->getEntityManager()->getRepository('Email')->where(array(
+				'messageIdInternal' => $email->get('messageIdInternal')
+			))->findOne();
+			if ($duplicate) {
+				return true;
+			}
+		}
+	}
+	
+	protected function getAddressListFromMessage($message, $type)
+	{
+		$addressList = array();
+		if (isset($message->$type)) {
+			
+			$list = $message->getHeader($type)->getAddressList();
+			foreach ($list as $address) {
+				$addressList[] = $address->getEmail();
+			}
+		}
+		return $addressList;
+	}
+	
+	protected function importPartDataToEmail(\Espo\Entities\Email $email, $part, &$inlineIds = array())
+	{		
+		try {
+			$type = strtok($part->contentType, ';');
+			$encoding = null;
+			
+			switch ($type) {
+				case 'text/plain':					
+					$content = $this->getContentFromPart($part);				
+					if (!$email->get('body')) {				
+						$email->set('body', $content);
+					}
+					$email->set('bodyPlain', $content);
+					break;
+				case 'text/html':
+					$content = $this->getContentFromPart($part);
+					$email->set('body', $content);
+					$email->set('isHtml', true);
+					break;
+				default:
+					$content = $part->getContent();					
+					$disposition = null;
+					
+					$fileName = null;
+					$contentId = null;
+							
+					if (isset($part->ContentDisposition)) {				
+						if (strpos($part->ContentDisposition, 'attachment') === 0) {
+							if (preg_match('/filename="?([^"]+)"?/i', $part->ContentDisposition, $m)) {
+								$fileName = $m[1];
+								$disposition = 'attachment';
+							}							
+						} else if (strpos($part->ContentDisposition, 'inline') === 0) {
+							$contentId = trim($part->contentID, '<>');
+							$fileName = $contentId;
+							$disposition = 'inline';
+						}						
+					}
+					
+					if (isset($part->contentTransferEncoding)) {
+						$encoding = strtolower($part->getHeader('Content-Transfer-Encoding')->getTransferEncoding());
+					}
+					
+					$attachment = $this->getEntityManager()->getEntity('Attachment');
+					$attachment->set('name', $fileName);							
+					$attachment->set('type', $type);
+					
+					if ($disposition == 'inline') {
+						$attachment->set('role', 'Inline Attachment');
+					} else {
+						$attachment->set('role', 'Attachment');
+					}
+					
+					if ($encoding == 'base64') {
+						$content = base64_decode($content);
+					}
+					
+					$attachment->set('size', strlen($content));
+							
+					$this->getEntityManager()->saveEntity($attachment);
+												
+					$path = 'data/upload/' . $attachment->id;					
+					$this->getFileManager()->putContents($path, $content);					
+					
+					if ($disposition == 'attachment') {
+						$attachmentsIds = $email->get('attachmentsIds');
+						$attachmentsIds[] = $attachment->id;
+						$email->set('attachmentsIds', $attachmentsIds);	
+					} else if ($disposition == 'inline') {
+						$inlineIds[$contentId] = $attachment->id;
+					}		
+			}
+		} catch (\Exception $e) {}		
+	}
+	
+	protected function getContentFromPart($part)
+	{
+		if ($part instanceof \Zend\Mime\Part) {
+			$content = $part->getRawContent();
+			if (strtolower($part->charset) != 'utf-8') {
+				$content = mb_convert_encoding($content, 'UTF-8', $part->charset);
+			}
+		} else {
+			$content = $part->getContent();
+			
+			$encoding = null;
+			
+			if (isset($part->contentTransferEncoding)) {
+				$cteHeader = $part->getHeader('Content-Transfer-Encoding');
+				$encoding = strtolower($cteHeader->getTransferEncoding());
+			}
+			
+			if ($encoding == 'base64') {
+				$content = base64_decode($content);
+			}
+			
+			$charset = 'UTF-8';			
+			
+			if (isset($part->contentType)) {
+				$ctHeader = $part->getHeader('Content-Type');
+				$charsetParamValue = $ctHeader->getParameter('charset');
+				if (!empty($charsetParamValue)) {
+					$charset = strtoupper($charsetParamValue);
+				}
+			}
+			
+			if ($charset !== 'UTF-8') {
+				$content = mb_convert_encoding($content, 'UTF-8', $charset);
+			}			
+			
+			if (isset($part->contentTransferEncoding)) {
+				$cteHeader = $part->getHeader('Content-Transfer-Encoding');			
+				if ($cteHeader->getTransferEncoding() == 'quoted-printable') {					
+					$content = quoted_printable_decode($content);
+				}
+			}			
+		}
+		return $content;
+	}
+}

application/Espo/Core/Mail/Sender.php

@@ -124,23 +124,25 @@ class Sender
 		return $this;
 	}
 
-	public function send(Email $email)
+	public function send(Email $email, $params = array())
 	{
 		$message = new Message();
 
 		$config = $this->config;
+		
+		$params = $this->params + $params;
 
 		if ($email->get('from')) {
 			$fromName = null;
-			if (!empty($this->params['fromName'])) {
-				$fromName = $this->params['fromName'];
+			if (!empty($params['fromName'])) {
+				$fromName = $params['fromName'];
 			} else {
 				$fromName = $config->get('outboundEmailFromName');
 			}
 			$message->addFrom(trim($email->get('from')), $fromName);
 		} else {
-			if (!empty($this->params['fromAddress'])) {
-				$fromAddress = $this->params['fromAddress'];
+			if (!empty($params['fromAddress'])) {
+				$fromAddress = $params['fromAddress'];
 			} else {
 				if (!$config->get('outboundEmailFromAddress')) {
 					throw new Error('outboundEmailFromAddress is not specified in config.');
@@ -148,14 +150,22 @@ class Sender
 				$fromAddress = $config->get('outboundEmailFromAddress');
 			}
 
-			if (!empty($this->params['fromName'])) {
-				$fromName = $this->params['fromName'];
+			if (!empty($params['fromName'])) {
+				$fromName = $params['fromName'];
 			} else {
 				$fromName = $config->get('outboundEmailFromName');
 			}
 
 			$message->addFrom($fromAddress, $fromName);
 		}
+		
+		if (!empty($params['replyToAddress'])) {
+			$replyToName = null;
+			if (!empty($params['replyToName'])) {
+				$replyToName = $params['replyToName'];
+			}
+			$message->setReplyTo($params['replyToAddress'], $replyToName);
+		}
 
 		$value = $email->get('to');
 		if ($value) {
@@ -191,23 +201,21 @@ class Sender
 
 		$body = new MimeMessage;
 		$parts = array();
-		
+	
 
+		$bodyPart = new MimePart($email->getBodyPlainForSending());			
+		$bodyPart->type = 'text/plain';
+		$bodyPart->charset = 'utf-8';
+		$parts[] = $bodyPart;
+
+		
 		if ($email->get('isHtml')) {
 			$bodyPart = new MimePart($email->getBodyForSending());
 			$bodyPart->type = 'text/html';
 			$bodyPart->charset = 'utf-8';
-		} else {			
-			if ($email->get('bodyPlain')) {
-				$bodyPart = new MimePart($email->get('bodyPlain'));
-			} else {
-				$bodyPart = new MimePart($email->get('body'));
-			}
-			$bodyPart->type = 'text/plain';
-			$bodyPart->charset = 'utf-8';
+			$parts[] = $bodyPart;
 		}
-
-		$parts[] = $bodyPart;
+		
 
 		$aCollection = $email->get('attachments');
 		if (!empty($aCollection)) {
@@ -241,9 +249,19 @@ class Sender
 
 		$body->setParts($parts);
 		$message->setBody($body);
+		
+		if ($email->get('isHtml')) {
+			$message->getHeaders()->get('content-type')->setType('multipart/alternative');
+		}
 
 		try {
 			$this->transport->send($message);
+			
+			$headers = $message->getHeaders();
+			if ($headers->has('messageId')) {			
+				$email->set('messageId', $headers->get('messageId')->getId());
+			}
+
 			$email->set('status', 'Sent');
 			$email->set('dateSent', date("Y-m-d H:i:s"));
 		} catch (\Exception $e) {

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

@@ -0,0 +1,19 @@
+<?php
+
+namespace Espo\Core\Mail\Storage;
+
+class Imap extends \Zend\Mail\Storage\Imap
+{	
+	public function getIdsFromUID($uid)
+	{
+		$uid = intval($uid) + 1;
+		return $this->protocol->search(array('UID ' . $uid . ':*'));
+	}
+	
+	public function getIdsFromDate($date)
+	{		
+		return $this->protocol->search(array('SINCE "' . $date . '"'));
+	}
+	
+}
+

application/Espo/Core/ORM/Entity.php

@@ -24,19 +24,39 @@ namespace Espo\Core\ORM;
 
 class Entity extends \Espo\ORM\Entity
 {
-	public function loadLinkMultipleField($field)
+	public function loadLinkMultipleField($field, $columns = null)
 	{
 		if ($this->hasRelation($field) && $this->hasField($field . 'Ids')) {
-			$collection = $this->get($field);
+		
+			$defs = array();
+			if (!empty($columns)) {
+				$defs['additionalColumns'] = $columns;
+			}
+		
+			$collection = $this->get($field, $defs);
 			$ids = array();
-			$names = new \stdClass();		
+			$names = new \stdClass();
+			if (!empty($columns)) {
+				$columnsData = new \stdClass();
+			}
+			
 			foreach ($collection as $e) {
 				$id = $e->id;
 				$ids[] = $id;
 				$names->$id = $e->get('name');
+				if (!empty($columns)) {
+					$columnsData->$id = new \stdClass();
+					foreach ($columns as $column => $f) {				
+						$columnsData->$id->$column = $e->get($f);
+					}
+				}
 			}			
 			$this->set($field . 'Ids', $ids);
 			$this->set($field . 'Names', $names);
+			if (!empty($columns)) {
+				$this->set($field . 'Columns', $columnsData);
+			}
+			
 		}
 	}
 }

application/Espo/Core/ORM/EntityManager.php

@@ -56,7 +56,12 @@ class EntityManager extends \Espo\ORM\EntityManager
 	public function getUser()
 	{
 		return $this->user;
-	}	
+	}
+	
+	public function getEspoMetadata()
+	{
+		return $this->espoMetadata;
+	}		
 
 	public function setEspoMetadata($espoMetadata)
 	{

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

@@ -59,16 +59,15 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 		return $this->getInjection('metadata');
 	}
 
-	protected function handleSelectParams(&$params, $entityName = false)
+	public function handleSelectParams(&$params)
 	{
-		$this->handleEmailAddressParams($params, $entityName);
+		$this->handleEmailAddressParams($params);
+		$this->handlePhoneNumberParams($params);
 	}
 
-	protected function handleEmailAddressParams(&$params, $entityName = false)
+	protected function handleEmailAddressParams(&$params)
 	{
-		if (empty($entityName)) {
-			$entityName = $this->entityName;
-		}
+		$entityName = $this->entityName;		
 
 		$defs = $this->getEntityManager()->getMetadata()->get($entityName);
 		if (!empty($defs['relations']) && array_key_exists('emailAddresses', $defs['relations'])) {
@@ -81,11 +80,31 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 			if (empty($params['joinConditions'])) {
 				$params['joinConditions'] = array();
 			}
-			$params['leftJoins'] = array('emailAddresses');
-			$params['joinConditions'] = array(
-				'emailAddresses' => array(
-					'primary' => 1
-				)
+			$params['leftJoins'][] = 'emailAddresses';
+			$params['joinConditions']['emailAddresses'] = array(
+				'primary' => 1
+			);
+		}
+	}
+	
+	protected function handlePhoneNumberParams(&$params)
+	{
+		$entityName = $this->entityName;		
+
+		$defs = $this->getEntityManager()->getMetadata()->get($entityName);
+		if (!empty($defs['relations']) && array_key_exists('phoneNumbers', $defs['relations'])) {
+			if (empty($params['leftJoins'])) {
+				$params['leftJoins'] = array();
+			}
+			if (empty($params['whereClause'])) {
+				$params['whereClause'] = array();
+			}
+			if (empty($params['joinConditions'])) {
+				$params['joinConditions'] = array();
+			}
+			$params['leftJoins'][] = 'phoneNumbers';
+			$params['joinConditions']['phoneNumbers'] = array(
+				'primary' => 1
 			);
 		}
 	}
@@ -172,6 +191,7 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 		$entity->set($restoreData);
 
 		$this->handleEmailAddressSave($entity);
+		$this->handlePhoneNumberSave($entity);
 		$this->handleSpecifiedRelations($entity);
 
 		return $result;
@@ -183,6 +203,13 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 			$emailAddressRepository = $this->getEntityManager()->getRepository('EmailAddress')->storeEntityEmailAddress($entity);
 		}
 	}
+	
+	protected function handlePhoneNumberSave(Entity $entity)
+	{		
+		if ($entity->hasRelation('phoneNumbers') && $entity->hasField('phoneNumber')) {		
+			$emailAddressRepository = $this->getEntityManager()->getRepository('PhoneNumber')->storeEntityPhoneNumber($entity);
+		}
+	}
 
 	protected function handleSpecifiedRelations(Entity $entity)
 	{
@@ -195,22 +222,60 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 					if (is_array($specifiedIds)) {
 						$toRemoveIds = array();
 						$existingIds = array();
-						foreach ($entity->get($name) as $foreignEntity) {
+						$toUpdateIds = array();
+						$existingColumnsData = new \stdClass();
+						
+						$defs = array();
+						$columns = $this->getMetadata()->get("entityDefs." . $entity->getEntityName() . ".fields.{$name}.columns");
+						if (!empty($columns)) {	
+							$columnData = $entity->get($name . 'Columns');
+							$defs['additionalColumns'] = $columns;
+
+						}		
+			
+						foreach ($entity->get($name, $defs) as $foreignEntity) {
 							$existingIds[] = $foreignEntity->id;
+							if (!empty($columns)) {	
+								$data = new \stdClass();
+								foreach ($columns as $columnName => $columnField) {
+									$foreignId = $foreignEntity->id;
+									$data->$columnName = $foreignEntity->get($columnField);
+								}								
+								$existingColumnsData->$foreignId = $data;
+							}	
+													
 						}
 						foreach ($existingIds as $id) {
 							if (!in_array($id, $specifiedIds)) {
 								$toRemoveIds[] = $id;
+							} else {
+								if (!empty($columns)) {	
+									foreach ($columns as $columnName => $columnField) {
+										if ($columnData->$id->$columnName != $existingColumnsData->$id->$columnName) {
+											$toUpdateIds[] = $id;
+										}
+									}
+								}
 							}
 						}
 						foreach ($specifiedIds as $id) {
 							if (!in_array($id, $existingIds)) {
-								$this->relate($entity, $name, $id);
+								$data = null;
+								if (!empty($columns)) {	
+									$data = $columnData->$id;
+								}
+								$this->relate($entity, $name, $id, $data);
 							}
 						}
 						foreach ($toRemoveIds as $id) {
 							$this->unrelate($entity, $name, $id);
 						}
+						if (!empty($columns)) {	
+							foreach ($toUpdateIds as $id) {
+								$data = $columnData->$id;
+								$this->updateRelation($entity, $name, $id, $data);
+							}
+						}
 					}
 				}
 			}

application/Espo/Core/SelectManagers/Base.php

@@ -39,6 +39,8 @@ class Base
 	protected $entityName;
 
 	protected $metadata;
+	
+	const MIN_LENGTH_FOR_CONTENT_SEARCH = 4;
 
     public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, $metadata)
     {
@@ -82,6 +84,11 @@ class Base
 			}
 		}
     }
+    
+    protected function getTextFilterFields()
+    {
+    	return $this->metadata->get("entityDefs.{$this->entityName}.collection.textFilterFields", array('name'));
+    }
 
     protected function where($params, &$result)
     {
@@ -96,6 +103,27 @@ class Base
 							$params['where'][] = $p;
 						}
 					}
+				} else if ($item['type'] == 'textFilter' && !empty($item['value'])) {
+					if (!empty($item['value'])) {
+						if (empty($result['whereClause'])) {
+							$result['whereClause'] = array();
+						}
+						$fieldDefs = $this->entityManager->getEntity($this->entityName)->getFields();
+						$fieldList = $this->getTextFilterFields();
+						$d = array();
+						foreach ($fieldList as $field) {						
+							if (
+								strlen($item['value']) >= self::MIN_LENGTH_FOR_CONTENT_SEARCH 
+								&&
+								!empty($fieldDefs[$field]['type']) && $fieldDefs[$field]['type'] == 'text'
+							) {
+								$d[$field . '*'] = '%' . $item['value'] . '%';
+							} else {
+								$d[$field . '*'] = $item['value'] . '%';
+							}
+						}
+						$where['OR'] = $d;				
+					}
 				}
 			}
 
@@ -108,7 +136,7 @@ class Base
 						$where[] = $part;
 					}
 				} else {
-					if ($item['type'] == 'linkedWith') {
+					if ($item['type'] == 'linkedWith' && !empty($item['value'])) {
 						$linkedWith[$item['field']] = $item['value'];
 					}
 				}
@@ -159,18 +187,23 @@ class Base
     		}
     		$result['whereClause']['assignedUserId'] = $this->user->id;
     	}
-    	if ($this->acl->checkReadOnlyTeam($this->entityName)) {
+    	if (!$this->user->isAdmin() && $this->acl->checkReadOnlyTeam($this->entityName)) {
     		if (!array_key_exists('whereClause', $result)) {
     			$result['whereClause'] = array();
     		}
+    		$result['distinct'] = true;
     		if (!array_key_exists('joins', $result)) {
     			$result['joins'] = array();
     		}
     		if (!in_array('teams', $result['joins'])) {
-    			$result['joins'][] = 'teams';
+    			$result['leftJoins'][] = 'teams';
     		}
 
-    		$result['whereClause']['Team.id'] = $this->user->get('teamsIds');
+			$result['whereClause']['OR'] = array(
+				'Team.id' => $this->user->get('teamsIds'),
+				'assignedUserId' => $this->user->id
+			);
+    		//$result['whereClause']['Team.id'] = $this->user->get('teamsIds');
     	}
     }
 
@@ -255,6 +288,15 @@ class Base
 				case 'isFalse':
 					$part[$item['field'] . '='] = false;
 					break;
+				case 'today':
+					$part[$item['field'] . '='] = date('Y-m-d');
+					break;
+				case 'past':
+					$part[$item['field'] . '<'] = date('Y-m-d');
+					break;
+				case 'future':
+					$part[$item['field'] . '>'] = date('Y-m-d');
+					break;
 				case 'between':
 					if (is_array($item['value'])) {
 						$part['AND'] = array(
@@ -269,7 +311,7 @@ class Base
 		return $part;
 	}
 
-	protected function getBoolFilterWhere($filterName, $entityName)
+	protected function getBoolFilterWhere($filterName)
 	{
 		$method = 'getBoolFilterWhere' . ucfirst($filterName);
 		if (method_exists($this, $method)) {

application/Espo/Core/Services/Base.php

@@ -26,7 +26,11 @@ use \Espo\Core\Interfaces\Injectable;
 
 abstract class Base implements Injectable
 {
-	protected $dependencies = array();
+	protected $dependencies = array(
+		'config',
+		'entityManager',
+		'user',
+	);
 	
 	protected $injections = array();
 	
@@ -53,5 +57,20 @@ abstract class Base implements Injectable
 	{
 		return $this->dependencies;
 	}
+	
+	protected function getEntityManager()
+	{
+		return $this->getInjection('entityManager');
+	}
+	
+	protected function getConfig()
+	{
+		return $this->getInjection('config');
+	}
+
+	protected function getUser()
+	{
+		return $this->getInjection('user');
+	}
 }
 

application/Espo/Core/Upgrades/Base.php

@@ -255,7 +255,7 @@ abstract class Base
 			return;
 		}
 
-		$beforeInstallScript = Util::concatPath( array($upgradePath, $this->paths['scripts'], $scriptName) );
+		$beforeInstallScript = Util::concatPath( array($upgradePath, $this->paths['scripts'], $scriptName) ) . '.php';
 
 		if (file_exists($beforeInstallScript)) {
 			require_once($beforeInstallScript);
@@ -316,7 +316,13 @@ abstract class Base
 	{
 		if (!isset($this->data['manifest'])) {
 			$upgradePath = $this->getUpgradePath();
-			$manifestJson = $this->getFileManager()->getContents(array($upgradePath, $this->manifestName));
+
+			$manifestPath = Util::concatPath($upgradePath, $this->manifestName);
+			if (!file_exists($manifestPath)) {
+				throw new Error('It\'s not an uprgade package.');
+			}
+
+			$manifestJson = $this->getFileManager()->getContents($manifestPath);
 			$this->data['manifest'] = Json::decode($manifestJson, true);
 
 			if (!$this->data['manifest']) {
@@ -375,6 +381,9 @@ abstract class Base
 		$manifest = $this->getManifest();
 
 		$res = $this->getConfig()->set('version', $manifest['version']);
+		if (method_exists($this->getConfig(), 'save')) {
+			$res = $this->getConfig()->save();
+		}
 		$res &= $this->getContainer()->get('dataManager')->rebuild();
 
 		return $res;

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

@@ -51,9 +51,12 @@ class Auth extends \Slim\Middleware
 
 		$espoAuth = $req->headers('HTTP_ESPO_AUTHORIZATION');
 		if (isset($espoAuth)) {
-			$credentials = explode(':', base64_decode($espoAuth));
-			$authUsername = $credentials[0];
-			$authPassword = $credentials[1];
+			list($authUsername, $authPassword) = explode(':', base64_decode($espoAuth));
+		}
+
+		$espoCgiAuth = $req->headers('HTTP_ESPO_CGI_AUTH');
+		if ( !isset($authUsername) && !isset($authPassword) && isset($espoCgiAuth) ) {
+			list($authUsername, $authPassword) = explode(':' , base64_decode(substr($espoCgiAuth, 6)));
 		}
 
 		if (is_null($this->authRequired)) {

application/Espo/Core/Utils/Auth.php

@@ -18,91 +18,95 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils;
 
 use \Espo\Core\Exceptions\Error;
 
-class Auth 
+class Auth
 {
 	protected $container;
-	
+
+	protected $authentication;
+
+	protected $config;
+
+	protected $entityManager;
+
 	public function __construct(\Espo\Core\Container $container)
 	{
 		$this->container = $container;
+
+		$this->entityManager = $this->container->get('entityManager');
+		$this->config = $this->container->get('config');
+
+		$authenticationMethod = $this->config->get('authenticationMethod', 'Espo');
+		$authenticationClassName = "\\Espo\\Core\\Utils\\Authentication\\" . $authenticationMethod;
+		$this->authentication = new $authenticationClassName($this->config, $this->entityManager, $this);
 	}
-	
+
 	public function useNoAuth($isAdmin = false)
 	{
-		$entityManager = $this->container->get('entityManager');	
-		
+		$entityManager = $this->container->get('entityManager');
+
 		$user = $entityManager->getRepository('User')->get('system');
-		$user->set('isAdmin', $isAdmin);		
 		if (!$user) {
-			throw new Error('System user is not found');			
+			throw new Error('System user is not found');
 		}
 
+		$user->set('isAdmin', $isAdmin);
+
 		$entityManager->setUser($user);
 		$this->container->setUser($user);
 	}
-	
+
 	public function login($username, $password)
 	{
 		$GLOBALS['log']->debug('AUTH: Try to authenticate');
-		
-		$hash = md5($password);
-		
-		$entityManager = $this->container->get('entityManager');
-		
+
+		$entityManager = $this->entityManager;
+
 		$authToken = $entityManager->getRepository('AuthToken')->where(array('token' => $password))->findOne();
-		if ($authToken) {
-			$hash = $authToken->get('hash');
-		}
-		
-		$user = $entityManager->getRepository('User')->findOne(array(
-			'whereClause' => array(
-				'userName' => $username,
-				'password' => $hash
-			),
-		));
-		
+
+		$user = $this->authentication->login($username, $password, $authToken);
+
 		if ($user) {
 			$entityManager->setUser($user);
 			$this->container->setUser($user);
 			$GLOBALS['log']->debug('AUTH: Result of authenticate is [true]');
-			
+
 			if (!$authToken) {
 				$authToken = $entityManager->getEntity('AuthToken');
 				$token = $this->createToken($user);
 				$authToken->set('token', $token);
 				$authToken->set('hash', $user->get('password'));
 				$authToken->set('ipAddress', $_SERVER['REMOTE_ADDR']);
-				$authToken->set('userId', $user->id);	
+				$authToken->set('userId', $user->id);
 			}
-			
+
 			$authToken->set('lastAccess', date('Y-m-d H:i:s'));
-			
+
 			$entityManager->saveEntity($authToken);
 			$user->set('token', $authToken->get('token'));
-			
+
 			return true;
 		}
 	}
-	
+
 	protected function createToken($user)
 	{
-		return md5(uniqid($user->get('password')));
+		return md5(uniqid($user->get('id')));
 	}
-	
+
 	public function destroyAuthToken($token)
-	{	
+	{
 		$entityManager = $this->container->get('entityManager');
-		
+
 		$authToken = $entityManager->getRepository('AuthToken')->where(array('token' => $token))->findOne();
 		if ($authToken) {
 			$entityManager->removeEntity($authToken);
-			return true;			
+			return true;
 		}
 	}
 }

application/Espo/Core/Utils/Authentication/Base.php

@@ -0,0 +1,60 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
+
+namespace Espo\Core\Utils\Authentication;
+
+use \Espo\Core\Utils\Config;
+use \Espo\Core\ORM\EntityManager;
+use \Espo\Core\Utils\Auth;
+
+abstract class Base
+{
+	private $config;
+
+	private $entityManager;
+
+	private $auth;
+
+	public function __construct(Config $config, EntityManager $entityManager, Auth $auth)
+	{
+		$this->config = $config;
+		$this->entityManager = $entityManager;
+		$this->auth = $auth;
+	}
+
+	protected function getConfig()
+	{
+		return $this->config;
+	}
+
+	protected function getEntityManager()
+	{
+		return $this->entityManager;
+	}
+
+	protected function getAuth()
+	{
+		return $this->auth;
+	}
+
+}
+

application/Espo/Core/Utils/Authentication/Espo.php

@@ -0,0 +1,48 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Core\Utils\Authentication;
+
+use \Espo\Core\Exceptions\Error;
+
+class Espo extends Base
+{	
+	
+	public function login($username, $password, \Espo\Entities\AuthToken $authToken = null)
+	{
+		if ($authToken) {
+			$hash = $authToken->get('hash');
+		} else {
+			$hash = md5($password);
+		}
+		
+		$user = $this->getEntityManager()->getRepository('User')->findOne(array(
+			'whereClause' => array(
+				'userName' => $username,
+				'password' => $hash
+			),
+		));
+		
+		return $user;
+	}
+}
+

application/Espo/Core/Utils/Authentication/LDAP.php

@@ -0,0 +1,201 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
+
+namespace Espo\Core\Utils\Authentication;
+
+use Espo\Core\Exceptions\Error,
+	Espo\Core\Utils\Config,
+	Espo\Core\ORM\EntityManager,
+	Espo\Core\Utils\Auth;
+
+class LDAP extends Base
+{
+	private $utils;
+
+	private $zendLdap;
+
+	/**
+	 * Espo => LDAP name
+	 *
+	 * @var array
+	 */
+	private $fields = array(
+		'userName' => 'cn',
+		'firstName' => 'givenname',
+		'lastName' => 'sn',
+		'title' => 'title',
+		'emailAddress' => 'mail',
+		'phoneNumber' => 'telephonenumber',
+	);
+
+	public function __construct(Config $config, EntityManager $entityManager, Auth $auth)
+	{
+		parent::__construct($config, $entityManager, $auth);
+
+		$this->zendLdap = new LDAP\LDAP();
+		$this->utils = new LDAP\Utils($config);
+	}
+
+	protected function getZendLdap()
+	{
+		return $this->zendLdap;
+	}
+
+	protected function getUtils()
+	{
+		return $this->utils;
+	}
+
+
+	/**
+	 * LDAP login
+	 *
+	 * @param  string $username
+	 * @param  string $password
+	 * @param  \Espo\Entities\AuthToken $authToken
+	 * @return \Espo\Entities\User | null
+	 */
+	public function login($username, $password, \Espo\Entities\AuthToken $authToken = null)
+	{
+		if ($authToken) {
+			return $this->loginByToken($username, $authToken);
+		}
+
+		$options = $this->getUtils()->getZendOptions();
+
+		$ldap = $this->getZendLdap();
+		$ldap = $ldap->setOptions($options);
+
+		try {
+			$ldap->bind($username, $password);
+
+			$dn = $ldap->getDn($username);
+
+			$loginFilter = $this->getUtils()->getOption('userLoginFilter');
+			$userData = $ldap->searchByLoginFilter($loginFilter, $dn, 3);
+
+		} catch (\Zend\Ldap\Exception\LdapException $zle) {
+
+			$admin = $this->adminLogin($username, $password);
+			if (!isset($admin)) {
+				$GLOBALS['log']->info('LDAP Authentication: ' . $zle->getMessage());
+				return null;
+			}
+
+			$GLOBALS['log']->info('LDAP Authentication: Administrator login by username ['.$username.']');
+		}
+
+		$user = $this->getEntityManager()->getRepository('User')->findOne(array(
+			'whereClause' => array(
+				'userName' => $username,
+			),
+		));
+
+		$isCreateUser = $this->getUtils()->getOption('createEspoUser');
+		if (!isset($user) && $isCreateUser) {
+			$this->getAuth()->useNoAuth(); /** Required to fix Acl "isFetched()" error */
+			$user = $this->createUser($userData);
+		}
+
+		return $user;
+	}
+
+	/**
+	 * Login by authorization token
+	 *
+	 * @param  string $username
+	 * @param  \Espo\Entities\AuthToken $authToken
+	 * @return \Espo\Entities\User | null
+	 */
+	protected function loginByToken($username, \Espo\Entities\AuthToken $authToken = null)
+	{
+		if (!isset($authToken)) {
+			return null;
+		}
+
+		$userId = $authToken->get('userId');
+		$user = $this->getEntityManager()->getEntity('User', $userId);
+
+		$tokenUsername = $user->get('userName');
+		if ($username != $tokenUsername) {
+			$GLOBALS['log']->alert('Unauthorized access attempt for user ['.$username.'] from IP ['.$_SERVER['REMOTE_ADDR'].']');
+			return null;
+		}
+
+		$user = $this->getEntityManager()->getRepository('User')->findOne(array(
+			'whereClause' => array(
+				'userName' => $username,
+			),
+		));
+
+		return $user;
+	}
+
+	/**
+	 * Login user with administrator rights
+	 *
+	 * @param  string $username
+	 * @param  string $password
+	 * @return \Espo\Entities\User | null
+	 */
+	protected function adminLogin($username, $password)
+	{
+		$hash = md5($password);
+
+		$user = $this->getEntityManager()->getRepository('User')->findOne(array(
+			'whereClause' => array(
+				'userName' => $username,
+				'password' => $hash,
+				'isAdmin' => 1
+			),
+		));
+
+		return $user;
+	}
+
+	/**
+	 * Create Espo user with data gets from LDAP server
+	 *
+	 * @param  array $userData LDAP entity data
+	 * @return \Espo\Entities\User
+	 */
+	protected function createUser(array $userData)
+	{
+		$data = array();
+		foreach ($this->fields as $espo => $ldap) {
+			if (isset($userData[$ldap][0])) {
+				$data[$espo] = $userData[$ldap][0];
+			}
+		}
+
+		$user = $this->getEntityManager()->getEntity('User');
+		$user->set($data);
+
+		$this->getEntityManager()->saveEntity($user);
+
+		return $user;
+	}
+
+
+
+}
+

application/Espo/Core/Utils/Authentication/LDAP/LDAP.php

@@ -0,0 +1,123 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
+
+namespace Espo\Core\Utils\Authentication\LDAP;
+
+class LDAP extends \Zend\Ldap\Ldap
+{
+	protected $usernameAttribute = 'cn';
+
+
+	/**
+	 * Get DN depends on options, ex. "cn=test,ou=People,dc=maxcrc,dc=com"
+	 *
+	 * @return string DN format
+	 */
+	public function getDn($acctname)
+	{
+		return $this->getAccountDn($acctname, \Zend\Ldap\Ldap::ACCTNAME_FORM_DN);
+	}
+
+	/**
+	 * Fix a bug, ex. CN=Alice Baker,CN=Users,DC=example,DC=com
+	 *
+	 * @param  string $acctname
+	 * @return string - Account DN
+	 */
+	protected function getAccountDn($acctname)
+	{
+		$baseDn = $this->getBaseDn();
+
+		if ($this->getBindRequiresDn() && isset($baseDn)) {
+			try {
+				return parent::getAccountDn($acctname);
+			} catch (\Zend\Ldap\Exception\LdapException $zle) {
+				if ($zle->getCode() != \Zend\Ldap\Exception\LdapException::LDAP_NO_SUCH_OBJECT) {
+					throw $zle;
+				}
+			}
+
+			$acctname = $this->usernameAttribute . '=' . \Zend\Ldap\Filter\AbstractFilter::escapeValue($acctname) . ',' . $baseDn;
+		}
+
+		return parent::getAccountDn($acctname);
+	}
+
+	/**
+	 * Search a user using userLoginFilter
+	 *
+	 * @param  string $filter
+	 * @param  string $basedn
+	 * @param  int $scope
+	 * @param  array  $attributes
+	 * @return array
+	 */
+	public function searchByLoginFilter($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB, array $attributes = array())
+	{
+		$filter = $this->getLoginFilter($filter);
+
+		$result = $this->search($filter, $basedn, $scope, $attributes);
+
+		if ($result->count() > 0) {
+			return $result->getFirst();
+		}
+
+		throw new \Zend\Ldap\Exception\LdapException($this, 'searching: ' . $filter);
+	}
+
+	/**
+	 * Get login filter in LDAP format
+	 *
+	 * @param  string $filter
+	 * @return string
+	 */
+	protected function getLoginFilter($filter)
+	{
+		$baseFilter = '(objectClass=*)';
+
+		if (!empty($filter)) {
+			$baseFilter = '(&' . $baseFilter . $this->convertToFilterFormat($filter). ')';
+		}
+
+		return $baseFilter;
+	}
+
+	/**
+	 * Check and convert filter item in LDAP format
+	 *
+	 * @param  string $filter [description]
+	 * @return string
+	 */
+	protected function convertToFilterFormat($filter)
+	{
+		$filter = trim($filter);
+		if (substr($filter, 0, 1) != '(') {
+			$filter = '(' . $filter;
+		}
+
+		if (substr($filter, -1) != ')') {
+			$filter = $filter . ')';
+		}
+
+		return $filter;
+	}
+}

application/Espo/Core/Utils/Authentication/LDAP/Utils.php

@@ -0,0 +1,155 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
+
+namespace Espo\Core\Utils\Authentication\LDAP;
+
+use \Espo\Core\Utils\Config;
+
+class Utils
+{
+	private $config;
+
+	protected $options = null;
+
+	/**
+	 * Association between LDAP and Espo fields
+	 * @var array
+	 */
+	protected $fieldMap = array(
+		'host' => 'ldapHost',
+		'port' => 'ldapPort',
+		'useSsl' => 'ldapSecurity',
+		'useStartTls' => 'ldapSecurity',
+		'username' => 'ldapUsername',
+		'password' => 'ldapPassword',
+		'bindRequiresDn' => 'ldapBindRequiresDn',
+		'baseDn' => 'ldapBaseDn',
+		'accountCanonicalForm' => 'ldapAccountCanonicalForm',
+		'accountDomainName' => 'ldapAccountDomainName',
+		'accountDomainNameShort' => 'ldapAccountDomainNameShort',
+		'accountFilterFormat' => 'ldapAccountFilterFormat',
+		'optReferrals' => 'ldapOptReferrals',
+		'tryUsernameSplit' => 'ldapTryUsernameSplit',
+		'networkTimeout' => 'ldapNetworkTimeout',
+		'createEspoUser' => 'ldapCreateEspoUser',
+		'userLoginFilter' => 'ldapUserLoginFilter',
+	);
+
+	/**
+	 * Permitted Espo Options
+	 *
+	 * @var array
+	 */
+	protected $permittedEspoOptions = array(
+		'createEspoUser' => false,
+		'userLoginFilter' => null,
+	);
+
+	/**
+	 * accountCanonicalForm Map between Espo and Zend value
+	 *
+	 * @var array
+	 */
+	protected $accountCanonicalFormMap = array(
+		'Dn' => 1,
+		'Username' => 2,
+		'Backslash' => 3,
+		'Principal' => 4,
+	);
+
+
+	public function __construct(Config $config)
+	{
+		$this->config = $config;
+	}
+
+	protected function getConfig()
+	{
+		return $this->config;
+	}
+
+	/**
+	 * Get Options from espo config according to $this->fieldMap
+	 *
+	 * @return array
+	 */
+	public function getOptions()
+	{
+		if (isset($this->options)) {
+			return $this->options;
+		}
+
+		$options = array();
+		foreach ($this->fieldMap as $ldapName => $espoName) {
+
+			$option = $this->getConfig()->get($espoName);
+			if (isset($option)) {
+				$options[$ldapName] = $option;
+			}
+		}
+
+		/** peculiar fields */
+		$options['useSsl'] = (bool) ($options['useSsl'] == 'SSL');
+		$options['useStartTls'] = (bool) ($options['useStartTls'] == 'TLS');
+		$options['accountCanonicalForm'] = $this->accountCanonicalFormMap[ $options['accountCanonicalForm'] ];
+
+		$this->options = $options;
+
+		return $this->options;
+	}
+
+	/**
+	 * Get an ldap option
+	 *
+	 * @param  string $name
+	 * @param  mixed $returns Return value
+	 * @return mixed
+	 */
+	public function getOption($name, $returns = null)
+	{
+		if (isset($this->options)) {
+			$this->getOptions();
+		}
+
+		if (isset($this->options[$name])) {
+			return $this->options[$name];
+		}
+
+		return $returns;
+	}
+
+	/**
+	 * Get Zend options for using Zend\Ldap
+	 *
+	 * @return array
+	 */
+	public function getZendOptions()
+	{
+		$options = $this->getOptions();
+		$espoOptions = array_keys($this->permittedEspoOptions);
+
+		$zendOptions = array_diff_key($options, array_flip($espoOptions));
+
+		return $zendOptions;
+	}
+
+}

application/Espo/Core/Utils/Config.php

@@ -53,7 +53,10 @@ class Config
 	 * @access private
 	 * @var array
 	 */
-	private $configData;
+	private $data;
+
+	private $changedData = array();
+	private $removeData = array();
 
 	private $fileManager;
 
@@ -109,28 +112,50 @@ class Config
 			$name = array($name => $value);
 		}
 
-		return $this->setArray($name);
+		foreach ($name as $key => $value) {
+
+			if (is_object($value)) {
+				$value = (array) $value;
+			}
+
+			$this->data[$key] = $value;
+			$this->changedData[$key] = $value;
+		}
 	}
 
-
 	/**
-	 * Set options from array
+	 * Remove an option in config
 	 *
-	 * @param array $values
-	 * @return bool
+	 * @param  string $name
+	 * @return bool | null - null if an option doesn't exist
 	 */
-	protected function setArray($values)
+	public function remove($name)
 	{
-		if (!is_array($values)) {
-			return false;
+		if (array_key_exists($name, $this->data)) {
+			unset($this->data[$name]);
+			$this->removeData[] = $name;
+			return true;
 		}
 
+		return null;
+	}
+
+	public function save()
+	{
+		$values = $this->changedData;
+
 		if (!isset($values[$this->cacheTimestamp])) {
 			$values = array_merge($this->updateCacheTimestamp(true), $values);
 		}
 
-		$result = $this->getFileManager()->mergeContentsPHP($this->configPath, $values, true);
-		$this->loadConfig(true);
+		$removeData = empty($this->removeData) ? null : $this->removeData;
+
+		$result = $this->getFileManager()->mergeContentsPHP($this->configPath, $values, 1, $removeData);
+		if ($result) {
+			$this->changedData = array();
+			$this->removeData = array();
+			$this->loadConfig(true);
+		}
 
 		return $result;
 	}
@@ -147,18 +172,18 @@ class Config
 	 */
 	protected function loadConfig($reload = false)
 	{
-		if (!$reload && isset($this->configData) && !empty($this->configData)) {
-			return $this->configData;
+		if (!$reload && isset($this->data) && !empty($this->data)) {
+			return $this->data;
 		}
 
 		$configPath = file_exists($this->configPath) ? $this->configPath : $this->defaultConfigPath;
 
-		$this->configData = $this->getFileManager()->getContents($configPath);
+		$this->data = $this->getFileManager()->getContents($configPath);
 
 		$systemConfig = $this->getFileManager()->getContents($this->systemConfigPath);
-		$this->configData = Util::merge($systemConfig, $this->configData);
+		$this->data = Util::merge($systemConfig, $this->data);
 
-		return $this->configData;
+		return $this->data;
 	}
 
 
@@ -170,9 +195,9 @@ class Config
 	 */
 	public function getData($isAdmin = false)
 	{
-		$configData = $this->loadConfig();
+		$data = $this->loadConfig();
 
-		$restrictedConfig = $configData;
+		$restrictedConfig = $data;
 		foreach($this->getRestrictItems($isAdmin) as $name) {
 			if (isset($restrictedConfig[$name])) {
 				unset($restrictedConfig[$name]);
@@ -200,7 +225,7 @@ class Config
 			}
 		}
 
-		return $this->setArray($values);
+		return $this->set($values);
 	}
 
 	/**
@@ -229,14 +254,14 @@ class Config
 	 */
 	protected function getRestrictItems($onlySystemItems = false)
 	{
-		$configData = $this->loadConfig();
+		$data = $this->loadConfig();
 
 		if ($onlySystemItems) {
-			return $configData['systemItems'];
+			return $data['systemItems'];
 		}
 
 		if (empty($this->adminItems)) {
-			$this->adminItems= Util::merge($configData['systemItems'], $configData['adminItems']);
+			$this->adminItems= Util::merge($data['systemItems'], $data['adminItems']);
 		}
 
 		return $this->adminItems;

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

@@ -26,18 +26,21 @@ use Espo\Core\Utils\Util;
 
 class Base
 {
+	private $itemName = null;
+
+	private $entityName = null;
+
 	private $metadata;
 
-	private $params;
+	private $ormEntityDefs;
 
-	private $foreignParams;
+	private $entityDefs;
 
-	protected $allowParams = array();
-
-
-	public function __construct(\Espo\Core\Utils\Metadata $metadata)
+	public function __construct(\Espo\Core\Utils\Metadata $metadata, array $ormEntityDefs, array $entityDefs)
 	{
 		$this->metadata = $metadata;
+		$this->ormEntityDefs = $ormEntityDefs;
+		$this->entityDefs = $entityDefs;
 	}
 
 	protected function getMetadata()
@@ -45,102 +48,223 @@ class Base
 		return $this->metadata;
 	}
 
-	protected function getParams()
+	protected function getOrmEntityDefs()
 	{
-		return $this->params;
+		return $this->ormEntityDefs;
 	}
 
-	protected function getForeignParams()
+	protected function getEntityDefs()
 	{
-		return $this->foreignParams;
+		return $this->entityDefs;
 	}
 
-	protected function setParams(array $params)
+	/**
+	 * Set current Field name OR Link name
+	 *
+	 * @param void
+	 */
+	protected function setItemName($itemName)
 	{
-		$this->params = $params;
+		$this->itemName = $itemName;
 	}
 
-	protected function setForeignParams(array $foreignParams)
+	/**
+	 * Get current Field name
+	 *
+	 * @return string
+	 */
+	protected function getFieldName()
 	{
-		$this->foreignParams = $foreignParams;
+		return $this->itemName;
 	}
 
-
-	public function process($params, $foreignParams)
+	/**
+	 * Get current Link name
+	 *
+	 * @return string
+	 */
+	protected function getLinkName()
 	{
-		$this->setParams($params);
-		$this->setForeignParams($foreignParams);
-
-		$loads = $this->load($params, $foreignParams);
-
-		$loads = $this->mergeAllowedParams($loads);
-
-		return $loads;
+		return $this->itemName;
 	}
 
-	private function mergeAllowedParams($loads)
+	/**
+	 * Set current Entity Name
+	 *
+	 * @param void
+	 */
+	protected function setEntityName($entityName)
 	{
-		$params = $this->getParams();
+		$this->entityName = $entityName;
+	}
 
-		if (!empty($this->allowParams)) {
-			$linkParams = &$loads[$params['entityName']] ['relations'] [$params['link']['name']];
+	/**
+	 * Get current Entity Name
+	 *
+	 * @return string
+	 */
+	protected function getEntityName()
+	{
+		return $this->entityName;
+	}
 
-			foreach ($this->allowParams as $name) {
-
-				$additionalParrams = $this->getAllowedAdditionalParams($name);
-
-				if (isset($additionalParrams) && !isset($linkParams[$name])) {
-					$linkParams[$name] = $additionalParrams;
-				}
+	protected function setMethods(array $keyValueList)
+	{
+		foreach ($keyValueList as $key => $value) {
+			$methodName = 'set' . ucfirst($key);
+			if (method_exists($this, $methodName)) {
+				$this->$methodName($value);
 			}
 		}
-
-		return $loads;
 	}
 
-	private function getAllowedAdditionalParams($allowedItemName)
+	/**
+	 * Start process Orm converting for fields/relations
+	 *
+	 * @param  string $itemName    Field name OR Link name
+	 * @param  string $entityName
+	 * @return array
+	 */
+	public function process($itemName, $entityName)
 	{
-		$params = $this->getParams();
-		$foreignParams = $this->getForeignParams();
+		$inputs = array(
+			'itemName' => $itemName,
+			'entityName' => $entityName,
+		);
+		$this->setMethods($inputs);
 
-		$linkParams = isset($params['link']['params'][$allowedItemName]) ? $params['link']['params'][$allowedItemName] : null;
-		$foreignLinkParams = isset($foreignParams['link']['params'][$allowedItemName]) ? $foreignParams['link']['params'][$allowedItemName] : null;
+		$convertedDefs = $this->load($itemName, $entityName);
 
-		$additionalParrams = null;
+		$inputs = $this->setArrayValue(null, $inputs);
+		$this->setMethods($inputs);
 
-		if (isset($linkParams) && isset($foreignLinkParams)) {
-			$additionalParrams = Util::merge($linkParams, $foreignLinkParams);
-		} else if (isset($linkParams)) {
-			$additionalParrams = $linkParams;
-		} else if (isset($foreignLinkParams)) {
-			$additionalParrams = $foreignLinkParams;
+		return $convertedDefs;
+	}
+
+	/**
+	 * Get Entity Defs by type (entity/orm)
+	 *
+	 * @param  boolean $isOrmEntityDefs
+	 * @return array
+	 */
+	protected function getDefs($isOrmEntityDefs = false)
+	{
+		$entityDefs = $isOrmEntityDefs ? $this->getOrmEntityDefs() : $this->getEntityDefs();
+
+		return $entityDefs;
+	}
+
+	/**
+	 * Get entity params by name
+	 *
+	 * @param  string $entityName
+	 * @param  bool $isOrmEntityDefs
+	 * @param  mixed $returns
+	 * @return mixed
+	 */
+	protected function getEntityParams($entityName = null, $isOrmEntityDefs = false, $returns = null)
+	{
+		if (!isset($entityName)) {
+			$entityName = $this->getEntityName();
 		}
 
-		return $additionalParrams;
+		$entityDefs = $this->getDefs($isOrmEntityDefs);
+
+		if (isset($entityDefs[$entityName])) {
+			return $entityDefs[$entityName];
+		}
+
+		return $returns;
 	}
 
+	/**
+	 * Get field params by name for a specified entity
+	 *
+	 * @param  string $fieldName
+	 * @param  string $entityName
+	 * @param  bool $isOrmEntityDefs
+	 * @param  mixed $returns
+	 * @return mixed
+	 */
+	protected function getFieldParams($fieldName = null, $entityName = null, $isOrmEntityDefs = false, $returns = null)
+	{
+		if (!isset($fieldName)) {
+			$fieldName = $this->getFieldName();
+		}
+		if (!isset($entityName)) {
+			$entityName = $this->getEntityName();
+		}
+
+		$entityDefs = $this->getDefs($isOrmEntityDefs);
+
+		if (isset($entityDefs[$entityName]) && isset($entityDefs[$entityName]['fields'][$fieldName])) {
+			return $entityDefs[$entityName]['fields'][$fieldName];
+		}
+
+		return $returns;
+	}
+
+	/**
+	 * Get relation params by name for a specified entity
+	 *
+	 * @param  string $linkName
+	 * @param  string $entityName
+	 * @param  bool $isOrmEntityDefs
+	 * @param  mixed $returns
+	 * @return mixed
+	 */
+	protected function getLinkParams($linkName = null, $entityName = null, $isOrmEntityDefs = false, $returns = null)
+	{
+		if (!isset($linkName)) {
+			$linkName = $this->getLinkName();
+		}
+		if (!isset($entityName)) {
+			$entityName = $this->getEntityName();
+		}
+
+		$entityDefs = $this->getDefs($isOrmEntityDefs);
+		$relationKeyName = $isOrmEntityDefs ? 'relations' : 'links';
+
+		if (isset($entityDefs[$entityName]) && isset($entityDefs[$entityName][$relationKeyName][$linkName])) {
+			return $entityDefs[$entityName][$relationKeyName][$linkName];
+		}
+
+		return $returns;
+	}
+
+	/**
+	 * Get Foreign field
+	 *
+	 * @param  string $name
+	 * @param  string $entityName
+	 * @return string
+	 */
 	protected function getForeignField($name, $entityName)
 	{
 		$foreignField = $this->getMetadata()->get('entityDefs.'.$entityName.'.fields.'.$name);
 
 		if ($foreignField['type'] != 'varchar') {
-			$fieldDefs = $this->getMetadata()->get('fields.'.$foreignField['type']);
-			$naming = isset($fieldDefs['naming']) ? $fieldDefs['naming'] : 'postfix';
-
-			if (isset($fieldDefs['actualFields']) && is_array($fieldDefs['actualFields'])) {
-				$foreignFieldArray = array();
-				foreach($fieldDefs['actualFields'] as $fieldName) {
-					if ($fieldName != 'salutation') {
-						$foreignFieldArray[] = Util::getNaming($name, $fieldName, $naming);
-					}
-				}
-				return explode('|', implode('| |', $foreignFieldArray)); //add an empty string between items
+			if ($foreignField['type'] == 'personName') {
+				return array('first' . ucfirst($name), ' ', 'last' . ucfirst($name));
 			}
 		}
 
 		return $name;
 	}
 
+	/**
+	 * Set a value for all elements of array. So, in result all elements will have the same values
+	 *
+	 * @param string $value
+	 * @param array  $array
+	 */
+	protected function setArrayValue($inputValue, array $array)
+	{
+		foreach ($array as &$value) {
+			$value = $inputValue;
+		}
 
+		return $array;
+	}
 
 }

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

@@ -33,6 +33,8 @@ class Converter
 
 	private $relationManager;
 
+	private $entityDefs;
+
 	protected $defaultFieldType = 'varchar';
 	protected $defaultNaming = 'postfix';
 
@@ -55,6 +57,7 @@ class Converter
 		'len' => 'len',
 		'notNull' => 'notNull',
 		'autoincrement' => 'autoincrement',
+		'entity' => 'entity',
 		'notStorable' => 'notStorable',
 		'link' => 'relation',
 		'field' => 'foreign',  //todo change "foreign" to "field"
@@ -69,6 +72,9 @@ class Converter
 				'default' => '{0}',
 		   ),
 		),
+		'select' => 'select',
+		'orderBy' => 'orderBy',
+		'where' => 'where',
 	);
 
 	protected $idParams = array(
@@ -85,6 +91,8 @@ class Converter
 		$this->relationManager = new RelationManager($this->metadata);
 
 		$this->metadataUtils = new \Espo\Core\Utils\Metadata\Utils($this->metadata);
+
+		$this->entityDefs = $this->getMetadata()->get('entityDefs');
 	}
 
 
@@ -93,6 +101,11 @@ class Converter
 		return $this->metadata;
 	}
 
+	protected function getEntityDefs()
+	{
+		return $this->entityDefs;
+	}
+
 	protected function getFileManager()
 	{
 		return $this->fileManager;
@@ -108,11 +121,9 @@ class Converter
 		return $this->metadataUtils;
 	}
 
-
-
 	public function process()
 	{
-		$entityDefs = $this->getMetadata()->get('entityDefs');
+		$entityDefs = $this->getEntityDefs();
 
 		$ormMeta = array();
 		foreach($entityDefs as $entityName => $entityMeta) {
@@ -122,7 +133,7 @@ class Converter
 				continue;
 			}
 
-			$ormMeta = Util::merge($ormMeta, $this->convertEntity($entityName, $entityMeta, $entityDefs));
+			$ormMeta = Util::merge($ormMeta, $this->convertEntity($entityName, $entityMeta));
 		}
 
 		$ormMeta = $this->afterProcess($ormMeta);
@@ -130,10 +141,7 @@ class Converter
 		return $ormMeta;
 	}
 
-
-
-	//convertToDatabaseFormat
-	protected function convertEntity($entityName, $entityMeta, $entityDefs)
+	protected function convertEntity($entityName, $entityMeta)
 	{
 		$ormMeta = array();
 		$ormMeta[$entityName] = array(
@@ -145,18 +153,19 @@ class Converter
 
 		$ormMeta[$entityName]['fields'] = $this->convertFields($entityName, $entityMeta);
 
-		$convertedLinks = $this->convertLinks($entityName, $entityMeta, $entityDefs);
+		$convertedLinks = $this->convertLinks($entityName, $entityMeta, $ormMeta);
 
 		$ormMeta = Util::merge($ormMeta, $convertedLinks);
 
 		return $ormMeta;
 	}
 
-
-	public function afterProcess(array $meta)
+	public function afterProcess(array $ormMeta)
 	{
+		$entityDefs = $this->getEntityDefs();
+
 		//load custom field definitions and customCodes
-		foreach($meta as $entityName => &$entityParams) {
+		foreach($ormMeta as $entityName => &$entityParams) {
 			foreach($entityParams['fields'] as $fieldName => $fieldParams) {
 
 				//load custom field definitions
@@ -167,17 +176,14 @@ class Converter
 				}
 
 				if (class_exists($className) && method_exists($className, 'load')) {
-					$helperClass = new $className($this->metadata);
-					$fieldResult = $helperClass->load(
-						array('name' => $entityName, 'params' => $entityParams),
-						array('name' => $fieldName, 'params' => $fieldParams)
-					);
+					$helperClass = new $className($this->metadata, $ormMeta, $entityDefs);
+					$fieldResult = $helperClass->process( $fieldName, $entityName );
 					if (isset($fieldResult['unset'])) {
-						$meta = Util::unsetInArray($meta, $fieldResult['unset']);
+						$ormMeta = Util::unsetInArray($ormMeta, $fieldResult['unset']);
 						unset($fieldResult['unset']);
 					}
 
-					$meta = Util::merge($meta, $fieldResult);
+					$ormMeta = Util::merge($ormMeta, $fieldResult);
 				} //END: load custom field definitions
 
 
@@ -196,7 +202,7 @@ class Converter
 			}
 		}
 
-		foreach($meta as $entityName => &$entityParams) {
+		foreach($ormMeta as $entityName => &$entityParams) {
 			foreach($entityParams['fields'] as $fieldName => &$fieldParams) {
 
 				switch ($fieldParams['type']) {
@@ -224,10 +230,9 @@ class Converter
 
 		}
 
-		return $meta;
+		return $ormMeta;
 	}
 
-
 	/**
 	 * Metadata conversion from Espo format into Doctrine
 	 *
@@ -293,8 +298,6 @@ class Converter
 		return $outputMeta;
 	}
 
-
-
 	protected function convertField($entityName, $fieldName, array $fieldParams, $fieldTypeMeta = null)
 	{
 		/** set default type if exists */
@@ -376,34 +379,20 @@ class Converter
 		return $subField;
 	}
 
-	protected function convertLinks($entityName, $entityMeta, array $entityDefs)
+	protected function convertLinks($entityName, $entityMeta, $ormMeta)
 	{
 		if (!isset($entityMeta['links'])) {
 			return array();
 		}
 
+		$entityDefs = $this->getEntityDefs();
+
 		$relationships = array();
 		foreach($entityMeta['links'] as $linkName => $linkParams) {
 
-			$linkEntityName = $this->getRelationManager()->getLinkEntityName($entityName, $linkParams);
+			$convertedLink = $this->getRelationManager()->convert($linkName, $linkParams, $entityName, $ormMeta);
 
-			$currentType = $linkParams['type'];
-
-			$foreignLink = $this->getForeignLink($linkName, $linkParams, $entityDefs[$linkEntityName]);
-
-			$method = $currentType;
-			if ($foreignLink !== false) {
-				$method .= '-'.$foreignLink['params']['type'];
-			}
-			$method = Util::toCamelCase($method);
-
-			if ( $this->getRelationManager()->isRelationExists($method) ) {  //ex. hasManyHasMany
-				$convertedLink = $this->getRelationManager()->process($method, $entityName, array('name'=>$linkName, 'params'=>$linkParams), $foreignLink);
-			} else { //ex. hasMany
-				$convertedLink = $this->getRelationManager()->process($currentType, $entityName, array('name'=>$linkName, 'params'=>$linkParams), $foreignLink);
-			}
-
-			if ($convertedLink !== false) {
+			if (isset($convertedLink)) {
 				$relationships = Util::merge($convertedLink, $relationships);
 			}
 		}
@@ -411,27 +400,6 @@ class Converter
 		return $relationships;
 	}
 
-	/**
-	* Get foreign Link
-	*
-	* @param string $parentLinkName
-	* @param array $parentLinkParams
-	* @param array $currentEntityDefs
-	*
-	* @return array - in format array('name', 'params')
-	*/
-	protected function getForeignLink($parentLinkName, $parentLinkParams, $currentEntityDefs)
-	{
-		if (isset($parentLinkParams['foreign']) && isset($currentEntityDefs['links'][$parentLinkParams['foreign']])) {
-			return array(
-				'name' => $parentLinkParams['foreign'],
-				'params' => $currentEntityDefs['links'][$parentLinkParams['foreign']],
-			);
-		}
-
-		return false;
-	}
-
 	protected function getInitValues(array $fieldParams)
 	{
 		$values = array();
@@ -460,4 +428,4 @@ class Converter
 		return $values;
 	}
 
-}
+}

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

@@ -18,34 +18,55 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils\Database\Orm\Fields;
 
 class Email extends \Espo\Core\Utils\Database\Orm\Base
 {
-
-	public function load($entity, $field)
+	protected function load($fieldName, $entityName)
 	{
-        return array(
-			$entity['name'] => array(
-			   	'fields' => array(
-                	$field['name'] => array(
+		return array(
+			$entityName => array(
+				'fields' => array(
+					$fieldName => array(
 						'select' => 'email_address.name',
-				        'where' =>
-				        array (
-				          'LIKE' => 'email_address.name LIKE \'{text}\'',
-				          '=' => 'email_address.name = \'{text}\'',
-				        ),
-				        'orderBy' => 'email_address.name {direction}',
+						'where' =>
+						array (
+							'LIKE' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
+								SELECT entity_id 
+								FROM entity_email_address
+								JOIN email_address ON email_address.id = entity_email_address.email_address_id
+								WHERE 
+									entity_email_address.deleted = 0 AND entity_email_address.entity_type = '{$entityName}' AND
+									email_address.deleted = 0 AND email_address.name LIKE {value}          		
+							)",
+							'=' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
+								SELECT entity_id 
+								FROM entity_email_address
+								JOIN email_address ON email_address.id = entity_email_address.email_address_id
+								WHERE 
+									entity_email_address.deleted = 0 AND entity_email_address.entity_type = '{$entityName}' AND
+									email_address.deleted = 0 AND email_address.name = {value}          		
+							)",
+							'<>' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
+								SELECT entity_id 
+								FROM entity_email_address
+								JOIN email_address ON email_address.id = entity_email_address.email_address_id
+								WHERE 
+									entity_email_address.deleted = 0 AND entity_email_address.entity_type = '{$entityName}' AND
+									email_address.deleted = 0 AND email_address.name <> {value}          		
+							)"
+						),
+						'orderBy' => 'email_address.name {direction}',
 					),
-					$field['name'] .'Data' => array(
+					$fieldName .'Data' => array(
 						'type' => 'text',
 						'notStorable' => true
 					),
 				),
 				'relations' => array(
-					$field['name'].'es' => array(
+					$fieldName.'es' => array(
 						'type' => 'manyMany',
 						'entity' => 'EmailAddress',
 						'relationName' => 'entityEmailAddress',
@@ -54,16 +75,16 @@ class Email extends \Espo\Core\Utils\Database\Orm\Base
 							'email_address_id',
 						),
 						'conditions' => array(
-							'entityType' => $entity['name'],
+							'entityType' => $entityName,
 						),
 						'additionalColumns' => array(
-                            'entityType' => array(
+							'entityType' => array(
 								'type' => 'varchar',
-        						'len' => 100,
+								'len' => 100,
 							),
 							'primary' => array(
 								'type' => 'bool',
-        						'default' => false,
+								'default' => false,
 							),
 						),
 					),

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

@@ -18,35 +18,44 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils\Database\Orm\Fields;
 
 class LinkMultiple extends \Espo\Core\Utils\Database\Orm\Base
 {
-
-	public function load($entity, $field)
+	protected function load($fieldName, $entityName)
 	{
-        return array(
-			$entity['name'] => array (
-	           	'fields' => array(
-	               	$field['name'].'Ids' => array(
+		$data = array(
+			$entityName => array (
+				'fields' => array(
+					$fieldName.'Ids' => array(
 						'type' => 'varchar',
 						'notStorable' => true,
 					),
-					$field['name'].'Names' => array(
+					$fieldName.'Names' => array(
 						'type' => 'varchar',
 						'notStorable' => true,
 					),
 				),
 			),
-            'unset' => array(
-                $entity['name'] => array(
-                    'fields.'.$field['name'],
-                ),
-            ),
+			'unset' => array(
+				$entityName => array(
+					'fields.'.$fieldName,
+				),
+			),
 		);
+
+		$columns = $this->getMetadata()->get("entityDefs.{$entityName}.fields.{$fieldName}.columns");
+		if (!empty($columns)) {
+			$data[$entityName]['fields'][$fieldName . 'Columns'] = array(
+				'type' => 'varchar',
+				'notStorable' => true,
+			);
+		}
+
+		return $data;
 	}
 
 
-}
+}

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

@@ -24,28 +24,27 @@ namespace Espo\Core\Utils\Database\Orm\Fields;
 
 class LinkParent extends \Espo\Core\Utils\Database\Orm\Base
 {
-
-	public function load($entity, $field)
+	protected function load($fieldName, $entityName)
 	{
-        return array(
-            $entity['name'] => array (
-            	'fields' => array(
-                	$field['name'].'Id' => array(
+		return array(
+			$entityName => array (
+				'fields' => array(
+					$fieldName.'Id' => array(
 						'type' => 'foreignId',
-						'index' => $field['name'],
+						'index' => $fieldName,
 					),
-					$field['name'].'Type' => array(
+					$fieldName.'Type' => array(
 						'type' => 'foreignType',
 						'notNull' => false,
-						'index' => $field['name'],
+						'index' => $fieldName,
 					),
-					$field['name'].'Name' => array(
+					$fieldName.'Name' => array(
 						'type' => 'varchar',
 						'notStorable' => true,
 					),
 				),
-			)
-        );
+			),
+		);
 	}
 
 

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

@@ -26,11 +26,11 @@ use Espo\Core\Utils\Util;
 
 class PersonName extends \Espo\Core\Utils\Database\Orm\Base
 {
-
-	public function load($entity, $field)
+	protected function load($fieldName, $entityName)
 	{
-		$foreignField = $this->getForeignField($field['name'], $entity['name']);
-		$tableName = Util::toUnderScore($entity['name']);
+		$foreignField = array('first' . ucfirst($fieldName), ' ', 'last' . ucfirst($fieldName));
+		
+		$tableName = Util::toUnderScore($entityName);
 
 		$fullList = array(); //contains empty string (" ") like delimiter
 		$fullListReverse = array(); //reverse of $fullList
@@ -38,31 +38,31 @@ class PersonName extends \Espo\Core\Utils\Database\Orm\Base
 		$like = array();
 		$equal = array();
 
-		foreach($foreignField as $fieldName) {
+		foreach($foreignField as $foreignFieldName) {
 
-			$fieldNameTrimmed = trim($fieldName);
+			$fieldNameTrimmed = trim($foreignFieldName);
 			if (!empty($fieldNameTrimmed)) {
 				$columnName = $tableName.'.'.Util::toUnderScore($fieldNameTrimmed);
 
 				$fullList[] = $fieldList[] = $columnName;
-				$like[] = $columnName." LIKE '{text}'";
-				$equal[] = $columnName." = '{text}'";
+				$like[] = $columnName." LIKE {value}";
+				$equal[] = $columnName." = {value}";
 			} else {
-				$fullList[] = "'".$fieldName."'";
+				$fullList[] = "'".$foreignFieldName."'";
 			}
 		}
 
 		$fullListReverse = array_reverse($fullList);
 
 		return array(
-			$entity['name'] => array (
+			$entityName => array (
 				'fields' => array(
-					$field['name'] => array(
+					$fieldName => array(
 						'type' => 'varchar',
 						'select' => $this->getSelect($fullList),
 						'where' => array(
-							'LIKE' => "(".implode(" OR ", $like)." OR CONCAT(".implode(", ", $fullList).") LIKE '{text}' OR CONCAT(".implode(", ", $fullListReverse).") LIKE '{text}')",
-							'=' => "(".implode(" OR ", $equal)." OR CONCAT(".implode(", ", $fullList).") = '{text}' OR CONCAT(".implode(", ", $fullListReverse).") = '{text}')",
+							'LIKE' => "(".implode(" OR ", $like)." OR CONCAT(".implode(", ", $fullList).") LIKE {value} OR CONCAT(".implode(", ", $fullListReverse).") LIKE {value})",
+							'=' => "(".implode(" OR ", $equal)." OR CONCAT(".implode(", ", $fullList).") = {value} OR CONCAT(".implode(", ", $fullListReverse).") = {value})",
 						),
 						'orderBy' => implode(", ", array_map(function ($item) {return $item . ' {direction}';}, $fieldList)),
 					),
@@ -87,4 +87,4 @@ class PersonName extends \Espo\Core\Utils\Database\Orm\Base
 		return $select;
 	}
 
-}
+}

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

@@ -0,0 +1,97 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
+
+namespace Espo\Core\Utils\Database\Orm\Fields;
+
+class Phone extends \Espo\Core\Utils\Database\Orm\Base
+{
+	protected function load($fieldName, $entityName)
+	{
+		return array(
+			$entityName => array(
+				'fields' => array(
+					$fieldName => array(
+						'select' => 'phone_number.name',
+						'where' =>
+						array (
+							'LIKE' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
+								SELECT entity_id 
+								FROM entity_phone_number
+								JOIN phone_number ON phone_number.id = entity_phone_number.phone_number_id
+								WHERE 
+									entity_phone_number.deleted = 0 AND entity_phone_number.entity_type = '{$entityName}' AND
+									phone_number.deleted = 0 AND phone_number.name LIKE {value}          		
+							)",
+							'=' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
+								SELECT entity_id 
+								FROM entity_phone_number
+								JOIN phone_number ON phone_number.id = entity_phone_number.phone_number_id
+								WHERE 
+									entity_phone_number.deleted = 0 AND entity_phone_number.entity_type = '{$entityName}' AND
+									phone_number.deleted = 0 AND phone_number.name = {value}          		
+							)",
+							'<>' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
+								SELECT entity_id 
+								FROM entity_phone_number
+								JOIN phone_number ON phone_number.id = entity_phone_number.phone_number_id
+								WHERE 
+									entity_phone_number.deleted = 0 AND entity_phone_number.entity_type = '{$entityName}' AND
+									phone_number.deleted = 0 AND phone_number.name <> {value}          		
+							)"
+						),
+						'orderBy' => 'phone_number.name {direction}',
+					),
+					$fieldName .'Data' => array(
+						'type' => 'text',
+						'notStorable' => true
+					),
+				),
+				'relations' => array(
+					$fieldName.'s' => array(
+						'type' => 'manyMany',
+						'entity' => 'PhoneNumber',
+						'relationName' => 'entityPhoneNumber',
+						'midKeys' => array(
+							'entity_id',
+							'phone_number_id',
+						),
+						'conditions' => array(
+							'entityType' => $entityName,
+						),
+						'additionalColumns' => array(
+							'entityType' => array(
+								'type' => 'varchar',
+								'len' => 100,
+							),
+							'primary' => array(
+								'type' => 'bool',
+								'default' => false,
+							),
+						),
+					),
+				),
+			),
+		);
+	}
+
+}
+

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

@@ -28,10 +28,14 @@ class RelationManager
 {
 	private $metadata;
 
+	private $entityDefs;
+
 
 	public function __construct(\Espo\Core\Utils\Metadata $metadata)
 	{
 		$this->metadata = $metadata;
+
+		$this->entityDefs = $this->getMetadata()->get('entityDefs');
 	}
 
 	protected function getMetadata()
@@ -39,14 +43,15 @@ class RelationManager
 		return $this->metadata;
 	}
 
-
-	public function getLinkEntityName($entityName, $link)
+	protected function getEntityDefs()
 	{
-		if (isset($link['params'])) {
-			return isset($link['params']['entity']) ? $link['params']['entity'] : $entityName;
-		}
+		return $this->entityDefs;
+	}
 
-		return isset($link['entity']) ? $link['entity'] : $entityName;
+
+	public function getLinkEntityName($entityName, $linkParams)
+	{
+		return isset($linkParams['entity']) ? $linkParams['entity'] : $entityName;
 	}
 
 	public function isRelationExists($relationName)
@@ -81,33 +86,58 @@ class RelationManager
 		return method_exists($className, 'load');
 	}
 
-	public function process($method, $entityName, $link, $foreignLink = array())
+	/**
+	* Get foreign Link
+	*
+	* @param string $parentLinkName
+	* @param array $parentLinkParams
+	* @param array $currentEntityDefs
+	*
+	* @return array - in format array('name', 'params')
+	*/
+	private function getForeignLink($parentLinkName, $parentLinkParams, $currentEntityDefs)
 	{
-		$params = array();
-		$params['entityName'] = $entityName;
-		$params['link'] = $link;
-
-		$foreignParams = array();
-		$foreignParams['entityName'] = $this->getLinkEntityName($entityName, $link);
-		$foreignParams['link'] = $foreignLink;
-
-		$params['targetEntity'] = $foreignParams['entityName'];
-		$foreignParams['targetEntity'] = $params['entityName'];
-
-		//relationDefs defined in separate file
-		if (isset($link['params']['relationName']) && $this->isMethodExists($link['params']['relationName'])) {
-			$className = $this->getRelationClass($link['params']['relationName']);
-		} else if ($this->isMethodExists($method)) {
-			$className = $this->getRelationClass($method);
+		if (isset($parentLinkParams['foreign']) && isset($currentEntityDefs['links'][$parentLinkParams['foreign']])) {
+			return array(
+				'name' => $parentLinkParams['foreign'],
+				'params' => $currentEntityDefs['links'][$parentLinkParams['foreign']],
+			);
 		}
 
-		if (isset($className) && $className !== false) {
-			$helperClass = new $className($this->metadata);
-			return $helperClass->process($params, $foreignParams);
-		}
-		//END: relationDefs defined in separate file
-
 		return false;
 	}
 
+	public function convert($linkName, $linkParams, $entityName, $ormMeta)
+	{
+		$entityDefs = $this->getEntityDefs();
+
+		$foreignEntityName = $this->getLinkEntityName($entityName, $linkParams);
+		$foreignLink = $this->getForeignLink($linkName, $linkParams, $entityDefs[$foreignEntityName]);
+
+		$currentType = $linkParams['type'];
+
+		$method = $currentType;
+		if ($foreignLink !== false) {
+			$method .= '-'.$foreignLink['params']['type'];
+		}
+		$method = Util::toCamelCase($method);
+
+		$relationName = $this->isRelationExists($method) ? $method /*hasManyHasMany*/ : $currentType /*hasMany*/;
+
+		//relationDefs defined in separate file
+		if (isset($linkParams['relationName']) && $this->isMethodExists($linkParams['relationName'])) {
+			$className = $this->getRelationClass($linkParams['relationName']);
+		} else if ($this->isMethodExists($relationName)) {
+			$className = $this->getRelationClass($relationName);
+		}
+
+		if (isset($className) && $className !== false) {
+			$helperClass = new $className($this->metadata, $ormMeta, $entityDefs);
+			return $helperClass->process($linkName, $entityName, $foreignLink['name'], $foreignEntityName);
+		}
+		//END: relationDefs defined in separate file
+
+		return null;
+	}
+
 }

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

@@ -0,0 +1,151 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
+
+namespace Espo\Core\Utils\Database\Orm\Relations;
+
+class Base extends \Espo\Core\Utils\Database\Orm\Base
+{
+	private $params;
+
+	private $foreignParams;
+
+	protected $foreignLinkName = null;
+	protected $foreignEntityName = null;
+
+	protected $allowedParams = array(
+		'relationName',
+		'conditions',
+		'additionalColumns',
+		'midKeys',
+	);
+
+	protected function getParams()
+	{
+		return $this->params;
+	}
+
+	protected function getForeignParams()
+	{
+		return $this->foreignParams;
+	}
+
+	protected function setParams(array $params)
+	{
+		$this->params = $params;
+	}
+
+	protected function setForeignParams(array $foreignParams)
+	{
+		$this->foreignParams = $foreignParams;
+	}
+
+	protected function setForeignLinkName($foreignLinkName)
+	{
+		$this->foreignLinkName = $foreignLinkName;
+	}
+
+	protected function getForeignLinkName()
+	{
+		return $this->foreignLinkName;
+	}
+
+	protected function setForeignEntityName($foreignEntityName)
+	{
+		$this->foreignEntityName = $foreignEntityName;
+	}
+
+	protected function getForeignEntityName()
+	{
+		return $this->foreignEntityName;
+	}
+
+	protected function getForeignLinkParams()
+	{
+		$foreignLinkName = $this->getForeignLinkName();
+		$foreignEntityName = $this->getForeignEntityName();
+		$foreignLinkParams = $this->getLinkParams($foreignLinkName, $foreignEntityName);
+
+		return $foreignLinkParams;
+	}
+
+	public function process($linkName, $entityName, $foreignLinkName, $foreignEntityName)
+	{
+		$inputs = array(
+			'itemName' => $linkName,
+			'entityName' => $entityName,
+			'foreignLinkName' => $foreignLinkName,
+			'foreignEntityName' => $foreignEntityName,
+		);
+		$this->setMethods($inputs);
+
+		$convertedDefs = $this->load($linkName, $entityName);
+		$convertedDefs = $this->mergeAllowedParams($convertedDefs);
+
+		$inputs = $this->setArrayValue(null, $inputs);
+		$this->setMethods($inputs);
+
+		return $convertedDefs;
+	}
+
+	private function mergeAllowedParams($loads)
+	{
+		$linkName = $this->getLinkName();
+		$entityName = $this->getEntityName();
+
+		if (!empty($this->allowedParams)) {
+			$linkParams = &$loads[$entityName]['relations'][$linkName];
+
+			foreach ($this->allowedParams as $name) {
+
+				$additionalParrams = $this->getAllowedAdditionalParams($name);
+
+				if (isset($additionalParrams) && !isset($linkParams[$name])) {
+					$linkParams[$name] = $additionalParrams;
+				}
+			}
+		}
+
+		return $loads;
+	}
+
+	private function getAllowedAdditionalParams($allowedItemName)
+	{
+		$linkParams = $this->getLinkParams();
+		$foreignLinkParams = $this->getForeignLinkParams();
+
+		$itemLinkParams = isset($linkParams[$allowedItemName]) ? $linkParams[$allowedItemName] : null;
+		$itemForeignLinkParams = isset($foreignLinkParams[$allowedItemName]) ? $foreignLinkParams[$allowedItemName] : null;
+
+		$additionalParrams = null;
+
+		if (isset($itemLinkParams) && isset($itemForeignLinkParams)) {
+			$additionalParrams = Util::merge($itemLinkParams, $itemForeignLinkParams);
+		} else if (isset($itemLinkParams)) {
+			$additionalParrams = $itemLinkParams;
+		} else if (isset($itemForeignLinkParams)) {
+			$additionalParrams = $itemForeignLinkParams;
+		}
+
+		return $additionalParrams;
+	}
+
+}

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

@@ -18,33 +18,34 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils\Database\Orm\Relations;
 
-class BelongsTo extends \Espo\Core\Utils\Database\Orm\Base
+class BelongsTo extends Base
 {
-
-	public function load($params, $foreignParams)
+	protected function load($linkName, $entityName)
 	{
+		$foreignEntityName = $this->getForeignEntityName();
+
 		return array (
-			$params['entityName'] => array (
+			$entityName => array (
 				'fields' => array(
-					$params['link']['name'].'Name' => array(
+					$linkName.'Name' => array(
 						'type' => 'foreign',
-						'relation' => $params['link']['name'],
-						'foreign' => $this->getForeignField('name', $foreignParams['entityName']),
+						'relation' => $linkName,
+						'foreign' => $this->getForeignField('name', $foreignEntityName),
 					),
-					$params['link']['name'].'Id' => array(
+					$linkName.'Id' => array(
 						'type' => 'foreignId',
 						'index' => true,
 					),
 				),
 				'relations' => array(
-                	$params['link']['name'] => array(
+                	$linkName => array(
 						'type' => 'belongsTo',
-						'entity' => $params['targetEntity'],
-						'key' => $params['link']['name'].'Id',
+						'entity' => $foreignEntityName,
+						'key' => $linkName.'Id',
 						'foreignKey' => 'id', //????
 					),
 				),
@@ -52,5 +53,4 @@ class BelongsTo extends \Espo\Core\Utils\Database\Orm\Base
 		);
 	}
 
-
 }

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

@@ -18,32 +18,31 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils\Database\Orm\Relations;
 
-class EmailEmailAddress extends \Espo\Core\Utils\Database\Orm\Relations\HasMany
+class EmailEmailAddress extends HasMany
 {
-
-	public function load($params, $foreignParams)
+	protected function load($linkName, $entityName)
 	{
+		$parentRelation = parent::load($linkName, $entityName);
 
-		$parentRelation = parent::load($params, $foreignParams);
+		$foreignEntityName = $this->getForeignEntityName();
 
 		$relation = array(
-			$params['entityName'] => array (				
+			$entityName => array (
 				'relations' => array(
-                	$params['link']['name'] => array(						
+                	$linkName => array(
 						'midKeys' => array(
-							lcfirst($params['entityName']).'Id',
-							lcfirst($foreignParams['entityName']).'Id',
+							lcfirst($entityName).'Id',
+							lcfirst($foreignEntityName).'Id',
 						),
 					),
 				),
 			),
 		);
 
-		
 		$relation = \Espo\Core\Utils\Util::merge($parentRelation, $relation);
 
 		return $relation;

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

@@ -18,28 +18,30 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils\Database\Orm\Relations;
 
-class EntityTeam extends \Espo\Core\Utils\Database\Orm\Base
+class EntityTeam extends Base
 {
-
-	public function load($params, $foreignParams)
+	protected function load($linkName, $entityName)
 	{
+		$linkParams = $this->getLinkParams();
+		$foreignEntityName = $this->getForeignEntityName();
+
 		return array(
-			$params['entityName'] => array(
+			$entityName => array(
 				'relations' => array(
-					$params['link']['name'] => array(
+					$linkName => array(
 						'type' => 'manyMany',
-						'entity' => $params['targetEntity'],
-						'relationName' => lcfirst($params['link']['params']['relationName']),
+						'entity' => $foreignEntityName,
+						'relationName' => lcfirst($linkParams['relationName']),
 						'midKeys' => array(
 							'entity_id',
 							'team_id',
 						),
 						'conditions' => array(
-							'entityType' => $params['entityName'],
+							'entityType' => $entityName,
 						),
 						'additionalColumns' => array(
 							'entityType' => array(

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

@@ -18,33 +18,35 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils\Database\Orm\Relations;
 
-class HasChildren extends \Espo\Core\Utils\Database\Orm\Base
+class HasChildren extends Base
 {
-
-	public function load($params, $foreignParams)
+	protected function load($linkName, $entityName)
 	{
+		$foreignLinkName = $this->getForeignLinkName();
+		$foreignEntityName = $this->getForeignEntityName();
+
 		return array(
-			$params['entityName'] => array (
+			$entityName => array (
 				'fields' => array(
-	               	$params['link']['name'].'Ids' => array(
+	               	$linkName.'Ids' => array(
 						'type' => 'varchar',
 						'notStorable' => true,
 					),
-					$params['link']['name'].'Names' => array(
+					$linkName.'Names' => array(
 						'type' => 'varchar',
 						'notStorable' => true,
 					),
 				),
 				'relations' => array(
-                	$params['link']['name'] => array(
+                	$linkName => array(
 						'type' => 'hasChildren',
-						'entity' => $params['targetEntity'],
-						'foreignKey' => $foreignParams['link']['name'].'Id', //???: 'foreignKey' => $params['link']['name'].'Id',
-						'foreignType' => $foreignParams['link']['name'].'Type', //???: 'foreignKey' => $params['link']['name'].'Id',
+						'entity' => $foreignEntityName,
+						'foreignKey' => $foreignLinkName.'Id',
+						'foreignType' => $foreignLinkName.'Type',
 					),
 				),
 			),

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

@@ -18,44 +18,41 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils\Database\Orm\Relations;
 
-class HasMany extends \Espo\Core\Utils\Database\Orm\Base
+class HasMany extends Base
 {
-	protected $allowParams = array(
-		'relationName',
-		'conditions',
-		'additionalColumns',
-	);
-
-	public function load($params, $foreignParams)
+	protected function load($linkName, $entityName)
 	{
-		$relationType = isset($params['link']['params']['relationName']) ? 'manyMany' : 'hasMany';
+		$linkParams = $this->getLinkParams();
+		$foreignLinkName = $this->getForeignLinkName();
+		$foreignEntityName = $this->getForeignEntityName();
+
+		$relationType = isset($linkParams['relationName']) ? 'manyMany' : 'hasMany';
 
 		$relation = array(
-			$params['entityName'] => array (
+			$entityName => array (
 				'fields' => array(
-	               	$params['link']['name'].'Ids' => array(
+	               	$linkName.'Ids' => array(
 						'type' => 'varchar',
 						'notStorable' => true,
 					),
-					$params['link']['name'].'Names' => array(
+					$linkName.'Names' => array(
 						'type' => 'varchar',
 						'notStorable' => true,
 					),
 				),
 				'relations' => array(
-                	$params['link']['name'] => array(
-						//'type' => 'hasMany',
+                	$linkName => array(
 						'type' => $relationType,
-						'entity' => $params['targetEntity'],
-						'foreignKey' => lcfirst($foreignParams['link']['name'].'Id'), //???: 'foreignKey' => $params['link']['name'].'Id',						
+						'entity' => $foreignEntityName,
+						'foreignKey' => lcfirst($foreignLinkName.'Id'),
 					),
 				),
 			),
-		);	
+		);
 
         return $relation;
 	}

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

@@ -18,45 +18,40 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils\Database\Orm\Relations;
 
 use Espo\Core\Utils\Util;
 
-class ManyMany extends \Espo\Core\Utils\Database\Orm\Base
+class ManyMany extends Base
 {
-
-	protected $allowParams = array(
-		'relationName',
-		'conditions',
-		'additionalColumns',
-	);
-
-	public function load($params, $foreignParams)
+	protected function load($linkName, $entityName)
 	{
+		$foreignEntityName = $this->getForeignEntityName();
+
 		return array(
-			$params['entityName'] => array(
+			$entityName => array(
 				'fields' => array(
-	               	$params['link']['name'].'Ids' => array(
+	               	$linkName.'Ids' => array(
 						'type' => 'varchar',
 						'notStorable' => true,
 					),
-					$params['link']['name'].'Names' => array(
+					$linkName.'Names' => array(
 						'type' => 'varchar',
 						'notStorable' => true,
 					),
 				),
 				'relations' => array(
-					$params['link']['name'] => array(
+					$linkName => array(
 						'type' => 'manyMany',
-						'entity' => $params['targetEntity'],
-						'relationName' => $this->getJoinTable($params['entityName'], $foreignParams['entityName']),
+						'entity' => $foreignEntityName,
+						'relationName' => $this->getJoinTable($entityName, $foreignEntityName),
 						'key' => 'id', //todo specify 'key'
 						'foreignKey' => 'id', //todo specify 'foreignKey'
 						'midKeys' => array(
-							lcfirst($params['entityName']).'Id',
-							lcfirst($foreignParams['entityName']).'Id',
+							lcfirst($entityName).'Id',
+							lcfirst($foreignEntityName).'Id',
 						),
 					),
 				),

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

@@ -18,26 +18,29 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils\Database\Orm\Relations;
 
-class NoteAttachments extends \Espo\Core\Utils\Database\Orm\Relations\HasChildren
+class NoteAttachments extends HasChildren
 {
-	public function load($params, $foreignParams)
+	protected function load($linkName, $entityName)
 	{
-		$parentRelation = parent::load($params, $foreignParams);
+		$parentRelation = parent::load($linkName, $entityName);
+
 		$relation = array(
-			$params['entityName'] => array (				
+			$entityName => array (
 				'fields' => array(
-					$params['link']['name'].'Types' => array(
+					$linkName.'Types' => array(
 						'type' => 'varchar',
 						'notStorable' => true,
 					),
 				),
 			),
-		);		
+		);
+
 		$relation = \Espo\Core\Utils\Util::merge($parentRelation, $relation);
+
 		return $relation;
 	}
 }

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

@@ -275,7 +275,9 @@ class Converter
 		switch ($fieldParams['type']) {
 			case 'array':
 			case 'jsonArray':
-				$dbFieldParams['default'] = ''; //for db type TEXT can't be defined a default value
+			case 'text':
+			case 'longtext':
+				unset($dbFieldParams['default']); //for db type TEXT can't be defined a default value
 				break;
 
 			case 'bool':
@@ -360,4 +362,4 @@ class Converter
 	}
 
 
-}
+}

application/Espo/Core/Utils/Database/Schema/rebuildActions/Currency.php

@@ -18,24 +18,32 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils\Database\Schema\rebuildActions;
 
 class Currency extends \Espo\Core\Utils\Database\Schema\BaseRebuildActions
 {
-	
-	public function afterRebuild()
-	{	 
-		$currencyConfig = $this->getConfig()->get('currency');	
-		$currencyConfig['rate'][ $currencyConfig['base'] ] = '1.00';	
 
-		$pdo = $this->getEntityManager()->getPDO();	
+	public function afterRebuild()
+	{
+		$defaultCurrency = $this->getConfig()->get('defaultCurrency');
+
+		$baseCurrency = $this->getConfig()->get('baseCurrency');
+		$currencyRates = $this->getConfig()->get('currencyRates');
+
+		if ($defaultCurrency != $baseCurrency) {
+			$currencyRates = $this->exchangeRates($baseCurrency, $defaultCurrency, $currencyRates);
+		}
+
+		$currencyRates[$defaultCurrency] = '1.00';
+
+		$pdo = $this->getEntityManager()->getPDO();
 
 		$sql = "TRUNCATE `currency`";
 		$pdo->prepare($sql)->execute();
 
-		foreach ($currencyConfig['rate'] as $currencyName => $rate) {
+		foreach ($currencyRates as $currencyName => $rate) {
 
 			$sql = "
 				INSERT INTO `currency`
@@ -43,9 +51,34 @@ class Currency extends \Espo\Core\Utils\Database\Schema\BaseRebuildActions
 				VALUES
 				(".$pdo->quote($currencyName) . ", " . $pdo->quote($rate) . ")
 			";
-			$pdo->prepare($sql)->execute();			
-		}					
-	}	
-	
+			$pdo->prepare($sql)->execute();
+		}
+	}
+
+	/**
+	 * Calculate exchange rates if defaultCurrency doesn't equals baseCurrency
+	 *
+	 * @param  string $baseCurrency
+	 * @param  string $defaultCurrency
+	 * @param  array $currencyRates   [description]
+	 * @return array  - List of new currency rates
+	 */
+	protected function exchangeRates($baseCurrency, $defaultCurrency, array $currencyRates)
+	{
+		$precision = 5;
+		$defaultCurrencyRate = round(1 / $currencyRates[$defaultCurrency], $precision);
+
+		$exchangedRates = array();
+		$exchangedRates[$baseCurrency] = $defaultCurrencyRate;
+
+		unset($currencyRates[$baseCurrency], $currencyRates[$defaultCurrency]);
+
+		foreach ($currencyRates as $currencyName => $rate) {
+			$exchangedRates[$currencyName] = round($rate * $defaultCurrencyRate, $precision);
+		}
+
+		return $exchangedRates;
+	}
+
 }
 

application/Espo/Core/Utils/FieldManager.php

@@ -166,7 +166,7 @@ class FieldManager
 		}
 
 		foreach ($fieldDef as $defName => $defValue) {
-			if (!isset($defValue)) {
+			if (!isset($defValue) || (is_string($defValue) && $defValue == '') ) {
 				unset($fieldDef[$defName]);
 			}
 		}

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

@@ -176,7 +176,7 @@ class Manager
 		$fullPath = $this->concatPaths($path); //todo remove after changing the params
 
 		if ($this->checkCreateFile($fullPath) === false) {
-			throw new Error('Permission denied in '. $path);
+			throw new Error('Permission denied in '. $fullPath);
 		}
 
 		$res = (file_put_contents($fullPath, $data, $flags, $context) !== FALSE);
@@ -225,22 +225,33 @@ class Manager
 	 * @param string | array $path
 	 * @param string $content JSON string
 	 * @param bool $isJSON
-	 * @param array $mergeOptions
+	 * @param string | array $mergeOptions
+	 * @param string | array $removeOptions - List of unset keys from content
+	 * @param bool $isReturn - Is result to be returned or stored
 	 *
-	 * @return bool
+	 * @return bool | array
 	 */
-	public function mergeContents($path, $content, $isJSON = false, $mergeOptions = null)
+	public function mergeContents($path, $content, $isJSON = false, $mergeOptions = null, $removeOptions = null, $isReturn = false)
 	{
 		$fileContent = $this->getContents($path);
 
 		$savedDataArray = Utils\Json::getArrayData($fileContent);
 		$newDataArray = Utils\Json::getArrayData($content);
 
+		if (isset($removeOptions)) {
+			$savedDataArray = Utils\Util::unsetInArray($savedDataArray, $removeOptions);
+			$newDataArray = Utils\Util::unsetInArray($newDataArray, $removeOptions);
+		}
+
 		$data = Utils\Util::merge($savedDataArray, $newDataArray, $mergeOptions);
 		if ($isJSON) {
 			$data = Utils\Json::encode($data, JSON_PRETTY_PRINT);
 		}
 
+		if ($isReturn) {
+			return $data;
+		}
+
 		return $this->putContents($path, $data);
 	}
 
@@ -248,26 +259,14 @@ class Manager
 	 * Merge PHP content and save it to a file
 	 *
 	 * @param string | array $path
-	 * @param string $content
-	 * @param bool $onlyFirstLevel - Merge only first level. Ex. current: array('test'=>array('item1', 'item2')).  $content= array('test'=>array('item1'),). Result will be array('test'=>array('item1')).
-	 *
+	 * @param string $content JSON string
+	 * @param string | array $mergeOptions
+	 * @param string | array $removeOptions - List of unset keys from content
 	 * @return bool
 	 */
-	public function mergeContentsPHP($path, $content, $onlyFirstLevel = false, $mergeOptions = null)
+	public function mergeContentsPHP($path, $content, $mergeOptions = null, $removeOptions = null)
 	{
-		$fileContent = $this->getContents($path);
-
-		$savedDataArray = Utils\Json::getArrayData($fileContent);
-		$newDataArray = Utils\Json::getArrayData($content);
-
-		if ($onlyFirstLevel) {
-			foreach($newDataArray as $key => $val) {
-				$setVal = is_array($val) ? array() : '';
-				$savedDataArray[$key] = $setVal;
-			}
-		}
-
-		$data = Utils\Util::merge($savedDataArray, $newDataArray, $mergeOptions);
+		$data = $this->mergeContents($path, $content, false, $mergeOptions, $removeOptions, true);
 
 		return $this->putContentsPHP($path, $data);
 	}

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

@@ -480,11 +480,12 @@ class Permission
 				if (file_exists($item)) {
 
 					try {
-						$res = $this->chmod($item, $permission, true);
+						$this->chmod($item, $permission, true);
 					} catch (\Exception $e) {
-						$res = false;
 					}
 
+					$res = is_readable($item);
+
 					/** check is wtitable */
 					if ($type == 'writable') {
 

application/Espo/Core/Utils/Language.php

@@ -155,6 +155,15 @@ class Language
 		return $translated;
 	}
 
+	public function translateOption($value, $field, $scope)
+	{
+		$options = $this->get($scope. '.options.' . $field);
+		if (array_key_exists($value, $options)) {
+			return $options[$value];
+		}
+		return $value;
+	}
+
 
 	public function get($key = null, $returns = null)
 	{
@@ -232,7 +241,7 @@ class Language
 				$i18nCacheFile = str_replace('{*}', $i18nName, $this->cacheFile);
 
 				if ($i18nName != $this->defaultLanguage) {
-					$i18nData = Util::merge($this->fullData[$this->defaultLanguage], $i18nData);
+					$i18nData = Util::merge($this->fullData[$this->defaultLanguage], $i18nData, null, null, true);
 				}
 				$result &= $this->getFileManager()->putContentsPHP($i18nCacheFile, $i18nData);
 			}

application/Espo/Core/Utils/Metadata.php

@@ -142,13 +142,13 @@ class Metadata
 	* Get Metadata
 	*
 	* @param string $key
-	* @param mixed $return
+	* @param mixed $default
 	*
 	* @return array
 	*/
-	public function get($key = null, $returns = null)
+	public function get($key = null, $default = null)
 	{
-		return Util::getValueByKey($this->getData(), $key, $returns);
+		return Util::getValueByKey($this->getData(), $key, $default);
 	}
 
 
@@ -430,4 +430,4 @@ class Metadata
 		return false;
 	}
 
-}
+}

application/Espo/Core/Utils/Util.php

@@ -125,10 +125,13 @@ class Util
 	 *                     	),
 	 *                     )
 	 * @param $rewriteKeyName string  - Rewrite key name. It is ignored if $rewriteLevel is NULL.
+	 * @param $rewriteArrays bool  - Rewrite single arrays. Examples:
+	 *                             TRUE: array is [0, 1, 2], main array is [3, 4, 5], Result is [3, 4, 5].
+	 *                             FALSE: array is [0, 1, 2], main array is [3, 4, 5], Result is [0, 1, 2, 3, 4, 5].
 	 *
 	 * @return array
 	 */
-	public static function merge($array, $mainArray, $rewriteLevel = null, $rewriteKeyName = null)
+	public static function merge($array, $mainArray, $rewriteLevel = null, $rewriteKeyName = null, $rewriteArrays = false)
 	{
 		if (is_array($array) && !is_array($mainArray)) {
 			return $array;
@@ -169,7 +172,7 @@ class Util
 						} /** END: check the $rewriteKeyName */
 
 						if (!isset($rowRewriteLevel) || $rowRewriteLevel != 1) {
-							$array[$mainKey] = static::merge((array) $value, (array) $mainValue, --$rowRewriteLevel, $rewriteKeyName);
+							$array[$mainKey] = static::merge((array) $value, (array) $mainValue, --$rowRewriteLevel, $rewriteKeyName, $rewriteArrays);
 							continue;
 						}
 
@@ -185,7 +188,11 @@ class Util
 						$array[$mainKey] = $mainValue;
 					}
 					elseif (!in_array($mainValue, $array)) {
-						$array[] = $mainValue;
+						if ($rewriteArrays) {
+							$array[$mainKey] = $mainValue;
+						} else {
+							$array[] = $mainValue;
+						}
 					} /** END: merge logic */
 
 					break;
@@ -359,11 +366,17 @@ class Util
 				if (!empty($unsetSett)){
 					$keyItems = explode('.', $unsetSett);
 					$currVal = isset($content[$rootKey]) ? "\$content['{$rootKey}']" : "\$content";
+
+					$lastKey = array_pop($keyItems);
 					foreach($keyItems as $keyItem){
 						$currVal .= "['{$keyItem}']";
 					}
 
-					$currVal = "if (isset({$currVal})) unset({$currVal});";
+					$unsetElem = $currVal . "['{$lastKey}']";
+					$currVal = "
+						if (isset({$unsetElem}) || array_key_exists({$lastKey}, {$currVal})) {
+							unset({$unsetElem});
+						} ";
 					eval($currVal);
 				}
 			}
@@ -395,10 +408,10 @@ class Util
 	 *
 	 * @param  array $array
 	 * @param  string $key     Ex. of key is "entityDefs", "entityDefs.User"
-	 * @param  mixed $returns
+	 * @param  mixed $default
 	 * @return mixed
 	 */
-	public static function getValueByKey(array $array, $key = null, $returns = null)
+	public static function getValueByKey(array $array, $key = null, $default = null)
 	{
 		if (!isset($key) || empty($key)) {
 			return $array;
@@ -411,7 +424,7 @@ class Util
 			if (isset($lastItem[$keyName]) && is_array($lastItem)) {
 				$lastItem = $lastItem[$keyName];
 			} else {
-				return $returns;
+				return $default;
 			}
 		}
 

application/Espo/Core/defaults/config.php

@@ -25,6 +25,7 @@ return array (
 	array (
 		'driver' => 'pdo_mysql',
 		'host' => 'localhost',
+		'port' => '',
 		'dbname' => '',
 		'user' => '',
 		'password' => '',
@@ -40,15 +41,13 @@ return array (
 	'weekStart' => 0,
 	'thousandSeparator' => ',',
 	'decimalMark' => '.',
+	'exportDelimiter' => ',',
 	'currencyList' =>
 	array (
 	),
 	'defaultCurrency' => 'USD',
-	'currency' =>
-	array(
-		'base' => 'USD',
-		'rate' => array(
-		),
+	'baseCurrency' => 'USD',
+	'currencyRates' => array(
 	),
 	'outboundEmailIsShared' => true,
 	'outboundEmailFromName' => 'EspoCRM',
@@ -62,6 +61,14 @@ return array (
 	'languageList' => array(
 		'en_US',
 		'de_DE',
+		'es_ES',
+		'fr_FR',
+		'nl_NL',
+		'tr_TR',
+		'ro_RO',
+		'pl_PL',
+		'pt_BR',
+		'vi_VN'
 	),
 	'language' => 'en_US',
 	'logger' =>
@@ -71,16 +78,21 @@ return array (
 		'isRotate' => true, /** rotate log files every day */
 		'maxRotateFiles' => 30, /** max number of rotate files */
 	),
+	'authenticationMethod' => 'Espo',
 	'globalSearchEntityList' =>
 	array (
 		0 => 'Account',
 		1 => 'Contact',
 		2 => 'Lead',
-		3 => 'Prospect',
-		4 => 'Opportunity',
+		3 => 'Opportunity',
 	),
-	"tabList" => array("Account", "Contact", "Lead", "Opportunity", "Calendar", "Meeting", "Call", "Task", "Case", "Prospect", "Email"),
-	"quickCreateList" => array("Account", "Contact", "Lead", "Opportunity", "Meeting", "Call", "Task", "Case", "Prospect"),
+	"tabList" => array("Account", "Contact", "Lead", "Opportunity", "Calendar", "Meeting", "Call", "Task", "Case", "Email"),
+	"quickCreateList" => array("Account", "Contact", "Lead", "Opportunity", "Meeting", "Call", "Task", "Case"),
+	'calendarDefaultEntity' => 'Meeting',
+	'disableExport' => false,
+	'assignmentEmailNotifications' => false,
+	'assignmentEmailNotificationsEntityList' => array('Lead', 'Opportunity', 'Task', 'Case'),
+	'emailMessageMaxSize' => 10,
 	'isInstalled' => false,
 );
 

application/Espo/Core/defaults/layout/listDashlet.json

@@ -1 +1 @@
-[{"name":"name"},{"name":"email","type":"base","sortable":false,"params":{}},{"name":"city"}]
+[{"name":"name"}]

application/Espo/Core/defaults/systemConfig.php

@@ -96,6 +96,23 @@ return array (
 		'smtpUsername',
 		'smtpPassword',
 		'cron',
+		'authenticationMethod',
+		'ldapHost',
+		'ldapPort',
+		'ldapSecurity',
+		'ldapAuth',
+		'ldapUsername',
+		'ldapPassword',
+		'ldapBindRequiresDn',
+		'ldapBaseDn',
+		'ldapUserLoginFilter',
+		'ldapAccountCanonicalForm',
+		'ldapAccountDomainName',
+		'ldapAccountDomainNameShort',
+		'ldapAccountFilterFormat',
+		'ldapTryUsernameSplit',
+		'ldapOptReferrals',
+		'ldapCreateEspoUser',
 	),
 	'isInstalled' => false,
 );

application/Espo/Entities/Email.php

@@ -46,6 +46,21 @@ class Email extends \Espo\Core\ORM\Entity
 		}
 	}
 	
+	public function getBodyPlainForSending()
+	{
+		$bodyPlain = $this->get('bodyPlain');		
+		if (!empty($bodyPlain)) {
+			return $bodyPlain;
+		}
+
+		$body = $this->get('body');
+		
+		$breaks = array("<br />","<br>","<br/>","<br />","&lt;br /&gt;","&lt;br/&gt;","&lt;br&gt;");
+		$body = str_ireplace($breaks, "\r\n", $body);
+		$body = strip_tags($body);
+		return $body;
+	}
+	
 	public function getBodyForSending()
 	{
 		$body = $this->get('body');
@@ -55,6 +70,7 @@ class Email extends \Espo\Core\ORM\Entity
 				$body = str_replace("?entryPoint=attachment&amp;id={$attachment->id}", "cid:{$attachment->id}", $body);
 			}
 		}
+		
 		$body = str_replace("<table class=\"table table-bordered\">", "<table class=\"table table-bordered\" width=\"100%\">", $body);
 		
 		return $body;

application/Espo/Entities/EmailAccount.php

@@ -0,0 +1,30 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Entities;
+
+class EmailAccount extends \Espo\Core\ORM\Entity
+{
+
+
+}
+

application/Espo/Entities/ExternalAccount.php

@@ -0,0 +1,28 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Entities;
+
+class ExternalAccount extends Integration
+{	
+}
+

application/Espo/Entities/Integration.php

@@ -0,0 +1,152 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Entities;
+
+class Integration extends \Espo\Core\ORM\Entity
+{	
+	public function get($name)
+	{
+		if ($name == 'id') {
+			return $this->id;
+		}
+		
+		if ($this->hasField($name)) {
+			if (array_key_exists($name, $this->valuesContainer)) {
+				return $this->valuesContainer[$name];
+			}
+		} else {
+			if ($this->get('data')) { 
+				$data = json_decode($this->get('data'), true);
+			} else {
+				$data = array();
+			}
+			if (isset($data[$name])) {
+				return $data[$name];
+			}
+		}
+		return null;
+	}
+	
+	public function set($p1, $p2)
+	{
+		if (is_array($p1)) {
+			if ($p2 === null) {
+				$p2 = false;
+			}
+			$this->populateFromArray($p1, $p2);
+			return;
+		}
+		
+		$name = $p1;
+		$value = $p2;
+		
+		if ($name == 'id') {
+			$this->id = $value;
+			return;
+		}
+				
+		if ($this->hasField($name)) {
+			$this->valuesContainer[$name] = $value;
+		} else {
+			$data = json_decode($this->get('data'), true);
+			if (empty($data)) {
+				$data = array();
+			}
+			$data[$name] = $value;
+			$this->set('data', json_encode($data));		
+		}
+	}
+	
+	public function populateFromArray(array $arr, $onlyAccessible = true, $reset = false)
+	{
+		if ($reset) {
+			$this->reset();
+		}
+	
+		foreach ($arr as $field => $value) {			
+			if (is_string($field)) {
+				if (is_array($value)) {
+					$value = json_encode($value);
+				}
+				
+				if ($this->hasField($field)) {
+					$fields = $this->getFields();
+					$fieldDefs = $fields[$field];
+					
+					if (!is_null($value)) {
+						switch ($fieldDefs['type']) {
+							case self::VARCHAR:						
+								break;
+							case self::BOOL:
+								$value = ($value === 'true' || $value === '1' || $value === true);
+								break;
+							case self::INT:
+								$value = intval($value);
+								break;
+							case self::FLOAT:
+								$value = floatval($value);
+								break;
+							case self::JSON_ARRAY:
+								$value = is_string($value) ? json_decode($value) : $value;
+								if (!is_array($value)) {
+									$value = null;
+								}
+								break;
+							default:
+								break;
+						}
+					}
+				}
+				
+
+				$this->set($field, $value);
+			}
+		}
+	}
+	
+	public function toArray()
+	{		
+		$arr = array();
+		if (isset($this->id)) {
+			$arr['id'] = $this->id;
+		}
+		foreach ($this->fields as $field => $defs) {		
+			if ($field == 'id') {
+				continue;
+			}
+			if ($this->has($field)) {
+				$arr[$field] = $this->get($field);
+			}
+		}
+		
+		$data = json_decode($this->get('data'), true);
+		if (empty($data)) {
+			$data = array();
+		}
+
+		$arr = array_merge($arr, $data);		
+		return $arr;
+	}
+	
+}
+

application/Espo/Entities/PhoneNumber.php

@@ -0,0 +1,37 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Entities;
+
+use Espo\Core\Exceptions\Error;
+
+class PhoneNumber extends \Espo\Core\ORM\Entity
+{
+	protected function setName($value)
+	{
+		if (empty($value)) {
+			throw new Error("Phone number can't be empty");
+		}
+		$this->valuesContainer['name'] = $value;	
+	}
+}
+

application/Espo/EntryPoints/Download.php

@@ -30,6 +30,10 @@ class Download extends \Espo\Core\EntryPoints\Base
 {
 	public static $authRequired = true;
 	
+	protected $fileTypesToShowInline = array(
+		'application/pdf',
+	);
+	
 	public function run()
 	{	
 		$id = $_GET['id'];
@@ -54,13 +58,21 @@ class Download extends \Espo\Core\EntryPoints\Base
 		
 		if (!file_exists($fileName)) {
 			throw new NotFound();
-		}		
+		}
+		
+		$type = $attachment->get('type');
+		
+		$disposition = 'attachment';
+		if (in_array($type, $this->fileTypesToShowInline)) {
+			$disposition = 'inline';
+		}
+			
 		
 		header('Content-Description: File Transfer');
-		if ($attachment->get('type')) {
-			header('Content-Type: ' . $attachment->get('type'));
+		if ($type) {
+			header('Content-Type: ' . $type);
 		}
-		header('Content-Disposition: attachment; filename=' . $attachment->get('name'));
+		header('Content-Disposition: ' . $disposition . '; filename=' . $attachment->get('name'));
 		header('Expires: 0');
 		header('Cache-Control: must-revalidate');
 		header('Pragma: public');

application/Espo/EntryPoints/Image.php

@@ -37,7 +37,7 @@ class Image extends \Espo\Core\EntryPoints\Base
 		'image/gif',
 	);
 	
-	protected $imageSizes = array(
+	protected $imageSizes = array(		
 		'x-small' => array(64, 64),	
 		'small' => array(128, 128),	
 		'medium' => array(256, 256),
@@ -46,15 +46,24 @@ class Image extends \Espo\Core\EntryPoints\Base
 		'xx-large' => array(1024, 1024),
 	);
 	
+	
 	public function run()
 	{	
 		$id = $_GET['id'];
 		if (empty($id)) {
 			throw new BadRequest();
-		}
-		
-		$size = $_GET['size'];
+		}	
+			
+		$size = null;		
+		if (!empty($_GET['size'])) {
+			$size = $_GET['size'];
+		} 
 		
+		$this->show($id, $size);
+	}
+	
+	protected function show($id, $size)
+	{
 		$attachment = $this->getEntityManager()->getEntity('Attachment', $id);
 		
 		if (!$attachment) {
@@ -87,7 +96,18 @@ class Image extends \Espo\Core\EntryPoints\Base
 				if (!file_exists($thumbFilePath)) {
 					$targetImage = $this->getThumbImage($filePath, $fileType, $size);					
 					ob_start();	
-					imagejpeg($targetImage);
+					
+					switch ($fileType) {
+						case 'image/jpeg':
+							imagejpeg($targetImage);
+							break;
+						case 'image/png':
+							imagepng($targetImage);
+							break;
+						case 'image/gif':
+							imagegif($targetImage);
+							break;					
+					}
 					$contents = ob_get_contents();
 					ob_end_clean();
 					imagedestroy($targetImage);								
@@ -117,7 +137,7 @@ class Image extends \Espo\Core\EntryPoints\Base
 		ob_clean();
 		flush();
 		readfile($filePath);
-		exit;		
+		exit;
 	}
 	
 	protected function getThumbImage($filePath, $fileType, $size)
@@ -125,30 +145,48 @@ class Image extends \Espo\Core\EntryPoints\Base
 		list($originalWidth, $originalHeight) = getimagesize($filePath);
 		list($width, $height) = $this->imageSizes[$size];
 		
-		if ($originalWidth > $width && ($originalHeight <= $height || $originalWidth > $originalHeight)) {
-			$targetWidth = $width;
-			$targetHeight = $originalHeight * ($width / $originalWidth);
-		} else if ($originalHeight > $height && ($originalWidth <= $width || $originalHeight > $originalWidth)) {
-			$targetHeight = $height;
-			$targetWidth = $originalWidth * ($height / $originalHeight);
-		} else {
+	
+		if ($originalWidth <= $width && $originalHeight <= $height) {
 			$targetWidth = $originalWidth;
-			$targetHeight = $originalHeight;					
-		}
+			$targetHeight = $originalHeight;	
+		} else {
+			if ($originalWidth > $originalHeight) {
+				$targetWidth = $width;
+				$targetHeight = $originalHeight / ($originalWidth / $width);				
+				if ($targetHeight > $height) {
+					$targetHeight = $height;
+					$targetWidth = $originalWidth / ($originalHeight / $height);
+				}
+			} else {
+				$targetHeight = $height;
+				$targetWidth = $originalWidth / ($originalHeight / $height);
+				if ($targetWidth > $width) {
+					$targetWidth = $width;
+					$targetHeight = $originalHeight / ($originalWidth / $width);
+				}
+			}
+		}		
 				
 		$targetImage = imagecreatetruecolor($targetWidth, $targetHeight);				
 		switch ($fileType) {
 			case 'image/jpeg':
 				$sourceImage = imagecreatefromjpeg($filePath);
+				imagecopyresized($targetImage, $sourceImage, 0, 0, 0, 0, $targetWidth, $targetHeight, $originalWidth, $originalHeight);	
 				break;
 			case 'image/png':
 				$sourceImage = imagecreatefrompng($filePath);
+				imagealphablending($targetImage, false);
+				imagesavealpha($targetImage, true);
+				$transparent = imagecolorallocatealpha($targetImage, 255, 255, 255, 127);
+				imagefilledrectangle($targetImage, 0, 0, $targetWidth, $targetHeight, $transparent);
+				imagecopyresampled($targetImage, $sourceImage, 0, 0, 0, 0, $targetWidth, $targetHeight, $originalWidth, $originalHeight);
 				break;
 			case 'image/gif':
 				$sourceImage = imagecreatefromgif($filePath);
+				imagecopyresized($targetImage, $sourceImage, 0, 0, 0, 0, $targetWidth, $targetHeight, $originalWidth, $originalHeight);	
 				break;					
 		}
-		imagecopyresized($targetImage, $sourceImage, 0, 0, 0, 0, $targetWidth, $targetHeight, $originalWidth, $originalHeight);	
+		
 		
 		return $targetImage;
 	}

application/Espo/EntryPoints/LogoImage.php

@@ -0,0 +1,52 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\EntryPoints;
+
+use \Espo\Core\Exceptions\NotFound;
+use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\BadRequest;
+use \Espo\Core\Exceptions\Error;
+
+class LogoImage extends Image
+{
+	public static $authRequired = false;
+	
+	public function run()
+	{	
+		$this->imageSizes['small-logo'] = array(173, 38);
+		
+		$id = $this->getConfig()->get('companyLogoId');
+		
+		if (empty($id)) {
+			throw new NotFound();
+		}
+		
+		$size = null;		
+		if (!empty($_GET['size'])) {
+			$size = $_GET['size'];
+		} 
+				
+		$this->show($id, $size);		
+	}
+}
+

application/Espo/Hooks/Common/AssignmentEmailNotification.php

@@ -0,0 +1,58 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Hooks\Common;
+
+use Espo\ORM\Entity;
+
+class AssignmentEmailNotification extends \Espo\Core\Hooks\Base
+{	
+	
+	public function afterSave(Entity $entity)
+	{
+		if (
+			$this->getConfig()->get('assignmentEmailNotifications')
+			&& 
+			in_array($entity->getEntityName(), $this->getConfig()->get('assignmentEmailNotificationsEntityList', array()))
+		) {		
+		
+			$userId = $entity->get('assignedUserId');
+			if (!empty($userId) && $userId != $this->getUser()->id && $entity->isFieldChanged('assignedUserId')) {
+				$job = $this->getEntityManager()->getEntity('Job');
+				$job->set(array(
+					'serviceName' => 'EmailNotification',
+					'method' => 'notifyAboutAssignmentJob',
+					'data' => json_encode(array(
+						'userId' => $userId,
+						'assignerUserId' => $this->getUser()->id,
+						'entityId' => $entity->id,
+						'entityType' => $entity->getEntityName()
+					)),
+					'executeTime' => date('Y-m-d H:i:s'),
+				));
+				$this->getEntityManager()->saveEntity($job);
+			}			
+		}
+	}
+
+}
+

application/Espo/Hooks/Common/Stream.php

@@ -69,26 +69,29 @@ class Stream extends \Espo\Core\Hooks\Base
 	{
 		$linkDefs = $this->getMetadata()->get("entityDefs." . $entity->getEntityName() . ".links", array());
 			
+		$scopeNotifiedList = array();
 		foreach ($linkDefs as $link => $defs) {
 			if ($defs['type'] == 'belongsTo') {
 				$foreign = $defs['foreign'];
 				$scope = $defs['entity'];
 				$entityId = $entity->get($link . 'Id');
 				if (!empty($scope) && !empty($entityId)) {
-					if (!$this->isLinkObservableInStream($scope, $foreign)) {
+					if (in_array($scope, $scopeNotifiedList) || !$this->isLinkObservableInStream($scope, $foreign)) {
 						continue;
 					}
 					$this->getStreamService()->noteCreateRelated($entity, $scope, $entityId);
+					$scopeNotifiedList[] = $scope;
 				}
 			} else if ($defs['type'] == 'belongsToParent') {		
 				$foreign = $defs['foreign'];
 				$scope = $entity->get($link . 'Type');
 				$entityId = $entity->get($link . 'Id');
 				if (!empty($scope) && !empty($entityId)) {
-					if (!$this->isLinkObservableInStream($scope, $foreign)) {
+					if (in_array($scope, $scopeNotifiedList) || !$this->isLinkObservableInStream($scope, $foreign)) {
 						continue;
 					}
 					$this->getStreamService()->noteCreateRelated($entity, $scope, $entityId);
+					$scopeNotifiedList[] = $scope;
 					
 				}
 			} else if ($defs['type'] == 'hasMany') {		
@@ -96,11 +99,12 @@ class Stream extends \Espo\Core\Hooks\Base
 				$scope = $defs['entity'];
 				$entityIds = $entity->get($link . 'Ids');
 				if (!empty($scope) && is_array($entityIds) && !empty($entityIds)) {
-					if (!$this->isLinkObservableInStream($scope, $foreign)) {
+					if (in_array($scope, $scopeNotifiedList) || !$this->isLinkObservableInStream($scope, $foreign)) {
 						continue;
 					}
 					$entityId = $entityIds[0];
-					$this->getStreamService()->noteCreateRelated($entity, $scope, $entityId);					
+					$this->getStreamService()->noteCreateRelated($entity, $scope, $entityId);
+					$scopeNotifiedList[] = $scope;					
 				}
 			}
 		}

application/Espo/Hooks/Note/Notifications.php

@@ -53,11 +53,25 @@ class Notifications extends \Espo\Core\Hooks\Base
 					WHERE entity_id = " . $pdo->quote($parentId) . " AND entity_type = " . $pdo->quote($parentType);
 				$sth = $pdo->prepare($sql);
 				$sth->execute();
+				$userIdList = array();
 				while ($row = $sth->fetch(\PDO::FETCH_ASSOC)) {
 					if ($this->getUser()->id != $row['userId']) {
-						$this->getNotificationService()->notifyAboutNote($row['userId'], $entity->id);
+						$userIdList[] = $row['userId'];
 					}
 				}
+				if (!empty($userIdList)) {
+					$job = $this->getEntityManager()->getEntity('Job');
+					$job->set(array(
+						'serviceName' => 'Notification',
+						'method' => 'notifyAboutNoteFromJob',
+						'data' => json_encode(array(
+							'userIdList' => $userIdList,
+							'noteId' => $entity->id
+						)),
+						'executeTime' => date('Y-m-d H:i:s'),
+					));
+					$this->getEntityManager()->saveEntity($job);
+				}
 			}
 		}
 	}

application/Espo/Modules/Crm/Controllers/Opportunity.php

@@ -28,32 +28,8 @@ class Opportunity extends \Espo\Core\Controllers\Record
 	{
 		$dateFrom = $request->get('dateFrom');
 		$dateTo = $request->get('dateTo');
-		
-		$pdo = $this->getEntityManager()->getPDO();
-		
-		$sql = "
-			SELECT opportunity.lead_source AS `leadSource`, SUM(opportunity.amount * currency.rate * opportunity.probability / 100) as `amount`
-			FROM opportunity
-			JOIN currency ON currency.id = opportunity.amount_currency
-			WHERE 
-				opportunity.deleted = 0 AND
-				opportunity.close_date >= ".$pdo->quote($dateFrom)." AND
-				opportunity.close_date < ".$pdo->quote($dateTo)." AND
-				opportunity.stage <> 'Closed Lost' AND
-				opportunity.lead_source <> ''
-			GROUP BY opportunity.lead_source				
-		";
-		
-		$sth = $pdo->prepare($sql);
-		$sth->execute();
-		
-		$rows = $sth->fetchAll(\PDO::FETCH_ASSOC);
-		
-		$result = array();
-		foreach ($rows as $row) {
-			$result[$row['leadSource']] = floatval($row['amount']);
-		}		
-		return $result;
+				
+		return $this->getService('Opportunity')->reportByLeadSource($dateFrom, $dateTo);
 	}
 	
 	public function actionReportByStage($params, $data, $request)
@@ -61,32 +37,7 @@ class Opportunity extends \Espo\Core\Controllers\Record
 		$dateFrom = $request->get('dateFrom');
 		$dateTo = $request->get('dateTo');
 		
-		$pdo = $this->getEntityManager()->getPDO();
-		
-		$sql = "
-			SELECT opportunity.stage AS `stage`, SUM(opportunity.amount * currency.rate) as `amount`
-			FROM opportunity
-			JOIN currency ON currency.id = opportunity.amount_currency
-			WHERE 
-				opportunity.deleted = 0 AND
-				opportunity.close_date >= ".$pdo->quote($dateFrom)." AND
-				opportunity.close_date < ".$pdo->quote($dateTo)." AND
-				opportunity.stage <> 'Closed Lost'
-			GROUP BY opportunity.lead_source
-			ORDER BY `amount` DESC			
-		";
-		
-		$sth = $pdo->prepare($sql);
-		$sth->execute();
-		
-		$rows = $sth->fetchAll(\PDO::FETCH_ASSOC);
-		
-		$result = array();
-		foreach ($rows as $row) {
-			$result[$row['stage']] = floatval($row['amount']);
-		}	
-				
-		return $result;
+		return $this->getService('Opportunity')->reportByStage($dateFrom, $dateTo);
 	}
 	
 	public function actionReportSalesByMonth($params, $data, $request)
@@ -94,34 +45,7 @@ class Opportunity extends \Espo\Core\Controllers\Record
 		$dateFrom = $request->get('dateFrom');
 		$dateTo = $request->get('dateTo');
 				
-		$pdo = $this->getEntityManager()->getPDO();
-		
-		$sql = "
-			SELECT DATE_FORMAT(opportunity.close_date, '%Y-%m') AS `month`, SUM(opportunity.amount * currency.rate) as `amount`
-			FROM opportunity
-			JOIN currency ON currency.id = opportunity.amount_currency
-			WHERE 
-				opportunity.deleted = 0 AND
-				opportunity.close_date >= ".$pdo->quote($dateFrom)." AND
-				opportunity.close_date < ".$pdo->quote($dateTo)." AND
-				opportunity.stage = 'Closed Won'
-			
-			GROUP BY DATE_FORMAT(opportunity.close_date, '%Y-%m')
-			ORDER BY opportunity.close_date						
-		";
-		
-		$sth = $pdo->prepare($sql);
-		$sth->execute();
-		
-		$rows = $sth->fetchAll(\PDO::FETCH_ASSOC);
-		
-		$result = array();
-		foreach ($rows as $row) {
-			$result[$row['month']] = floatval($row['amount']);
-		}	
-				
-		return $result;
-		
+		return $this->getService('Opportunity')->reportSalesByMonth($dateFrom, $dateTo);		
 	}
 	
 	public function actionReportSalesPipeline($params, $data, $request)

application/Espo/Modules/Crm/Controllers/Target.php

@@ -25,7 +25,7 @@ namespace Espo\Modules\Crm\Controllers;
 use \Espo\Core\Exceptions\Error;
 use \Espo\Core\Exceptions\BadRequest;
 	
-class Prospect extends \Espo\Core\Controllers\Record
+class Target extends \Espo\Core\Controllers\Record
 {
 	
 	public function actionConvert($params, $data)

application/Espo/Modules/Crm/Entities/Target.php

@@ -22,7 +22,7 @@
 
 namespace Espo\Modules\Crm\Entities;
 
-class Prospect extends \Espo\Core\Entities\Person
+class Target extends \Espo\Core\Entities\Person
 {
 	
 }

application/Espo/Modules/Crm/Jobs/CheckInboundEmails.php

@@ -28,12 +28,23 @@ class CheckInboundEmails extends \Espo\Core\Jobs\Base
 {
 	public function run()
 	{	
-		$service = $this->getServiceFactory()->create('InboundEmail');
-		
-		$collection = $this->getEntityManager()->getRepository('InboundEmail')->find();
+		$service = $this->getServiceFactory()->create('InboundEmail');		
+		$collection = $this->getEntityManager()->getRepository('InboundEmail')->where(array('status' => 'Active'))->find();
 		foreach ($collection as $entity) {
-			$service->fetchFromMailServer($entity->id);
+			try {
+				$service->fetchFromMailServer($entity);
+			} catch (\Exception $e) {}
 		}
+		
+		$service = $this->getServiceFactory()->create('EmailAccount');		
+		$collection = $this->getEntityManager()->getRepository('EmailAccount')->where(array('status' => 'Active'))->find();
+		foreach ($collection as $entity) {
+			try {
+				$service->fetchFromMailServer($entity);
+			} catch (\Exception $e) {}
+		}
+		
+		return true;
 	}	
 }
 

application/Espo/Modules/Crm/Repositories/Call.php

@@ -0,0 +1,50 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Modules\Crm\Repositories;
+
+use Espo\ORM\Entity;
+
+class Call extends \Espo\Core\ORM\Repositories\RDB
+{	
+	protected function beforeSave(Entity $entity)
+	{	
+		parent::beforeSave($entity);
+		
+		$parentId = $entity->get('parentId');
+		$parentType = $entity->get('parentType');
+		if (!empty($parentId) || !empty($parentType)) {
+			$parent = $this->getEntityManager()->getEntity($parentType, $parentId);
+			if (!empty($parent)) {
+				if ($parent->getEntityName() == 'Account') {
+					$accountId = $parent->id;
+				} else if ($parent->has('accountId')) {
+					$accountId = $parent->get('accountId');
+				}
+				if (!empty($accountId)) {
+					$entity->set('accountId', $accountId);
+				}
+			}
+		}		
+	}
+}
+

application/Espo/Modules/Crm/Repositories/Contact.php

@@ -0,0 +1,95 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Modules\Crm\Repositories;
+
+use Espo\ORM\Entity;
+
+class Contact extends \Espo\Core\ORM\Repositories\RDB
+{	
+	public function handleSelectParams(&$params)
+	{
+		parent::handleSelectParams($params);		
+		
+		if (empty($params['customJoin'])) {
+			$params['customJoin'] = '';	
+		}
+		
+		$params['customJoin'] .= " 
+			LEFT JOIN `account_contact` AS accountContact 
+			ON accountContact.contact_id = contact.id AND accountContact.account_id = contact.account_id AND accountContact.deleted = 0
+		";
+	}
+	
+	public function save(Entity $entity)
+	{
+		$result = parent::save($entity);
+		
+		$accountIdChanged = $entity->has('accountId') && $entity->get('accountId') != $entity->getFetched('accountId');
+		$titleChanged = $entity->has('title') && $entity->get('title') != $entity->getFetched('title');
+			
+		if ($accountIdChanged) {
+			$accountId = $entity->get('accountId');
+			if (empty($accountId)) {
+				$this->unrelate($entity, 'accounts', $entity->getFetched('accountId'));
+				return $result;
+			}			
+		}
+			
+		if ($titleChanged) {
+			if (empty($accountId)) {
+				$accountId = $entity->getFetched('accountId');
+				if (empty($accountId)) {
+					return $result;
+				}
+			}
+		}		
+			
+				
+		if ($accountIdChanged || $titleChanged) {				
+			$pdo = $this->getEntityManager()->getPDO();
+			
+			$sql = "
+				SELECT id, role FROM account_contact
+				WHERE 
+					account_id = ".$pdo->quote($accountId)." AND
+					contact_id = ".$pdo->quote($entity->id)." AND
+					deleted = 0					
+			";
+			$sth = $pdo->prepare($sql);
+			if ($row = $sth->fetch()) {
+				if ($titleChanged && $entity->get('title') != $row['role']) {
+					$this->updateRelation($entity, 'accounts', $accountId, array(
+						'role' => $entity->get('title')
+					));
+				}
+			} else {
+				$this->relate($entity, 'accounts', $accountId, array(
+					'role' => $entity->get('title')
+				));
+			}
+		}	
+		
+		return $result;
+	}
+}
+

application/Espo/Modules/Crm/Repositories/Lead.php

@@ -0,0 +1,43 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Modules\Crm\Repositories;
+
+use Espo\ORM\Entity;
+
+class Lead extends \Espo\Core\ORM\Repositories\RDB
+{	
+	public function handleSelectParams(&$params)
+	{
+		parent::handleSelectParams($params);		
+		
+		if (empty($params['customJoin'])) {
+			$params['customJoin'] = '';	
+		}
+		
+		$params['customJoin'] .= " 
+			LEFT JOIN currency ON currency.id = lead.opportunity_amount_currency
+		";
+	}	
+
+}
+

application/Espo/Modules/Crm/Repositories/Meeting.php

@@ -0,0 +1,50 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Modules\Crm\Repositories;
+
+use Espo\ORM\Entity;
+
+class Meeting extends \Espo\Core\ORM\Repositories\RDB
+{	
+	protected function beforeSave(Entity $entity)
+	{	
+		parent::beforeSave($entity);
+		
+		$parentId = $entity->get('parentId');
+		$parentType = $entity->get('parentType');
+		if (!empty($parentId) || !empty($parentType)) {
+			$parent = $this->getEntityManager()->getEntity($parentType, $parentId);
+			if (!empty($parent)) {
+				if ($parent->getEntityName() == 'Account') {
+					$accountId = $parent->id;
+				} else if ($parent->has('accountId')) {
+					$accountId = $parent->get('accountId');
+				}
+				if (!empty($accountId)) {
+					$entity->set('accountId', $accountId);
+				}
+			}
+		}		
+	}
+}
+

application/Espo/Modules/Crm/Repositories/Opportunity.php

@@ -0,0 +1,43 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Modules\Crm\Repositories;
+
+use Espo\ORM\Entity;
+
+class Opportunity extends \Espo\Core\ORM\Repositories\RDB
+{	
+	public function handleSelectParams(&$params)
+	{
+		parent::handleSelectParams($params);		
+		
+		if (empty($params['customJoin'])) {
+			$params['customJoin'] = '';	
+		}
+		
+		$params['customJoin'] .= " 
+			LEFT JOIN currency ON currency.id = opportunity.amount_currency
+		";
+	}	
+
+}
+

application/Espo/Modules/Crm/Resources/i18n/de_DE/Account.json

@@ -3,14 +3,14 @@
 		"name": "Name",
 		"emailAddress": "E-Mail",
 		"website": "Webseite",
-		"phone": "Telefon",
-		"fax": "Fax",
+		"phoneNumber": "Telefon",
 		"billingAddress": "Rechnungsadresse",
 		"shippingAddress": "Lieferadresse",
 		"description": "Beschreibung",
 		"sicCode": "WKN Nummer",
 		"industry": "Branche",
-		"type": "Typ"		
+		"type": "Typ",
+		"contactRole": "Rolle"
 	},
 	"links": {
 		"contacts": "Kontakte",

application/Espo/Modules/Crm/Resources/i18n/de_DE/Call.json

@@ -30,5 +30,10 @@
 		"Set Held": "Auf Gehalten setzen",
 		"Set Not Held": "Auf nicht gehalten setzen",
 		"Send Invitations": "Einladungen versenden"		
+	},
+	"presetFilters": {
+		"planned": "Geplant",
+		"held": "Durchgeführt",
+		"todays": "Heutige"
 	}
 }

application/Espo/Modules/Crm/Resources/i18n/de_DE/Case.json

@@ -34,5 +34,9 @@
 	},
 	"labels": {
 		"Create Case": "Neuer Fall"
+	},
+	"presetFilters": {
+		"open": "Offen",
+		"closed": "Abgeschlossen"
 	}
 }

application/Espo/Modules/Crm/Resources/i18n/de_DE/Contact.json

@@ -4,13 +4,14 @@
 		"emailAddress": "E-Mail",
 		"title": "Funktion",
 		"account": "Firma",
-		"phone": "Telefon",
-		"phoneOffice": "Phone (Office)",
-		"fax": "Fax",
+		"accounts": "Firmen",
+		"phoneNumber": "Telefon",
 		"accountType": "Firmentyp",
 		"doNotCall": "Nicht anrufen",
 		"address": "Adresse",
-		"description": "Beschreibung"	
+		"opportunityRole": "Verkaufschance Rolle",
+		"accountRole": "Rolle",
+		"description": "Beschreibung"
 	},
 	"links": {
 		"opportunities": "Verkaufschancen",
@@ -18,5 +19,13 @@
 	},
 	"labels": {
 		"Create Contact": "Neuer Kontakt"
+	},
+	"options": {
+		"opportunityRole": {
+			"": "--Kein(e)--",
+			"Decision Maker": "Entscheider",
+			"Evaluator": "Vorentscheider",
+			"Influencer": "Einflussreiche Person"
+		}
 	}
 }