Merge branch 'master' into stable

Fix: use semi-colon instead of commas to seperate email addresses in to,...

.gitignore

@@ -2,16 +2,15 @@
 /data/cache/*
 /data/upload/*
 /data/preferences/*
+/data/.backup/*
 /data/config.php
 /custom
-/application/Espo/Resources/metadata/scopes/CustomTest.json
-/application/Espo/Modules/Crm/Resources/metadata/scopes/CustomTest.json
-/application/Espo/Resources/layouts/CustomTest/*
-/application/Espo/Modules/Crm/Resources/layouts/CustomTest/*
-/application/Espo/Resources/metadata/customTest/*
-/application/Espo/Modules/Crm/Resources/metadata/customTest/*
 /build
 /node_modules
 /client
 /test.php
 /main.html
+/frontend/client/css/bootstrap.css
+/tests/testData/cache/*
+composer.phar
+vendor/

.htaccess

@@ -1,10 +1,26 @@
+<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$
-
 <IfModule mod_rewrite.c>
-RewriteEngine On
-RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
+  RewriteEngine On
 
-RewriteRule reset/?$ reset.html [QSA,L]
+  # PROTECTED DIRECTORIES
+  RewriteCond %{REQUEST_FILENAME} -d
+  RewriteRule ^/?(data|api)/ - [F]
+
+  RewriteRule ^/?data/config\.php$ - [F]
+  RewriteRule ^/?data/logs/ - [F]
+  RewriteRule ^/?data/cache/ - [F]
+  RewriteRule ^/?data/upload/ - [F]
+  RewriteRule ^/?application/ - [F]
+  RewriteRule ^/?custom/ - [F]
+  RewriteRule ^/?vendor/ - [F]
+  #END PROTECTED DIRECTORIES
+
+  RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
+
+  RewriteRule reset/?$ reset.html [QSA,L]
 </IfModule>

Gruntfile.js

@@ -1,247 +1,245 @@
 module.exports = function (grunt) {
-	
-	grunt.initConfig({
-		pkg: grunt.file.readJSON('package.json'),
-		
-		mkdir: {
-			tmp: {
-				options: {
-					mode: 0775,
-					create: [
-						'build/tmp',
-					]
-				},
 
-			}
-		},
-		clean: {
-			start: ['build/*'],
-			final: ['build/tmp'],
-		},
-		less: {
-			bootstrap: {
-				options: {
-					yuicompress: true,
-				},
-				files: {
-					'frontend/client/css/bootstrap.css': 'frontend/less/espo/main.less',
-				},
-			},
-		},
-		cssmin: {
-			minify: {
-				files: {
-					'build/tmp/client/css/espo.min.css': [
-						'frontend/client/css/bootstrap.css',
-						'frontend/client/css/datepicker.css',
-						'frontend/client/css/jquery.timepicker.css',
-					]
-				}
-			},
-		},
-		uglify: {
-			options: {
-				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',
-			]
-		},
-		copy: {
-			frontendFolders: {
-				expand: true,
-				cwd: 'frontend/client',
-				src: [
-					'src/**',
-					'res/**',
-					'fonts/**',
-					'cfg/**',
-					'modules/**',
-					'img/**',
-					'css/**',
-				],
-				dest: 'build/tmp/client',
-			},
-			frontendHtml: {
-				src: 'frontend/html/reset.html',
-				dest: 'build/tmp/reset.html'
-			},
-			frontendLib: {
-				expand: true,
-				dot: true,
-				cwd: 'frontend/client/lib',
-				src: '**',
-				dest: 'build/tmp/client/lib/',
-			},			
-			backend: {
-				expand: true,
-				dot: true,
-				src: [
-					'api/**',
-					'application/**',
-					'custom/**',
-					'data/.data',
-					'install/**',
-					'vendor/**',
-					'bootstrap.php',
-					'cron.php',
-					'rebuild.php',
-					'index.php',
-					'LICENSE.txt',
-					'.htaccess',
-					'Web.config',
-				],
-				dest: 'build/tmp/',
-			},
-			final: {
-				expand: true,
-				dot: true,
-				src: '**',
-				cwd: 'build/tmp',
-				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: {
-					patterns: [
-						{
-							match: 'timestamp',
-							replacement: '<%= new Date().getTime() %>'
-						}
-					]
-				},
-				files: [
-					{
-						src: 'frontend/html/main.html',
-						dest: 'build/tmp/main.html'
-					}
-				]
-			},
-			version: {
-				options: {
-					patterns: [
-						{
-							match: 'version',
-							replacement: '<%= pkg.version %>'
-						}
-					]
-				},
-				files: [
-					{
-						src: 'build/tmp/application/Espo/Core/defaults/config.php',
-						dest: 'build/tmp/application/Espo/Core/defaults/config.php'
-					}
-				]
-			}
-		},
-		compress: {
-			final: {
-				options: {
-					archive: 'build/EspoCRM-<%= pkg.version %>.zip',
-					mode: 'zip'
-				},
-				src: ['**'],
-				cwd: 'build/EspoCRM-<%= pkg.version %>',
-				dest: 'EspoCRM-<%= pkg.version %>'
-			}
-		}
-	});
+    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'),
+        
+        mkdir: {
+            tmp: {
+                options: {
+                    mode: 0775,
+                    create: [
+                        'build/tmp',
+                    ]
+                },
 
-	grunt.loadNpmTasks('grunt-contrib-clean');
-	grunt.loadNpmTasks('grunt-mkdir');
-	grunt.loadNpmTasks('grunt-contrib-less');
-	grunt.loadNpmTasks('grunt-contrib-cssmin');
-	grunt.loadNpmTasks('grunt-contrib-uglify');
-	grunt.loadNpmTasks('grunt-contrib-copy');
-	grunt.loadNpmTasks('grunt-replace');
-	grunt.loadNpmTasks('grunt-contrib-compress');
-	grunt.loadNpmTasks('grunt-chmod');
+            }
+        },
+        clean: {
+            start: ['build/*'],
+            final: ['build/tmp'],
+        },
+        less: {
+            bootstrap: {
+                options: {
+                    yuicompress: true,
+                },
+                files: {
+                    'frontend/client/css/bootstrap.css': 'frontend/less/espo/main.less',
+                },
+            },
+        },
+        cssmin: {
+            minify: {
+                files: {
+                    'build/tmp/client/css/espo.min.css': [
+                        'frontend/client/css/bootstrap.css',
+                        'frontend/client/css/datepicker.css',
+                        'frontend/client/css/jquery.timepicker.css',
+                    ]
+                }
+            },
+        },
+        uglify: {
+            options: {
+                mangle: false,
+                banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
+            },
+            'build/tmp/client/espo.min.js': jsFilesToMinify.map(function (item) {
+                return 'frontend/' + item;
+            })
+        },
+        copy: {
+            frontendFolders: {
+                expand: true,
+                cwd: 'frontend/client',
+                src: [
+                    'src/**',
+                    'res/**',
+                    'fonts/**',
+                    'cfg/**',
+                    'modules/**',
+                    'img/**',
+                    'css/**',
+                ],
+                dest: 'build/tmp/client',
+            },
+            frontendHtml: {
+                src: 'frontend/html/reset.html',
+                dest: 'build/tmp/reset.html'
+            },
+            frontendLib: {
+                expand: true,
+                dot: true,
+                cwd: 'frontend/client/lib',
+                src: '**',
+                dest: 'build/tmp/client/lib/',
+            },            
+            backend: {
+                expand: true,
+                dot: true,
+                src: [
+                    'api/**',
+                    'application/**',
+                    'custom/**',
+                    'data/.data',
+                    'install/**',
+                    'vendor/**',
+                    'bootstrap.php',
+                    'cron.php',
+                    'rebuild.php',
+                    'index.php',
+                    'LICENSE.txt',
+                    '.htaccess',
+                    'web.config',
+                ],
+                dest: 'build/tmp/',
+            },
+            final: {
+                expand: true,
+                dot: true,
+                src: '**',
+                cwd: 'build/tmp',
+                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: {
+                    patterns: [
+                        {
+                            match: 'timestamp',
+                            replacement: '<%= new Date().getTime() %>'
+                        }
+                    ]
+                },
+                files: [
+                    {
+                        src: 'frontend/html/main.html',
+                        dest: 'build/tmp/main.html'
+                    }
+                ]
+            },
+            version: {
+                options: {
+                    patterns: [
+                        {
+                            match: 'version',
+                            replacement: '<%= pkg.version %>'
+                        }
+                    ]
+                },
+                files: [
+                    {
+                        src: 'build/tmp/application/Espo/Core/defaults/config.php',
+                        dest: 'build/tmp/application/Espo/Core/defaults/config.php'
+                    }
+                ]
+            }
+        },
+        compress: {
+            final: {
+                options: {
+                    archive: 'build/EspoCRM-<%= pkg.version %>.zip',
+                    mode: 'zip'
+                },
+                src: ['**'],
+                cwd: 'build/EspoCRM-<%= pkg.version %>',
+                dest: 'EspoCRM-<%= pkg.version %>'
+            }
+        }
+    });
 
-	grunt.registerTask('default', [
-		'clean:start',
-		'mkdir:tmp',
-		'less',
-		'cssmin',		
-		'uglify',
-		'copy:frontendFolders',
-		'copy:frontendHtml',
-		'copy:frontendLib',
-		'copy:backend',
-		'replace',
-		'copy:final',
-		'chmod',
-		'clean:final',
-	]);		
+    grunt.loadNpmTasks('grunt-contrib-clean');
+    grunt.loadNpmTasks('grunt-mkdir');
+    grunt.loadNpmTasks('grunt-contrib-less');
+    grunt.loadNpmTasks('grunt-contrib-cssmin');
+    grunt.loadNpmTasks('grunt-contrib-uglify');
+    grunt.loadNpmTasks('grunt-contrib-copy');
+    grunt.loadNpmTasks('grunt-replace');
+    grunt.loadNpmTasks('grunt-contrib-compress');
+    grunt.loadNpmTasks('grunt-chmod');
+
+    grunt.registerTask('default', [
+        'clean:start',
+        'mkdir:tmp',
+        'less',
+        'cssmin',        
+        'uglify',
+        'copy:frontendFolders',
+        'copy:frontendHtml',
+        'copy:frontendLib',
+        'copy:backend',
+        'replace',
+        'copy:final',
+        'chmod',
+        'clean:final',
+    ]);        
 
 };

README.md

@@ -0,0 +1,39 @@
+## EspoCRM
+
+<a href='http://www.espocrm.com'>EspoCRM is an Open Source CRM</a> (Customer Relationship Management) software that allows you to see, enter and evaluate all your company relationships regardless of the type. People, companies or opportunities - all in an easy and intuitive interface.
+
+It's a web application with a frontend designed as a single page application based on backbone.js and a RESTful backend written in PHP.
+
+Download the latest release from our [website](http://www.espocrm.com).
+
+### How to report bug
+
+Create an issue [here](https://github.com/espocrm/espocrm/issues) or post on our [forum](http://forum.espocrm.com/bug-reports?routestring=forum/bug-reports).
+
+### How to get started (for developers)
+
+1. Clone repository to your local computer.
+2. Change to the project's root directory.
+3. Install [composer](https://getcomposer.org/doc/00-intro.md).
+4. Run `composer install` if composer is installed globally or `php composer.phar install` if locally.
+
+Never update composer dependencies if you are going to contribute code back.
+
+Now you can build.
+
+If your repository is accessible via a web server then you can run EspoCRM by url `http://PROJECT_URL/frontend`. To compose a proper config.php and populate database you can run install by opening `http(s)://{YOUR_CRM_URL}/install` location in a browser. Also you need to run build before to have compiled css.
+
+### How to build
+
+You need to have nodejs installed.
+
+1. Change to the project's root directory.
+2. Install project dependencies with `npm install`.
+3. Run Grunt with `grunt`.
+
+The build will be created in the `build` directory.
+
+### License
+
+EspoCRM is published under the GNU GPLv3 [license](https://raw.githubusercontent.com/espocrm/espocrm/master/LICENSE.txt).
+

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>

application/.htaccess

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

application/Espo/Controllers/Admin.php

@@ -27,60 +27,60 @@ use \Espo\Core\Exceptions\Error,
 
 class Admin extends \Espo\Core\Controllers\Base
 {
-	protected function checkControllerAccess()
-	{
-		if (!$this->getUser()->isAdmin()) {
-			throw new Forbidden();
-		}
-	}
+    protected function checkControllerAccess()
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+    }
 
-	public function actionRebuild($params, $data)
-	{
-		$result = $this->getContainer()->get('dataManager')->rebuild();
+    public function actionRebuild($params, $data)
+    {
+        $result = $this->getContainer()->get('dataManager')->rebuild();
 
-		return $result;
-	}
+        return $result;
+    }
 
-	public function actionClearCache($params, $data)
-	{
-		$result = $this->getContainer()->get('dataManager')->clearCache();
+    public function actionClearCache($params, $data)
+    {
+        $result = $this->getContainer()->get('dataManager')->clearCache();
 
-		return $result;
-	}
+        return $result;
+    }
 
-	public function actionJobs()
-	{
-		$scheduledJob = $this->getContainer()->get('scheduledJob');
+    public function actionJobs()
+    {
+        $scheduledJob = $this->getContainer()->get('scheduledJob');
 
-		return $scheduledJob->getAllNamesOnly();
-	}
+        return $scheduledJob->getAllNamesOnly();
+    }
 
-	public function actionUploadUpgradePackage($params, $data)
-	{
-		$upgradeManager = new \Espo\Core\UpgradeManager($this->getContainer());
+    public function actionUploadUpgradePackage($params, $data)
+    {
+        $upgradeManager = new \Espo\Core\UpgradeManager($this->getContainer());
 
-		$upgradeId = $upgradeManager->upload($data);
-		$manifest = $upgradeManager->getManifest();
+        $upgradeId = $upgradeManager->upload($data);
+        $manifest = $upgradeManager->getManifest();
 
-		return array(
-			'id' => $upgradeId,
-			'version' => $manifest['version'],
-		);
-	}
+        return array(
+            'id' => $upgradeId,
+            'version' => $manifest['version'],
+        );
+    }
 
-	public function actionRunUpgrade($params, $data)
-	{
-		$upgradeManager = new \Espo\Core\UpgradeManager($this->getContainer());
+    public function actionRunUpgrade($params, $data)
+    {
+        $upgradeManager = new \Espo\Core\UpgradeManager($this->getContainer());
 
-		$upgradeManager->run($data['id']);
+        $upgradeManager->install($data['id']);
 
-		return true;
-	}
+        return true;
+    }
 
-	public function actionCronMessage($params, $data)
-	{
-		return $this->getContainer()->get('scheduledJob')->getSetupMessage();
-	}
+    public function actionCronMessage($params, $data)
+    {
+        return $this->getContainer()->get('scheduledJob')->getSetupMessage();
+    }
 
 }
 

application/Espo/Controllers/App.php

@@ -26,25 +26,25 @@ use \Espo\Core\Exceptions\BadRequest;
 
 class App extends \Espo\Core\Controllers\Record
 {
-	public function actionUser()
-	{		
-		return array(
-			'user' => $this->getUser()->toArray(),
-			'acl' => $this->getAcl()->toArray(),
-			'preferences' => $this->getPreferences()->toArray(),
-			'token' => $this->getUser()->get('token')
-		);	
-	}
-	
-	public function actionDestroyAuthToken($params, $data)
-	{		
-		$token = $data['token'];		
-		if (empty($token)) {
-			throw new BadRequest();
-		}
+    public function actionUser()
+    {        
+        return array(
+            'user' => $this->getUser()->toArray(),
+            'acl' => $this->getAcl()->toArray(),
+            'preferences' => $this->getPreferences()->toArray(),
+            'token' => $this->getUser()->get('token')
+        );    
+    }
+    
+    public function actionDestroyAuthToken($params, $data)
+    {        
+        $token = $data['token'];        
+        if (empty($token)) {
+            throw new BadRequest();
+        }
 
-		$auth = new \Espo\Core\Utils\Auth($this->getContainer());
-		return $auth->destroyAuthToken($token);		
-	}
+        $auth = new \Espo\Core\Utils\Auth($this->getContainer());
+        return $auth->destroyAuthToken($token);        
+    }
 }
 

application/Espo/Controllers/Attachment.php

@@ -25,19 +25,19 @@ namespace Espo\Controllers;
 class Attachment extends \Espo\Core\Controllers\Record
 {
 
-	public function actionUpload($params, $data)
-	{		
-		list($prefix, $contents) = explode(',', $data);
-		$contents = base64_decode($contents);
-		
-		$attachment = $this->getEntityManager()->getEntity('Attachment');
-		$this->getEntityManager()->saveEntity($attachment);		
-		$this->getContainer()->get('fileManager')->putContents('data/upload/' . $attachment->id, $contents);
-		
-		return array(
-			'attachmentId' => $attachment->id
-		);	
-	}
+    public function actionUpload($params, $data)
+    {        
+        list($prefix, $contents) = explode(',', $data);
+        $contents = base64_decode($contents);
+        
+        $attachment = $this->getEntityManager()->getEntity('Attachment');
+        $this->getEntityManager()->saveEntity($attachment);        
+        $this->getContainer()->get('fileManager')->putContents('data/upload/' . $attachment->id, $contents);
+        
+        return array(
+            'attachmentId' => $attachment->id
+        );    
+    }
 
 }
 

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

@@ -22,7 +22,45 @@
 
 namespace Espo\Controllers;
 
+use \Espo\Core\Exceptions\BadRequest;
+use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\Error;
+
 class Email extends \Espo\Core\Controllers\Record
 {
-
+    public function actionGetCopiedAttachments($params, $data, $request)
+    {        
+        $id = $request->get('id');
+        
+        return $this->getRecordService()->getCopiedAttachments($id);
+    }
+    
+    public function actionSendTestEmail($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new BadRequest();
+        }
+        
+        if (empty($data['password'])) {
+            if ($data['type'] == 'preferences') {
+                if (!$this->getUser()->isAdmin() && $data['id'] != $this->getUser()->id) {
+                    throw new Forbidden();
+                }
+                $preferences = $this->getEntityManager()->getEntity('Preferences', $data['id']);
+                if (!$preferences) {
+                    throw new Error();
+                }
+                
+                $data['password'] = $this->getContainer()->get('crypt')->decrypt($preferences->get('smtpPassword'));
+            } else {
+                if (!$this->getUser()->isAdmin()) {
+                    throw new Forbidden();
+                }
+                $data['password'] = $this->getConfig()->get('smtpPassword');
+            }
+        }
+        
+        return $this->getRecordService()->sendTestEmail($data);
+    }
 }
+

application/Espo/Controllers/EmailAccount.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\Controllers;
+
+use \Espo\Core\Exceptions\Forbidden;
+
+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')
+        ));
+    }
+
+    protected function checkControllerAccess()
+    {
+        if (!$this->getAcl()->check('EmailAccountScope')) {
+            throw new Forbidden();
+        }
+    }
+}
+

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/EmailTemplate.php

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

application/Espo/Controllers/Extension.php

@@ -0,0 +1,131 @@
+<?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 Extension extends \Espo\Core\Controllers\Record
+{
+    protected function checkControllerAccess()
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+    }
+
+    public function actionUpload($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new Forbidden();
+        }
+
+        $manager = new \Espo\Core\ExtensionManager($this->getContainer());
+
+        $id = $manager->upload($data);
+        $manifest = $manager->getManifest();
+
+        return array(
+            'id' => $id,
+            'version' => $manifest['version'],
+            'name' => $manifest['name'],
+            'description' => $manifest['description'],
+        );
+    }
+
+    public function actionInstall($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new Forbidden();
+        }
+
+        $manager = new \Espo\Core\ExtensionManager($this->getContainer());
+
+        $manager->install($data['id']);
+
+        return true;
+    }
+
+    public function actionUninstall($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new Forbidden();
+        }
+
+        $manager = new \Espo\Core\ExtensionManager($this->getContainer());
+
+        $manager->uninstall($data['id']);
+
+        return true;
+    }
+
+    public function actionCreate()
+    {
+        throw new Forbidden();
+    }
+
+    public function actionUpdate()
+    {
+        throw new Forbidden();
+    }
+
+    public function actionPatch()
+    {
+        throw new Forbidden();
+    }
+
+    public function actionListLinked()
+    {
+        throw new Forbidden();
+    }
+
+    public function actionDelete($params, $data, $request)
+    {
+        $manager = new \Espo\Core\ExtensionManager($this->getContainer());
+
+        $manager->delete($params['id']);
+
+        return true;
+    }
+
+    public function actionMassUpdate()
+    {
+        throw new Forbidden();
+    }
+
+    public function actionMassDelete()
+    {
+        throw new Forbidden();
+    }
+
+    public function actionCreateLink()
+    {
+        throw new Forbidden();
+    }
+
+    public function actionRemoveLink()
+    {
+        throw new Forbidden();
+    }
+}
+

application/Espo/Controllers/ExternalAccount.php

@@ -0,0 +1,124 @@
+<?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 actionGetOAuth2Info($params, $data, $request)
+    {
+        $id = $request->get('id');
+        list($integration, $userId) = explode('__', $id);
+        
+
+        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',
+                'isConnected' => $this->getRecordService()->ping($integration, $userId)
+            );
+        }
+    }
+
+    public function actionRead($params, $data, $request)
+    {
+        list($integration, $userId) = explode('__', $params['id']);        
+
+        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()->id != $userId) {
+            throw new Forbidden();
+        }
+        
+        if (isset($data['enabled']) && !$data['enabled']) {
+            $data['data'] = null;
+        }        
+        
+        $entity = $this->getEntityManager()->getEntity('ExternalAccount', $params['id']);
+        $entity->set($data);
+        $this->getEntityManager()->saveEntity($entity);
+        
+        return $entity->toArray();        
+    }
+    
+    public function actionAuthorizationCode($params, $data, $request)
+    {
+        if (!$request->isPost()) {
+            throw new Error('Bad HTTP method type.');
+        }        
+        
+        $id = $data['id'];
+        $code = $data['code'];
+        
+        list($integration, $userId) = explode('__', $id);        
+
+        if ($this->getUser()->id != $userId) {
+            throw new Forbidden();
+        }
+        
+        $service = $this->getRecordService();        
+        return $service->authorizationCode($integration, $userId, $code);
+    }
+}
+

application/Espo/Controllers/FieldManager.php

@@ -23,66 +23,70 @@
 namespace Espo\Controllers;
 
 use \Espo\Core\Exceptions\Error,
-	\Espo\Core\Exceptions\Forbidden,
-	\Espo\Core\Exceptions\NotFound;
+    \Espo\Core\Exceptions\Forbidden,
+    \Espo\Core\Exceptions\NotFound;
 
 class FieldManager extends \Espo\Core\Controllers\Base
 {
-	protected function checkControllerAccess()
-	{
-		if (!$this->getUser()->isAdmin()) {
-			throw new Forbidden();
-		}
-	}
+    protected function checkControllerAccess()
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+    }
 
-	public function actionRead($params, $data)
-	{
-		$data = $this->getContainer()->get('fieldManager')->read($params['name'], $params['scope']);
+    public function actionRead($params, $data)
+    {
+        $data = $this->getContainer()->get('fieldManager')->read($params['name'], $params['scope']);
 
-		if (!isset($data)) {
-			throw new NotFound();
-		}
+        if (!isset($data)) {
+            throw new NotFound();
+        }
 
-		return $data;
-	}
+        return $data;
+    }
 
-	public function actionCreate($params, $data)
-	{
-		if (empty($data['name'])) {
-			throw new Error("Field 'name' cannnot be empty");
-		}
+    public function actionCreate($params, $data)
+    {
+        if (empty($data['name'])) {
+            throw new Error("Field 'name' cannnot be empty");
+        }
 
-		$fieldManager = $this->getContainer()->get('fieldManager');
-		$fieldManager->create($data['name'], $data, $params['scope']);
+        $fieldManager = $this->getContainer()->get('fieldManager');
+        $fieldManager->create($data['name'], $data, $params['scope']);
 
-		try {
-			$this->getContainer()->get('dataManager')->rebuild($params['scope']);
-		} catch (Error $e) {
-			$fieldManager->delete($data['name'], $params['scope']);
-			throw new Error($e->getMessage());
-		}
+        try {
+            $this->getContainer()->get('dataManager')->rebuild($params['scope']);
+        } catch (Error $e) {
+            $fieldManager->delete($data['name'], $params['scope']);
+            throw new Error($e->getMessage());
+        }
 
-		return $fieldManager->read($data['name'], $params['scope']);
-	}
+        return $fieldManager->read($data['name'], $params['scope']);
+    }
 
-	public function actionUpdate($params, $data)
-	{
-		$fieldManager = $this->getContainer()->get('fieldManager');
-		$fieldManager->update($params['name'], $data, $params['scope']);
+    public function actionUpdate($params, $data)
+    {
+        $fieldManager = $this->getContainer()->get('fieldManager');
+        $fieldManager->update($params['name'], $data, $params['scope']);
 
-		$this->getContainer()->get('dataManager')->rebuild($params['scope']);
+        if ($fieldManager->isChanged()) {
+            $this->getContainer()->get('dataManager')->rebuild($params['scope']);
+        } else {
+            $this->getContainer()->get('dataManager')->clearCache();
+        }
 
-		return $fieldManager->read($params['name'], $params['scope']);
-	}
+        return $fieldManager->read($params['name'], $params['scope']);
+    }
 
-	public function actionDelete($params, $data)
-	{
-		$res = $this->getContainer()->get('fieldManager')->delete($params['name'], $params['scope']);
+    public function actionDelete($params, $data)
+    {
+        $res = $this->getContainer()->get('fieldManager')->delete($params['name'], $params['scope']);
 
-		$this->getContainer()->get('dataManager')->rebuildMetadata();
+        $this->getContainer()->get('dataManager')->rebuildMetadata();
 
-		return $res;
-	}
+        return $res;
+    }
 
 }
 

application/Espo/Controllers/GlobalSearch.php

@@ -23,18 +23,18 @@
 namespace Espo\Controllers;
 
 use \Espo\Core\Exceptions\Error,
-	\Espo\Core\Exceptions\Forbidden;
+    \Espo\Core\Exceptions\Forbidden;
 
 class GlobalSearch extends \Espo\Core\Controllers\Base
 {
     public function actionSearch($params, $data, $request)
-	{
-		$query = $params['query'];
-		
-		$offset = $request->get('offset');
-		$maxSize = $request->get('maxSize');		
-		
-		return $this->getService('GlobalSearch')->find($query, $offset);
-	}
+    {
+        $query = $params['query'];
+        
+        $offset = $request->get('offset');
+        $maxSize = $request->get('maxSize');        
+        
+        return $this->getService('GlobalSearch')->find($query, $offset, $maxSize);
+    }
 }
 

application/Espo/Controllers/I18n.php

@@ -26,7 +26,7 @@ class I18n extends \Espo\Core\Controllers\Base
 {
 
     public function actionRead($params, $data)
-	{
-		return $this->getContainer()->get('language')->getAll();
-	}
+    {
+        return $this->getContainer()->get('language')->getAll();
+    }
 }

application/Espo/Controllers/Import.php

@@ -27,60 +27,61 @@ use \Espo\Core\Exceptions\Error;
 use \Espo\Core\Exceptions\Forbidden;
 
 class Import extends \Espo\Core\Controllers\Base
-{	
-	
-	protected function getFileManager()
-	{
-		return $this->getContainer()->get('fileManager');
-	}
-	
-	protected function getEntityManager()
-	{
-		return $this->getContainer()->get('entityManager');
-	}
-	
-	public function actionUploadFile($params, $data)
-	{	
-		$contents = $data;
-		
-		$attachment = $this->getEntityManager()->getEntity('Attachment');
-		$attachment->set('type', 'text/csv');		
-		$this->getEntityManager()->saveEntity($attachment);
-		
-		$this->getFileManager()->putContents('data/upload/' . $attachment->id, $contents);
-		
-		return array(
-			'attachmentId' => $attachment->id
-		);
-	}
-	
-	public function actionRevert($params, $data)
-	{			
-		return $this->getService('Import')->revert($data['entityType'], $data['idsToRemove']);
-	}
-	
-	public function actionCreate($params, $data)
-	{   
+{    
+    
+    protected function getFileManager()
+    {
+        return $this->getContainer()->get('fileManager');
+    }
+    
+    protected function getEntityManager()
+    {
+        return $this->getContainer()->get('entityManager');
+    }
+    
+    public function actionUploadFile($params, $data)
+    {    
+        $contents = $data;
+        
+        $attachment = $this->getEntityManager()->getEntity('Attachment');
+        $attachment->set('type', 'text/csv');
+        $attachment->set('role', 'Import File');        
+        $this->getEntityManager()->saveEntity($attachment);
+        
+        $this->getFileManager()->putContents('data/upload/' . $attachment->id, $contents);
+        
+        return array(
+            'attachmentId' => $attachment->id
+        );
+    }
+    
+    public function actionRevert($params, $data)
+    {            
+        return $this->getService('Import')->revert($data['entityType'], $data['idsToRemove']);
+    }
+    
+    public function actionCreate($params, $data)
+    {   
         $importParams = array(
-        	'headerRow' => $data['headerRow'],
-        	'fieldDelimiter' => $data['fieldDelimiter'],
-        	'textQualifier' => $data['textQualifier'],
-        	'dateFormat' => $data['dateFormat'],
-        	'timeFormat' => $data['timeFormat'],
-        	'personNameFormat' => $data['personNameFormat'],
-        	'decimalMark' => $data['decimalMark'],
-        	'currency' => $data['currency'],
-        	'defaultValues' => $data['defaultValues'],
-        	'action' => $data['action'],
+            'headerRow' => $data['headerRow'],
+            'fieldDelimiter' => $data['fieldDelimiter'],
+            'textQualifier' => $data['textQualifier'],
+            'dateFormat' => $data['dateFormat'],
+            'timeFormat' => $data['timeFormat'],
+            'personNameFormat' => $data['personNameFormat'],
+            'decimalMark' => $data['decimalMark'],
+            'currency' => $data['currency'],
+            'defaultValues' => $data['defaultValues'],
+            'action' => $data['action'],
         );
         
         $attachmentId = $data['attachmentId'];
         
         if (!$this->getAcl()->check($data['entityType'], 'edit')) {
-        	throw new Forbidden();
+            throw new Forbidden();
         }
         
-		return $this->getService('Import')->import($data['entityType'], $data['fields'], $attachmentId, $importParams);
-	}
+        return $this->getService('Import')->import($data['entityType'], $data['fields'], $attachmentId, $importParams);
+    }
 }
 

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,33 +25,38 @@ 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
 {
     public function actionRead($params, $data)
-	{
-		$data = $this->getContainer()->get('layout')->get($params['scope'], $params['name']);
-		if (empty($data)) {
-			throw new NotFound("Layout " . $params['scope'] . ":" . $params['name'] . ' is not found');
-		}
-		return $data;
-	}
+    {
+        $data = $this->getContainer()->get('layout')->get($params['scope'], $params['name']);
+        if (empty($data)) {
+            throw new NotFound("Layout " . $params['scope'] . ":" . $params['name'] . ' is not found');
+        }
+        return $data;
+    }
 
-	public function actionUpdate($params, $data)
-	{
+    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) {
-			throw new Error("Error while saving layout");
-		}
+        if ($result === false) {
+            throw new Error("Error while saving layout");
+        }
 
-		$this->getContainer()->get('dataManager')->updateCacheTimestamp();
+        $this->getContainer()->get('dataManager')->updateCacheTimestamp();
 
-		return $this->getContainer()->get('layout')->get($params['scope'], $params['name']);
-	}
+        return $this->getContainer()->get('layout')->get($params['scope'], $params['name']);
+    }
 
-	public function actionPatch($params, $data)
-	{
+    public function actionPatch($params, $data)
+    {
         return $this->actionUpdate($params, $data);
-	}
+    }
 }

application/Espo/Controllers/Metadata.php

@@ -26,7 +26,7 @@ class Metadata extends \Espo\Core\Controllers\Base
 {
 
     public function actionRead($params, $data)
-	{
-		return $this->getMetadata()->getAll(true);
-	}
+    {
+        return $this->getMetadata()->getAll(true);
+    }
 }

application/Espo/Controllers/Notification.php

@@ -26,35 +26,41 @@ use \Espo\Core\Exceptions\Error;
 
 class Notification extends \Espo\Core\Controllers\Base
 {
-	public static $defaultAction = 'list';
+    public static $defaultAction = 'list';
 
-	public function actionList($params, $data, $request)
-	{
-		$scope = $params['scope'];
-		$id = $params['id'];
-		
-		$userId = $this->getUser()->id;
-		
-		$offset = intval($request->get('offset'));
-		$maxSize = intval($request->get('maxSize'));		
-		
-		$params = array(
-			'offset' => $offset,
-			'maxSize' => $maxSize,
-		);
-		
-		$result = $this->getService('Notification')->getList($userId, $params);	
-		
-		return array(
-			'total' => $result['total'],
-			'list' => $result['collection']->toArray()
-		);
-	}
-	
-	public function actionNotReadCount()
-	{
-		$userId = $this->getUser()->id;
-		return $this->getService('Notification')->getNotReadCount($userId);	
-	}
+    public function actionList($params, $data, $request)
+    {
+        $scope = $params['scope'];
+        $id = $params['id'];
+        
+        $userId = $this->getUser()->id;
+        
+        $offset = intval($request->get('offset'));
+        $maxSize = intval($request->get('maxSize'));        
+        
+        $params = array(
+            'offset' => $offset,
+            'maxSize' => $maxSize,
+        );
+        
+        $result = $this->getService('Notification')->getList($userId, $params);    
+        
+        return array(
+            'total' => $result['total'],
+            'list' => $result['collection']->toArray()
+        );
+    }
+    
+    public function actionNotReadCount()
+    {
+        $userId = $this->getUser()->id;
+        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

@@ -24,69 +24,95 @@ namespace Espo\Controllers;
 
 use \Espo\Core\Exceptions\Error;
 use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\BadRequest;
 use \Espo\Core\Exceptions\NotFound;
 
 class Preferences extends \Espo\Core\Controllers\Base
-{	
-	protected function getPreferences()
-	{
-		return $this->getContainer()->get('preferences');
-	}
-	
-	protected function getEntityManager()
-	{
-		return $this->getContainer()->get('entityManager');
-	}
-	
-	protected function handleUserAccess($userId)
-	{
-		if (!$this->getUser()->isAdmin()) {
-			if ($this->getUser()->id != $userId) {
-				throw new Forbidden();
-			}
-		}
-	}
-	
-	public function actionPatch($params, $data)
-	{
-		return $this->actionUpdate($params, $data);
-	}	
+{    
+    protected function getPreferences()
+    {
+        return $this->getContainer()->get('preferences');
+    }
+    
+    protected function getEntityManager()
+    {
+        return $this->getContainer()->get('entityManager');
+    }
+    
+    protected function getCrypt()
+    {
+        return $this->getContainer()->get('crypt');
+    }
+    
+    protected function handleUserAccess($userId)
+    {
+        if (!$this->getUser()->isAdmin()) {
+            if ($this->getUser()->id != $userId) {
+                throw new Forbidden();
+            }
+        }
+    }
+    
+    public function actionDelete($params, $data)
+    {
+        $userId = $params['id'];
+        if (empty($userId)) {
+            throw new BadRequest();
+        }
+        $this->handleUserAccess($userId);
+        
+        return $this->getEntityManager()->getRepository('Preferences')->resetToDefaults($userId);        
+    }
+    
+    public function actionPatch($params, $data)
+    {
+        return $this->actionUpdate($params, $data);
+    }    
 
-	public function actionUpdate($params, $data)
-	{
-		$userId = $params['id'];
-		$this->handleUserAccess($userId);
-		
-		$user = $this->getEntityManager()->getEntity('User', $userId);		
+    public function actionUpdate($params, $data)
+    {
+        $userId = $params['id'];
+        $this->handleUserAccess($userId);
+        
+        if (array_key_exists('smtpPassword', $data)) {
+            $data['smtpPassword'] = $this->getCrypt()->encrypt($data['smtpPassword']);
+        }
+        
+        $user = $this->getEntityManager()->getEntity('User', $userId);        
 
-		$entity = $this->getEntityManager()->getEntity('Preferences', $userId);
-		
-		if ($entity) {
-			$entity->set($data);
-			$this->getEntityManager()->saveEntity($entity);
-			
-			$entity->set('smtpEmailAddress', $user->get('emailAddress'));			
-			$entity->set('name', $user->get('name'));
-			
-			return $entity->toArray();		
-		}
-		throw new Error();
-	}
+        $entity = $this->getEntityManager()->getEntity('Preferences', $userId);
+        
+        if ($entity) {
+            $entity->set($data);
+            $this->getEntityManager()->saveEntity($entity);
+            
+            $entity->set('smtpEmailAddress', $user->get('emailAddress'));            
+            $entity->set('name', $user->get('name'));
+            
+            $entity->clear('smtpPassword');
+            
+            return $entity->toArray();        
+        }
+        throw new Error();
+    }
 
     public function actionRead($params)
-	{
-		$userId = $params['id'];
-		$this->handleUserAccess($userId);
+    {
+        $userId = $params['id'];
+        $this->handleUserAccess($userId);
 
-		$entity = $this->getEntityManager()->getEntity('Preferences', $userId);		
-		$user = $this->getEntityManager()->getEntity('User', $userId);
-		
-		$entity->set('smtpEmailAddress', $user->get('emailAddress'));
-		$entity->set('name', $user->get('name'));
-		if ($entity) {
-			return $entity->toArray();		
-		}
-		throw new NotFound();
-	}
+        $entity = $this->getEntityManager()->getEntity('Preferences', $userId);        
+        $user = $this->getEntityManager()->getEntity('User', $userId);
+        
+        $entity->set('smtpEmailAddress', $user->get('emailAddress'));
+        $entity->set('name', $user->get('name'));
+        
+        $entity->clear('smtpPassword');
+        
+        if ($entity) {
+            return $entity->toArray();        
+        }
+        throw new NotFound();
+    }
 }
 

application/Espo/Controllers/ScheduledJob.php

@@ -24,11 +24,11 @@ namespace Espo\Controllers;
 
 class ScheduledJob extends \Espo\Core\Controllers\Record
 {
-	protected function checkControllerAccess()
-	{
-		if (!$this->getUser()->isAdmin()) {
-        	throw new Forbidden();
-		}
-	}
+    protected function checkControllerAccess()
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+    }
 }
 

application/Espo/Controllers/ScheduledJobLogRecord.php

@@ -24,11 +24,11 @@ namespace Espo\Controllers;
 
 class ScheduledJobLogRecord extends \Espo\Core\Controllers\Record
 {
-	protected function checkControllerAccess()
-	{
-		if (!$this->getUser()->isAdmin()) {
-        	throw new Forbidden();
-		}
-	}
+    protected function checkControllerAccess()
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+    }
 }
 

application/Espo/Controllers/Settings.php

@@ -27,41 +27,48 @@ use \Espo\Core\Exceptions\Forbidden;
 
 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]);
-			}
-		}
-		return $data;
-	}
-	
-	public function actionRead($params, $data)
-	{
-		return $this->getConfigData();
-	}
+    protected function getConfigData()
+    {
+        $data = $this->getConfig()->getData($this->getUser()->isAdmin());
 
-	public function actionUpdate($params, $data)
-	{
-		return $this->actionPatch($params, $data);
-	}
+        $fieldDefs = $this->getMetadata()->get('entityDefs.Settings.fields');
 
-	public function actionPatch($params, $data)
-	{	   
-		if (!$this->getUser()->isAdmin()) {
-			throw new Forbidden();
-		}
-		
-		$result = $this->getConfig()->setData($data, $this->getUser()->isAdmin());
-		if ($result === false) {
-			throw new Error('Cannot save settings');
-		}
+        foreach ($fieldDefs as $field => $d) {
+            if ($d['type'] == 'password') {
+                unset($data[$field]);
+            }
+        }
+        return $data;
+    }
 
-		return $this->getConfigData();
-	}
+    public function actionRead($params, $data)
+    {
+        return $this->getConfigData();
+    }
+
+    public function actionUpdate($params, $data)
+    {
+        return $this->actionPatch($params, $data);
+    }
+
+    public function actionPatch($params, $data)
+    {
+        if (!$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+
+        $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/Stream.php

@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Controllers;
 
@@ -26,38 +26,38 @@ use \Espo\Core\Exceptions\Error;
 
 class Stream extends \Espo\Core\Controllers\Base
 {
-	const MAX_SIZE_LIMIT = 400;
-	
-	public static $defaultAction = 'list';
+    const MAX_SIZE_LIMIT = 400;
+
+    public static $defaultAction = 'list';
 
     public function actionList($params, $data, $request)
-	{
-		$scope = $params['scope'];
-		$id = $params['id'];
-		
-		$offset = intval($request->get('offset'));
-		$maxSize = intval($request->get('maxSize'));
-		$after = $request->get('after');
-		
-		$service = $this->getService('Stream');
-		
-		if (empty($maxSize)) {
-			$maxSize = self::MAX_SIZE_LIMIT;
-		}
-		if (!empty($maxSize) && $maxSize > self::MAX_SIZE_LIMIT) {
-			throw new Forbidden();
-		}		
-		
-		$result = $service->find($scope, $id, array(
-			'offset' => $offset,
-			'maxSize' => $maxSize,
-			'after' => $after,
-		));
-		
-		return array(
-			'total' => $result['total'],
-			'list' => $result['collection']->toArray()
-		);
-	}
+    {
+        $scope = $params['scope'];
+        $id = isset($params['id']) ? $params['id'] : null;
+
+        $offset = intval($request->get('offset'));
+        $maxSize = intval($request->get('maxSize'));
+        $after = $request->get('after');
+
+        $service = $this->getService('Stream');
+
+        if (empty($maxSize)) {
+            $maxSize = self::MAX_SIZE_LIMIT;
+        }
+        if (!empty($maxSize) && $maxSize > self::MAX_SIZE_LIMIT) {
+            throw new Forbidden();
+        }
+
+        $result = $service->find($scope, $id, array(
+            'offset' => $offset,
+            'maxSize' => $maxSize,
+            'after' => $after,
+        ));
+
+        return array(
+            'total' => $result['total'],
+            'list' => $result['collection']->toArray()
+        );
+    }
 }
 

application/Espo/Controllers/Team.php

@@ -24,6 +24,6 @@ namespace Espo\Controllers;
 
 class Team extends \Espo\Core\Controllers\Record
 {
-	
+    
 
 }

application/Espo/Controllers/User.php

@@ -27,31 +27,31 @@ use \Espo\Core\Exceptions\NotFound;
 use \Espo\Core\Exceptions\Forbidden;
 
 class User extends \Espo\Core\Controllers\Record
-{	
-	public function actionAcl($params, $data, $request)
-	{		
-		$userId = $request->get('id');
-		if (empty($userId)) {
-			throw new Error();
-		}
-		
-		if (!$this->getUser()->isAdmin() && $this->getUser()->id != $userId) {
-			throw new Forbidden();
-		}
-		
-		$user = $this->getEntityManager()->getEntity('User', $userId);
-		if (empty($user)) {
-			throw new NotFound();
-		}
-		
-		$acl = new \Espo\Core\Acl($user);
-		
-		return $acl->toArray();					
-	}
-	
-	public function actionChangeOwnPassword($params, $data)
-	{
-		return $this->getService('User')->changePassword($this->getUser()->id, $data['password']);
-	}
+{    
+    public function actionAcl($params, $data, $request)
+    {        
+        $userId = $request->get('id');
+        if (empty($userId)) {
+            throw new Error();
+        }
+        
+        if (!$this->getUser()->isAdmin() && $this->getUser()->id != $userId) {
+            throw new Forbidden();
+        }
+        
+        $user = $this->getEntityManager()->getEntity('User', $userId);
+        if (empty($user)) {
+            throw new NotFound();
+        }
+        
+        $acl = new \Espo\Core\Acl($user, $this->getConfig(), $this->getContainer()->get('fileManager'), $this->getMetadata());
+        
+        return $acl->toArray();                    
+    }
+    
+    public function actionChangeOwnPassword($params, $data)
+    {
+        return $this->getService('User')->changePassword($this->getUser()->id, $data['password']);
+    }
 }
 

application/Espo/Core/Acl.php

@@ -18,248 +18,264 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core;
 
 use \Espo\Core\Exceptions\Error;
 
+use \Espo\ORM\Entity;
+
 class Acl
 {
-	private $data = array();
+    private $data = array();
 
-	private $cacheFile;
+    private $cacheFile;
 
-	private $actionList = array('read', 'edit', 'delete');
+    private $actionList = array('read', 'edit', 'delete');
 
-	private $levelList = array('all', 'team', 'own', 'no');
-	
-	private $fileManager;
+    private $levelList = array('all', 'team', 'own', 'no');
 
-	public function __construct(\Espo\Entities\User $user, $config = null, $fileManager = null)
-	{
-		$this->user = $user;		
-		
-		if (!$this->user->isFetched()) {
-			throw new Error();
-		}
-		
-		$this->user->loadLinkMultipleField('teams');
-		
-		if ($fileManager) {
-			$this->fileManager = $fileManager;
-		}
-			
-		$this->cacheFile = 'data/cache/application/acl/' . $user->id . '.php';
-		
-		if ($config && $config->get('useCache') && file_exists($this->cacheFile)) {
-			$cached = include $this->cacheFile;
-			$this->data = $cached;
-			$this->initSolid();
-		} else {
-			$this->load();
-			$this->initSolid();
-			if ($config && $fileManager && $config->get('useCache')) {
-				$this->buildCache();
-			}
-		}
+    protected $fileManager;
 
-	}
-	
-	public function checkScope($scope, $action = null, $isOwner = null, $inTeam = null)
-	{
-		if (array_key_exists($scope, $this->data)) {			
-			if ($this->data[$scope] === false) {
-				return false;
-			}
-			if ($this->data[$scope] === true) {
-				return true;
-			}
-			if (!is_null($action)) {		
-				if (array_key_exists($action, $this->data[$scope])) {
-					$value = $this->data[$scope][$action];
-			
-					if ($value === 'all' || $value === true) {
-						return true;					
-					}
-			
-					if (!$value || $value === 'no') {
-						return false;					
-					}					
-				
-					if (is_null($isOwner)) {
-						return true;
-					}
-				
-					if ($isOwner) {
-						if ($value === 'own' || $value === 'team') {
-							return true;
-						}
-					}
-			
-					if ($inTeam) {
-						if ($value === 'team') {
-							return true;
-						}
-					}
-			
-					return false;
-				}
-			}
-			return true;
-		}
-		return true;		
-	}
-	
-	public function toArray()
-	{
-		return $this->data;
-	}
+    protected $metadata;
 
-	public function check($subject, $action = null, $isOwner = null, $inTeam = null)
-	{	
-		if ($this->user->isAdmin()) {
-			return true;
-		}
-		if (is_string($subject)) {
-			return $this->checkScope($subject, $action, $isOwner, $inTeam);
-		} else {
-			$entity = $subject;
-			$entityName = $entity->getEntityName();			
-			return $this->checkScope($entityName, $action, $this->checkIsOwner($entity), $this->checkInTeam($entity));
-		}
-	}
-			
-	public function checkReadOnlyTeam($scope)
-	{
-		if (isset($this->data[$scope]) && isset($this->data[$scope]['read'])) {
-			return $this->data[$scope]['read'] === 'team';
-		}
-		return false;
-	}
-	
-	public function checkReadOnlyOwn($scope)
-	{
-		if ($this->user->isAdmin()) {
-			return false;
-		}
-		if (isset($this->data[$scope]) && isset($this->data[$scope]['read'])) {
-			return $this->data[$scope]['read'] === 'own';
-		}
-		return false;
-	}
-	
-	public function checkIsOwner($entity)
-	{
-		if ($this->user->isAdmin()) {
-			return false;
-		}
-		$userId = $this->user->id;
-		if ($userId === $entity->get('assignedUserId') || $userId === $entity->get('createdById')) {
-			return true;
-		}
-		return false;
-	}
-	
-	public function checkInTeam($entity)
-	{
-		$userTeamIds = $this->user->get('teamsIds');
-		$teamIds = $entity->get('teamsIds');
-		
-		foreach ($userTeamIds as $id) {
-			if (in_array($id, $teamIds)) {
-				return true;
-			}
-		}		
-		return false;
-	}
+    public function __construct(\Espo\Entities\User $user, $config = null, $fileManager = null, $metadata = null)
+    {
+        $this->user = $user;
 
-	private function load()
-	{
-		$aclTables = array();
+        $this->metadata = $metadata;
 
-		$userRoles = $this->user->get('roles');
-		
-		foreach ($userRoles as $role) {
-			$aclTables[] = json_decode($role->get('data'));
-		}
+        if (!$this->user->isFetched()) {
+            throw new Error();
+        }
 
-		$teams = $this->user->get('teams');
-		foreach ($teams as $team) {
-			$teamRoles = $team->get('roles');
-			foreach ($teamRoles as $role) {
-				$aclTables[] = json_decode($role->get('data'));
-			}
-		}
+        $this->user->loadLinkMultipleField('teams');
 
-		$this->data = $this->merge($aclTables);
-	}
-	
-	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',					
-		);
-		$this->data['Note'] = array(
-			'read' => 'all',
-			'edit' => 'own',
-			'delete' => 'own',					
-		);
-	}
+        if ($fileManager) {
+            $this->fileManager = $fileManager;
+        }
 
-	private function merge($tables)
-	{
-		$data = array();
-		foreach ($tables as $table) {
-			foreach ($table as $scope => $row) {
-				if ($row == false) {
-					if (!isset($data[$scope])) {
-						$data[$scope] = false;
-					}
-				} else {
-					if (!isset($data[$scope])) {
-						$data[$scope] = array();
-					}
-					if ($data[$scope] == false) {
-						$data[$scope] = array();
-					}
-					foreach ($row as $action => $level) {
-						if (!isset($data[$scope][$action])) {
-							$data[$scope][$action] = $level;
-						} else {
-							if (array_search($data[$scope][$action], $this->levelList) > array_search($level, $this->levelList)) {
-								$data[$scope][$action] = $level;
-							}
-						}
-					}
-				}
-			}
-		}
-		return $data;
-	}
+        $this->cacheFile = 'data/cache/application/acl/' . $user->id . '.php';
 
-	private function buildCache()
-	{
-		$contents = '<' . '?'. 'php return ' .  var_export($this->data, true)  . ';';
-		$this->fileManager->putContents($this->cacheFile, $contents);
-	}
+        if ($config && $config->get('useCache') && file_exists($this->cacheFile)) {
+            $cached = include $this->cacheFile;
+            $this->data = $cached;
+            $this->initSolid();
+        } else {
+            $this->load();
+            $this->initSolid();
+            if ($config && $fileManager && $config->get('useCache')) {
+                $this->buildCache();
+            }
+        }
+
+    }
+
+    public function checkScope($scope, $action = null, $isOwner = null, $inTeam = null, $entity = null)
+    {
+        if (array_key_exists($scope, $this->data)) {
+            if ($this->data[$scope] === false) {
+                return false;
+            }
+            if ($this->data[$scope] === true) {
+                return true;
+            }
+            if (!is_null($action)) {
+                if (array_key_exists($action, $this->data[$scope])) {
+                    $value = $this->data[$scope][$action];
+
+                    if ($value === 'all' || $value === true) {
+                        return true;
+                    }
+
+                    if (!$value || $value === 'no') {
+                        return false;
+                    }
+
+                    if (is_null($isOwner)) {
+                        return true;
+                    }
+
+                    if ($isOwner) {
+                        if ($value === 'own' || $value === 'team') {
+                            return true;
+                        }
+                    }
+                    if ($inTeam === null && $entity) {
+                        $inTeam = $this->checkInTeam($entity);
+                    }
+
+                    if ($inTeam) {
+                        if ($value === 'team') {
+                            return true;
+                        }
+                    }
+
+                    return false;
+                }
+            }
+            return true;
+        }
+        return true;
+    }
+
+    public function toArray()
+    {
+        return $this->data;
+    }
+
+    public function getLevel($scope, $action)
+    {
+        if ($this->user->isAdmin()) {
+            return 'all';
+        }
+        if (array_key_exists($scope, $this->data)) {
+            if (array_key_exists($action, $this->data[$scope])) {
+                return $this->data[$scope][$action];
+            }
+        }
+        return false;
+    }
+
+    public function check($subject, $action = null, $isOwner = null, $inTeam = null)
+    {
+        if ($this->user->isAdmin()) {
+            return true;
+        }
+        if (is_string($subject)) {
+            return $this->checkScope($subject, $action, $isOwner, $inTeam);
+        } else {
+            $entity = $subject;
+            if ($entity instanceof Entity) {
+                $entityName = $entity->getEntityName();
+                return $this->checkScope($entityName, $action, $this->checkIsOwner($entity), $inTeam, $entity);
+            }
+        }
+    }
+
+    public function checkReadOnlyTeam($scope)
+    {
+        if (isset($this->data[$scope]) && isset($this->data[$scope]['read'])) {
+            return $this->data[$scope]['read'] === 'team';
+        }
+        return false;
+    }
+
+    public function checkReadOnlyOwn($scope)
+    {
+        if ($this->user->isAdmin()) {
+            return false;
+        }
+        if (isset($this->data[$scope]) && isset($this->data[$scope]['read'])) {
+            return $this->data[$scope]['read'] === 'own';
+        }
+        return false;
+    }
+
+    public function checkIsOwner($entity)
+    {
+        if ($this->user->isAdmin()) {
+            return false;
+        }
+        $userId = $this->user->id;
+        if ($userId === $entity->get('assignedUserId') || $userId === $entity->get('createdById')) {
+            return true;
+        }
+        return false;
+    }
+
+    public function checkInTeam($entity)
+    {
+        $userTeamIds = $this->user->get('teamsIds');
+
+        if (!$entity->hasRelation('teams') || !$entity->hasField('teamsIds')) {
+            return false;
+        }
+
+        if (!$entity->has('teamsIds')) {
+            $entity->loadLinkMultipleField('teams');
+        }
+
+        $teamIds = $entity->get('teamsIds');
+
+        if (empty($teamIds)) {
+            return false;
+        }
+
+        foreach ($userTeamIds as $id) {
+            if (in_array($id, $teamIds)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private function load()
+    {
+        $aclTables = array();
+
+        $userRoles = $this->user->get('roles');
+
+        foreach ($userRoles as $role) {
+            $aclTables[] = json_decode($role->get('data'));
+        }
+
+        $teams = $this->user->get('teams');
+        foreach ($teams as $team) {
+            $teamRoles = $team->get('roles');
+            foreach ($teamRoles as $role) {
+                $aclTables[] = json_decode($role->get('data'));
+            }
+        }
+
+        $this->data = $this->merge($aclTables);
+    }
+
+    private function initSolid()
+    {
+        $data = $this->metadata->get('app.acl.solid', array());
+
+        foreach ($data as $entityName => $item) {
+            $this->data[$entityName] = $item;
+        }
+    }
+
+    private function merge($tables)
+    {
+        $data = array();
+        foreach ($tables as $table) {
+            foreach ($table as $scope => $row) {
+                if ($row == false) {
+                    if (!isset($data[$scope])) {
+                        $data[$scope] = false;
+                    }
+                } else {
+                    if (!isset($data[$scope])) {
+                        $data[$scope] = array();
+                    }
+                    if ($data[$scope] == false) {
+                        $data[$scope] = array();
+                    }
+                    foreach ($row as $action => $level) {
+                        if (!isset($data[$scope][$action])) {
+                            $data[$scope][$action] = $level;
+                        } else {
+                            if (array_search($data[$scope][$action], $this->levelList) > array_search($level, $this->levelList)) {
+                                $data[$scope][$action] = $level;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return $data;
+    }
+
+    private function buildCache()
+    {
+        $contents = '<' . '?'. 'php return ' .  var_export($this->data, true)  . ';';
+        $this->fileManager->putContents($this->cacheFile, $contents);
+    }
 }
 

application/Espo/Core/Application.php

@@ -25,54 +25,54 @@ namespace Espo\Core;
 
 class Application
 {
-	private $metadata;
+    private $metadata;
 
-	private $container;
+    private $container;
 
-	private $slim;
+    private $slim;
 
-	private $auth;
+    private $auth;
 
-	/**
+    /**
      * Constructor
      */
     public function __construct()
     {
-    	$this->container = new Container();
+        $this->container = new Container();
 
-		date_default_timezone_set('UTC');
+        date_default_timezone_set('UTC');
 
-		$GLOBALS['log'] = $this->container->get('log');
+        $GLOBALS['log'] = $this->container->get('log');
     }
 
-	public function getSlim()
-	{
-		if (empty($this->slim)) {
-			$this->slim = $this->container->get('slim');
-		}
-		return $this->slim;
-	}
+    public function getSlim()
+    {
+        if (empty($this->slim)) {
+            $this->slim = $this->container->get('slim');
+        }
+        return $this->slim;
+    }
 
-	public function getMetadata()
-	{
-		if (empty($this->metadata)) {
-			$this->metadata = $this->container->get('metadata');
-		}
-		return $this->metadata;
-	}
+    public function getMetadata()
+    {
+        if (empty($this->metadata)) {
+            $this->metadata = $this->container->get('metadata');
+        }
+        return $this->metadata;
+    }
 
     protected function getAuth()
     {
-    	if (empty($this->auth)) {
-    		$this->auth = new \Espo\Core\Utils\Auth($this->container);
-    	}
-    	return $this->auth;
+        if (empty($this->auth)) {
+            $this->auth = new \Espo\Core\Utils\Auth($this->container);
+        }
+        return $this->auth;
     }
 
-	public function getContainer()
-	{
-		return $this->container;
-	}
+    public function getContainer()
+    {
+        return $this->container;
+    }
 
     public function run($name = 'default')
     {
@@ -83,163 +83,160 @@ class Application
 
     public function runClient()
     {
-    	$config = $this->getContainer()->get('config');
+        $config = $this->getContainer()->get('config');
 
-    	$html = file_get_contents('main.html');
-    	$html = str_replace('{{cacheTimestamp}}', $config->get('cacheTimestamp', 0), $html);
-    	$html = str_replace('{{useCache}}', $config->get('useCache') ? 'true' : 'false' , $html);
-    	echo $html;
-    	exit;
+        $html = file_get_contents('main.html');
+        $html = str_replace('{{cacheTimestamp}}', $config->get('cacheTimestamp', 0), $html);
+        $html = str_replace('{{useCache}}', $config->get('useCache') ? 'true' : 'false' , $html);
+        echo $html;
+        exit;
     }
 
     public function runEntryPoint($entryPoint)
     {
-    	if (empty($entryPoint)) {
-    		throw new \Error();
-    	}
+        if (empty($entryPoint)) {
+            throw new \Error();
+        }
 
-    	$slim = $this->getSlim();
-    	$container = $this->getContainer();
+        $slim = $this->getSlim();
+        $container = $this->getContainer();
 
-		$slim->get('/', function() {});
+        $slim->get('/', function() {});
 
-    	$entryPointManager = new \Espo\Core\EntryPointManager($container);
+        $entryPointManager = new \Espo\Core\EntryPointManager($container);
 
-    	$auth = $this->getAuth();
-    	$apiAuth = new \Espo\Core\Utils\Api\Auth($auth, $entryPointManager->checkAuthRequired($entryPoint), true);
-    	$slim->add($apiAuth);
+        $auth = $this->getAuth();
+        $apiAuth = new \Espo\Core\Utils\Api\Auth($auth, $entryPointManager->checkAuthRequired($entryPoint), true);
+        $slim->add($apiAuth);
 
-		$slim->hook('slim.before.dispatch', function () use ($entryPoint, $entryPointManager, $container) {
-			try {
-				$entryPointManager->run($entryPoint);
-			} catch (\Exception $e) {
-				$container->get('output')->processError($e->getMessage(), $e->getCode(), true);
-			}
-		});
+        $slim->hook('slim.before.dispatch', function () use ($entryPoint, $entryPointManager, $container) {
+            try {
+                $entryPointManager->run($entryPoint);
+            } catch (\Exception $e) {
+                $container->get('output')->processError($e->getMessage(), $e->getCode(), true);
+            }
+        });
 
-    	$slim->run();
+        $slim->run();
     }
 
     public function runCron()
     {
-    	$auth = $this->getAuth();
-    	$auth->useNoAuth(true);
+        $auth = $this->getAuth();
+        $auth->useNoAuth(true);
 
-    	$cronManager = new \Espo\Core\CronManager($this->container);
-		$cronManager->run();
+        $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();
+        $dataManager = $this->getContainer()->get('dataManager');
+        $dataManager->rebuild();
     }
 
     public function isInstalled()
     {
-    	$config = $this->getContainer()->get('config');
+        $config = $this->getContainer()->get('config');
 
-    	if (file_exists($config->getConfigPath()) && $config->get('isInstalled')) {
-    		return true;
-    	}
+        if (file_exists($config->getConfigPath()) && $config->get('isInstalled')) {
+            return true;
+        }
 
-		return false;
+        return false;
     }
 
-	protected function routeHooks()
-	{
-		$container = $this->getContainer();
-		$slim = $this->getSlim();
+    protected function routeHooks()
+    {
+        $container = $this->getContainer();
+        $slim = $this->getSlim();
 
-		$auth = $this->getAuth();
+        $auth = $this->getAuth();
 
-		$apiAuth = new \Espo\Core\Utils\Api\Auth($auth);
-		$this->getSlim()->add($apiAuth);
+        $apiAuth = new \Espo\Core\Utils\Api\Auth($auth);
+        $this->getSlim()->add($apiAuth);
 
-		$this->getSlim()->hook('slim.before.dispatch', function () use ($slim, $container) {
+        $this->getSlim()->hook('slim.before.dispatch', function () use ($slim, $container) {
 
-			$route = $slim->router()->getCurrentRoute();
-		    $conditions = $route->getConditions();
+            $route = $slim->router()->getCurrentRoute();
+            $conditions = $route->getConditions();
 
-			if (isset($conditions['useController']) && $conditions['useController'] == false) {
-				return;
-			}
+            if (isset($conditions['useController']) && $conditions['useController'] == false) {
+                return;
+            }
 
-			$routeOptions = call_user_func($route->getCallable());
-			$routeKeys = is_array($routeOptions) ? array_keys($routeOptions) : array();
+            $routeOptions = call_user_func($route->getCallable());
+            $routeKeys = is_array($routeOptions) ? array_keys($routeOptions) : array();
 
-			if (!in_array('controller', $routeKeys, true)) {
-				return $container->get('output')->render($routeOptions);
-			}
+            if (!in_array('controller', $routeKeys, true)) {
+                return $container->get('output')->render($routeOptions);
+            }
 
-			$params = $route->getParams();
-			$data = $slim->request()->getBody();
+            $params = $route->getParams();
+            $data = $slim->request()->getBody();
 
-			foreach ($routeOptions as $key => $value) {
-				if (strstr($value, ':')) {
-					$paramName = str_replace(':', '', $value);
-					$value = $params[$paramName];
-				}
-				$controllerParams[$key] = $value;
-			}
+            foreach ($routeOptions as $key => $value) {
+                if (strstr($value, ':')) {
+                    $paramName = str_replace(':', '', $value);
+                    $value = $params[$paramName];
+                }
+                $controllerParams[$key] = $value;
+            }
 
-			$params = array_merge($params, $controllerParams);
+            $params = array_merge($params, $controllerParams);
 
-			$controllerName = ucfirst($controllerParams['controller']);
+            $controllerName = ucfirst($controllerParams['controller']);
 
-			if (!empty($controllerParams['action'])) {
-				$actionName = $controllerParams['action'];
-			} else {
-				$httpMethod = strtolower($slim->request()->getMethod());
-				$crudList = $container->get('config')->get('crud');
-				$actionName = $crudList[$httpMethod];
-			}
+            if (!empty($controllerParams['action'])) {
+                $actionName = $controllerParams['action'];
+            } else {
+                $httpMethod = strtolower($slim->request()->getMethod());
+                $crudList = $container->get('config')->get('crud');
+                $actionName = $crudList[$httpMethod];
+            }
 
-			try {
-				$controllerManager = new \Espo\Core\ControllerManager($container);
-				$result = $controllerManager->process($controllerName, $actionName, $params, $data, $slim->request());
-				$container->get('output')->render($result);
-			} catch (\Exception $e) {
-				$container->get('output')->processError($e->getMessage(), $e->getCode());
-			}
-		});
+            try {
+                $controllerManager = new \Espo\Core\ControllerManager($container);
+                $result = $controllerManager->process($controllerName, $actionName, $params, $data, $slim->request());
+                $container->get('output')->render($result);
+            } catch (\Exception $e) {
+                $container->get('output')->processError($e->getMessage(), $e->getCode());
+            }
+        });
 
-		$this->getSlim()->hook('slim.after.router', function () use (&$slim) {
-			$slim->contentType('application/json');
+        $this->getSlim()->hook('slim.after.router', function () use (&$slim) {
+            $slim->contentType('application/json');
 
-			$res = $slim->response();
-			$res->header('Expires', '0');
-			$res->header('Last-Modified', gmdate("D, d M Y H:i:s") . " GMT");
-			$res->header('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
-			$res->header('Pragma', 'no-cache');
-		});
-	}
+            $res = $slim->response();
+            $res->header('Expires', '0');
+            $res->header('Last-Modified', gmdate("D, d M Y H:i:s") . " GMT");
+            $res->header('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
+            $res->header('Pragma', 'no-cache');
+        });
+    }
 
 
-	protected function initRoutes()
-	{
-		$routes = new \Espo\Core\Utils\Route($this->getContainer()->get('config'), $this->getMetadata(), $this->getContainer()->get('fileManager'));
-		$crudList = array_keys( $this->getContainer()->get('config')->get('crud') );
+    protected function initRoutes()
+    {
+        $routes = new \Espo\Core\Utils\Route($this->getContainer()->get('config'), $this->getMetadata(), $this->getContainer()->get('fileManager'));
+        $crudList = array_keys( $this->getContainer()->get('config')->get('crud') );
 
-		foreach ($routes->getAll() as $route) {
+        foreach ($routes->getAll() as $route) {
 
-			$method = strtolower($route['method']);
-			if (!in_array($method, $crudList)) {
-				$GLOBALS['log']->error('Route: Method ['.$method.'] does not exist. Please check your route ['.$route['route'].']');
-				continue;
-			}
+            $method = strtolower($route['method']);
+            if (!in_array($method, $crudList)) {
+                $GLOBALS['log']->error('Route: Method ['.$method.'] does not exist. Please check your route ['.$route['route'].']');
+                continue;
+            }
 
             $currentRoute = $this->getSlim()->$method($route['route'], function() use ($route) {   //todo change "use" for php 5.4
-	        	return $route['params'];
-			});
+                return $route['params'];
+            });
 
-			if (isset($route['conditions'])) {
-            	$currentRoute->conditions($route['conditions']);
-			}
-		}
-	}
+            if (isset($route['conditions'])) {
+                $currentRoute->conditions($route['conditions']);
+            }
+        }
+    }
 }
 

application/Espo/Core/Container.php

@@ -25,10 +25,10 @@ namespace Espo\Core;
 class Container
 {
 
-	private $data = array();
+    private $data = array();
 
 
-	/**
+    /**
      * Constructor
      */
     public function __construct()
@@ -38,186 +38,205 @@ class Container
 
     public function get($name)
     {
-    	if (empty($this->data[$name])) {
-    		$this->load($name);
-    	}
-    	return $this->data[$name];
+        if (empty($this->data[$name])) {
+            $this->load($name);
+        }
+        return $this->data[$name];
     }
 
     private function load($name)
     {
-    	$loadMethod = 'load' . ucfirst($name);
-    	if (method_exists($this, $loadMethod)) {
-    		$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);
+        $loadMethod = 'load' . ucfirst($name);
+        if (method_exists($this, $loadMethod)) {
+            $obj = $this->$loadMethod();
+            $this->data[$name] = $obj;
+        } else {
+            $className = '\Espo\Custom\Core\Loaders\\'.ucfirst($name);
             if (!class_exists($className)) {
-            	$className = '\Espo\Core\Loaders\\'.ucfirst($name);
+                $className = '\Espo\Core\Loaders\\'.ucfirst($name);
             }
 
-			if (class_exists($className)) {
-            	 $loadClass = new $className($this);
-				 $this->data[$name] = $loadClass->load();
-			}
-    	}
+            if (class_exists($className)) {
+                 $loadClass = new $className($this);
+                 $this->data[$name] = $loadClass->load();
+            }
+        }
 
-		// TODO throw an exception
-    	return null;
+        return null;
+    }
+    
+    protected function getServiceClassName($name, $default)
+    {
+        $metadata = $this->get('metadata');
+        $className = $metadata->get('app.serviceContainer.classNames.' . $name, $default);
+        return $className;
+    }
+
+    protected function loadContainer()
+    {
+        return $this;
     }
 
     private function loadSlim()
     {
-        //return new \Slim\Slim();
         return new \Espo\Core\Utils\Api\Slim();
     }
 
-	private function loadFileManager()
+    private function loadFileManager()
     {
-    	return new \Espo\Core\Utils\File\Manager(
-			$this->get('config')
-		);
+        return new \Espo\Core\Utils\File\Manager(
+            $this->get('config')
+        );
     }
 
-	private function loadPreferences()
+    private function loadPreferences()
     {
-    	return $this->get('entityManager')->getEntity('Preferences', $this->get('user')->id);
+        return $this->get('entityManager')->getEntity('Preferences', $this->get('user')->id);
     }
 
-	private function loadConfig()
+    private function loadConfig()
     {
-    	return new \Espo\Core\Utils\Config(
-			new \Espo\Core\Utils\File\Manager()
-		);
+        return new \Espo\Core\Utils\Config(
+            new \Espo\Core\Utils\File\Manager()
+        );
     }
 
-	private function loadHookManager()
+    private function loadHookManager()
     {
-    	return new \Espo\Core\HookManager(
-			$this
-		);
+        return new \Espo\Core\HookManager(
+            $this
+        );
     }
 
-	private function loadOutput()
+    private function loadOutput()
     {
-    	return new \Espo\Core\Utils\Api\Output(
-			$this->get('slim')
-		);
+        return new \Espo\Core\Utils\Api\Output(
+            $this->get('slim')
+        );
     }
 
-	private function loadMailSender()
+    private function loadMailSender()
     {
-    	return new \Espo\Core\Mail\Sender(
-			$this->get('config')
-		);
+        $className = $this->getServiceClassName('mailSernder', '\\Espo\\Core\\Mail\\Sender');
+        return new $className(
+            $this->get('config')
+        );
     }
 
-	private function loadDateTime()
+    private function loadDateTime()
     {
-    	return new \Espo\Core\Utils\DateTime(
-			$this->get('config')->get('dateFormat'),
-			$this->get('config')->get('timeFormat'),
-			$this->get('config')->get('timeZone')
-		);
+        return new \Espo\Core\Utils\DateTime(
+            $this->get('config')->get('dateFormat'),
+            $this->get('config')->get('timeFormat'),
+            $this->get('config')->get('timeZone')
+        );
     }
 
-	private function loadServiceFactory()
+    private function loadServiceFactory()
     {
-    	return new \Espo\Core\ServiceFactory(
-			$this
-		);
+        return new \Espo\Core\ServiceFactory(
+            $this
+        );
     }
 
-	private function loadSelectManagerFactory()
+    private function loadSelectManagerFactory()
     {
-    	return new \Espo\Core\SelectManagerFactory(
-			$this->get('entityManager'),
-			$this->get('user'),
-			$this->get('acl'),
-			$this->get('metadata')
-		);
+        return new \Espo\Core\SelectManagerFactory(
+            $this->get('entityManager'),
+            $this->get('user'),
+            $this->get('acl'),
+            $this->get('metadata')
+        );
     }
 
-	private function loadMetadata()
+    private function loadMetadata()
     {
-    	return new \Espo\Core\Utils\Metadata(
-			$this->get('config'),
-			$this->get('fileManager')
-		);
+        return new \Espo\Core\Utils\Metadata(
+            $this->get('config'),
+            $this->get('fileManager')
+        );
     }
 
-	private function loadLayout()
+    private function loadLayout()
     {
-    	return new \Espo\Core\Utils\Layout(
-			$this->get('fileManager'),
-			$this->get('metadata')
-		);
+        return new \Espo\Core\Utils\Layout(
+            $this->get('fileManager'),
+            $this->get('metadata')
+        );
     }
 
-	private function loadAcl()
-	{
-		return new \Espo\Core\Acl(
-			$this->get('user'),
-			$this->get('config'),
-			$this->get('fileManager')
-		);
-	}
+    private function loadAcl()
+    {
+        $className = $this->getServiceClassName('acl', '\\Espo\\Core\\Acl');
+        return new $className(
+            $this->get('user'),
+            $this->get('config'),
+            $this->get('fileManager'),
+            $this->get('metadata')
+        );
+    }
 
-	private function loadSchema()
-	{
-		return new \Espo\Core\Utils\Database\Schema\Schema(
-			$this->get('config'),
-			$this->get('metadata'),
-			$this->get('fileManager'),
-			$this->get('entityManager'),
-			$this->get('classParser')
-		);
-	}
+    private function loadSchema()
+    {
+        return new \Espo\Core\Utils\Database\Schema\Schema(
+            $this->get('config'),
+            $this->get('metadata'),
+            $this->get('fileManager'),
+            $this->get('entityManager'),
+            $this->get('classParser')
+        );
+    }
 
-	private function loadClassParser()
-	{
-		return new \Espo\Core\Utils\File\ClassParser(
-			$this->get('fileManager'),
-			$this->get('config'),
-			$this->get('metadata')
-		);
-	}
+    private function loadClassParser()
+    {
+        return new \Espo\Core\Utils\File\ClassParser(
+            $this->get('fileManager'),
+            $this->get('config'),
+            $this->get('metadata')
+        );
+    }
 
-	private function loadLanguage()
-	{
-		return new \Espo\Core\Utils\Language(
-			$this->get('fileManager'),
-			$this->get('config'),
-			$this->get('preferences')
-		);
-	}
+    private function loadLanguage()
+    {
+        return new \Espo\Core\Utils\Language(
+            $this->get('fileManager'),
+            $this->get('config'),
+            $this->get('preferences')
+        );
+    }
+    
+    private function loadCrypt()
+    {
+        return new \Espo\Core\Utils\Crypt(
+            $this->get('config')
+        );
+    }
 
-	private function loadScheduledJob()
-	{
-		return new \Espo\Core\Cron\ScheduledJob(
-			$this
-		);
-	}
+    private function loadScheduledJob()
+    {
+        return new \Espo\Core\Cron\ScheduledJob(
+            $this
+        );
+    }
 
-	private function loadDataManager()
-	{
-		return new \Espo\Core\DataManager(
-			$this
-		);
-	}
+    private function loadDataManager()
+    {
+        return new \Espo\Core\DataManager(
+            $this
+        );
+    }
 
-	private function loadFieldManager()
-	{
-		return new \Espo\Core\Utils\FieldManager(
-			$this->get('metadata'),
-			$this->get('language')
-		);
-	}
+    private function loadFieldManager()
+    {
+        return new \Espo\Core\Utils\FieldManager(
+            $this->get('metadata'),
+            $this->get('language')
+        );
+    }
 
-	public function setUser($user)
-	{
-		$this->data['user'] = $user;
-	}
+    public function setUser($user)
+    {
+        $this->data['user'] = $user;
+    }
 }
 

application/Espo/Core/ControllerManager.php

@@ -27,88 +27,88 @@ use \Espo\Core\Exceptions\NotFound;
 
 class ControllerManager
 {
-	private $config;
+    private $config;
 
-	private $metadata;
+    private $metadata;
 
-	private $container;
+    private $container;
 
-	public function __construct(\Espo\Core\Container $container)
-	{
-		$this->container = $container;
+    public function __construct(\Espo\Core\Container $container)
+    {
+        $this->container = $container;
 
-		$this->config = $this->container->get('config');
-		$this->metadata = $this->container->get('metadata');
-	}
+        $this->config = $this->container->get('config');
+        $this->metadata = $this->container->get('metadata');
+    }
 
     protected function getConfig()
-	{
-		return $this->config;
-	}
+    {
+        return $this->config;
+    }
 
-	protected function getMetadata()
-	{
-		return $this->metadata;
-	}
+    protected function getMetadata()
+    {
+        return $this->metadata;
+    }
 
-	public function process($controllerName, $actionName, $params, $data, $request)
-	{
-		$customeClassName = '\\Espo\\Custom\\Controllers\\' . Util::normilizeClassName($controllerName);
-		if (class_exists($customeClassName)) {
-			$controllerClassName = $customeClassName;
-		} else {
-			$moduleName = $this->metadata->getScopeModuleName($controllerName);
-			if ($moduleName) {
-				$controllerClassName = '\\Espo\\Modules\\' . $moduleName . '\\Controllers\\' . Util::normilizeClassName($controllerName);
-			} else {
-				$controllerClassName = '\\Espo\\Controllers\\' . Util::normilizeClassName($controllerName);
-			}
-		}
+    public function process($controllerName, $actionName, $params, $data, $request)
+    {
+        $customeClassName = '\\Espo\\Custom\\Controllers\\' . Util::normilizeClassName($controllerName);
+        if (class_exists($customeClassName)) {
+            $controllerClassName = $customeClassName;
+        } else {
+            $moduleName = $this->metadata->getScopeModuleName($controllerName);
+            if ($moduleName) {
+                $controllerClassName = '\\Espo\\Modules\\' . $moduleName . '\\Controllers\\' . Util::normilizeClassName($controllerName);
+            } else {
+                $controllerClassName = '\\Espo\\Controllers\\' . Util::normilizeClassName($controllerName);
+            }
+        }
 
-		if ($data && stristr($request->getContentType(), 'application/json')) {
-			$data = json_decode($data);
-		}
+        if ($data && stristr($request->getContentType(), 'application/json')) {
+            $data = json_decode($data);
+        }
 
 
-		if ($data instanceof \stdClass) {
-			$data = get_object_vars($data);
-		}
+        if ($data instanceof \stdClass) {
+            $data = get_object_vars($data);
+        }
 
-		if (!class_exists($controllerClassName)) {
-			throw new NotFound("Controller '$controllerName' is not found");
-		}
+        if (!class_exists($controllerClassName)) {
+            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;
-		}
+        if ($actionName == 'index') {
+            $actionName = $controllerClassName::$defaultAction;
+        }
 
-		$actionNameUcfirst = ucfirst($actionName);
+        $actionNameUcfirst = ucfirst($actionName);
 
-		$beforeMethodName = 'before' . $actionNameUcfirst;
-		if (method_exists($controller, $beforeMethodName)) {
-			$controller->$beforeMethodName($params, $data, $request);
-		}
-		$actionMethodName = 'action' . $actionNameUcfirst;
+        $beforeMethodName = 'before' . $actionNameUcfirst;
+        if (method_exists($controller, $beforeMethodName)) {
+            $controller->$beforeMethodName($params, $data, $request);
+        }
+        $actionMethodName = 'action' . $actionNameUcfirst;
 
-		if (!method_exists($controller, $actionMethodName)) {
-			throw new NotFound("Action '$actionMethodName' does not exist in controller '$controller'");
-		}
+        if (!method_exists($controller, $actionMethodName)) {
+            throw new NotFound("Action '$actionMethodName' does not exist in controller '$controller'");
+        }
 
-		$result = $controller->$actionMethodName($params, $data, $request);
+        $result = $controller->$actionMethodName($params, $data, $request);
 
-		$afterMethodName = 'after' . $actionNameUcfirst;
-		if (method_exists($controller, $afterMethodName)) {
-			$controller->$afterMethodName($params, $data, $request);
-		}
+        $afterMethodName = 'after' . $actionNameUcfirst;
+        if (method_exists($controller, $afterMethodName)) {
+            $controller->$afterMethodName($params, $data, $request);
+        }
 
-		if (is_array($result) || is_bool($result)) {
-        	return \Espo\Core\Utils\Json::encode($result);
-		}
+        if (is_array($result) || is_bool($result)) {
+            return \Espo\Core\Utils\Json::encode($result);
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
 }
 

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;
 
@@ -28,70 +28,91 @@ use \Espo\Core\Utils\Util;
 
 abstract class Base
 {
-	protected $name;
-	
-	private $container;
-	
-	public static $defaultAction = 'index';
+    protected $name;
 
-	public function __construct(Container $container)
-	{
-		$this->container = $container;
-		
-		if (empty($this->name)) {
-			$name = get_class($this);
-			if (preg_match('@\\\\([\w]+)$@', $name, $matches)) {
-		    	$name = $matches[1];
-			}
-			$this->name = $name;
-    	}
-    	
-    	$this->checkControllerAccess();
-	}
-	
-	protected function checkControllerAccess()
-	{
-		return;
-	}
-	
-	protected function getContainer()
-	{
-		return $this->container;
-	}
-	
-	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');
-	}
+    private $container;
 
-	protected function getServiceFactory()
-	{
-		return $this->container->get('serviceFactory');
-	}
-	
-	protected function getService($name)
-	{
-		return $this->getServiceFactory()->create($name);
-	}
+    private $requestMethod;
+
+    public static $defaultAction = 'index';
+
+    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)) {
+                $name = $matches[1];
+            }
+            $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');
+    }
+
+    protected function getServiceFactory()
+    {
+        return $this->container->get('serviceFactory');
+    }
+
+    protected function getService($name)
+    {
+        return $this->getServiceFactory()->create($name);
+    }
 }
 

application/Espo/Core/Controllers/Record.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,271 +29,277 @@ use \Espo\Core\Utils\Util;
 
 class Record extends Base
 {
-	const MAX_SIZE_LIMIT = 200;
-	
-	public static $defaultAction = 'list';	
-	
-	protected function getEntityManager()
-	{
-		return $this->getContainer()->get('entityManager');
-	}
-	
-	protected function getRecordService()
-	{
-    	if ($this->getServiceFactory()->checkExists($this->name)) {
-    		$service = $this->getServiceFactory()->create($this->name);
-    	} else {
-    		$service = $this->getServiceFactory()->create('Record');
-    		$service->setEntityName($this->name);
-    	}		
-		
-		return $service;
-	}
+    const MAX_SIZE_LIMIT = 200;
 
-	public function actionRead($params)
-	{
-		$id = $params['id'];
-		$entity = $this->getRecordService()->getEntity($id);
-		
-		if (empty($entity)) {
-			throw new NotFound();
-		}
+    public static $defaultAction = 'list';
 
-		return $entity->toArray();
-	}
-	
-	public function actionPatch($params, $data)
-	{
-		return $this->actionUpdate($params, $data);
-	}
-	
-	public function actionCreate($params, $data)
-	{
-		if (!$this->getAcl()->check($this->name, 'edit')) {
-			throw new Forbidden();
-		}
+    protected function getEntityManager()
+    {
+        return $this->getContainer()->get('entityManager');
+    }
 
-		$service = $this->getRecordService();
-		
-		if ($entity = $service->createEntity($data)) {
-			return $entity->toArray();
-		}
+    protected function getRecordService($name = null)
+    {
+        if (empty($name)) {
+            $name = $this->name;
+        }
 
-		throw new Error();
-	}
+        if ($this->getServiceFactory()->checkExists($name)) {
+            $service = $this->getServiceFactory()->create($name);
+        } else {
+            $service = $this->getServiceFactory()->create('Record');
+            $service->setEntityName($name);
+        }
 
-	public function actionUpdate($params, $data)
-	{
-		if (!$this->getAcl()->check($this->name, 'edit')) {
-			throw new Forbidden();
-		}
-	
-		$id = $params['id'];		
-		
-		if ($entity = $this->getRecordService()->updateEntity($id, $data)) {
-			return $entity->toArray();
-		}
+        return $service;
+    }
 
-		throw new Error();
-	}
+    public function actionRead($params)
+    {
+        $id = $params['id'];
+        $entity = $this->getRecordService()->getEntity($id);
 
-	public function actionList($params, $data, $request)
-	{
-		if (!$this->getAcl()->check($this->name, 'read')) {
-			throw new Forbidden();
-		}
+        if (empty($entity)) {
+            throw new NotFound();
+        }
 
-		$where = $request->get('where');
-		$offset = $request->get('offset');
-		$maxSize = $request->get('maxSize');
-		$asc = $request->get('asc') === 'true';
-		$sortBy = $request->get('sortBy');
-		$q = $request->get('q');
-		
-		if (empty($maxSize)) {
-			$maxSize = self::MAX_SIZE_LIMIT;
-		}
-		if (!empty($maxSize) && $maxSize > self::MAX_SIZE_LIMIT) {
-			throw new Forbidden();
-		}
+        return $entity->toArray();
+    }
 
-		$result = $this->getRecordService()->findEntities(array(
-			'where' => $where,
-			'offset' => $offset,
-			'maxSize' => $maxSize,
-			'asc' => $asc,
-			'sortBy' => $sortBy,
-			'q' => $q,
-		));
-		
-		return array(
-			'total' => $result['total'],
-			'list' => $result['collection']->toArray()
-		);
-	}
-	
-	public function actionListLinked($params, $data, $request)
-	{
-		$id = $params['id'];
-		$link = $params['link'];		
+    public function actionPatch($params, $data)
+    {
+        return $this->actionUpdate($params, $data);
+    }
 
-		$where = $request->get('where');
-		$offset = $request->get('offset');
-		$maxSize = $request->get('maxSize');
-		$asc = $request->get('asc') === 'true';
-		$sortBy = $request->get('sortBy');
-		$q = $request->get('q');
-		
-		if (empty($maxSize)) {
-			$maxSize = self::MAX_SIZE_LIMIT;
-		}
-		if (!empty($maxSize) && $maxSize > self::MAX_SIZE_LIMIT) {
-			throw new Forbidden();
-		}	
+    public function actionCreate($params, $data)
+    {
+        if (!$this->getAcl()->check($this->name, 'edit')) {
+            throw new Forbidden();
+        }
 
-		$result = $this->getRecordService()->findLinkedEntities($id, $link, array(
-			'where' => $where,
-			'offset' => $offset,
-			'maxSize' => $maxSize,
-			'asc' => $asc,
-			'sortBy' => $sortBy,
-			'q' => $q,
-		));
-		
-		
-		return array(
-			'total' => $result['total'],
-			'list' => $result['collection']->toArray()
-		);
-	}
+        $service = $this->getRecordService();
 
-	public function actionDelete($params)
-	{
-		$id = $params['id'];
+        if ($entity = $service->createEntity($data)) {
+            return $entity->toArray();
+        }
 
-		if ($this->getRecordService()->deleteEntity($id)) {
-			return true;
-		}
-		throw new Error();
-	}
-	
-	public function actionExport($params, $data, $request)
-	{
-		// TODO move to service
-		
-		if (!$this->getAcl()->check($this->name, 'read')) {
-			throw new Forbidden();
-		}		
-	
-		$ids = $request->get('ids');
-		$where = $request->get('where');
-		
-		return array(
-			'id' => $this->getRecordService()->export($ids, $where)
-		);		
-	}
+        throw new Error();
+    }
 
-	public function actionMassUpdate($params, $data)
-	{
-		if (!$this->getAcl()->check($this->name, 'edit')) {
-			throw new Forbidden();
-		}		
+    public function actionUpdate($params, $data)
+    {
+        if (!$this->getAcl()->check($this->name, 'edit')) {
+            throw new Forbidden();
+        }
 
-		$ids = $data['ids'];
-		$where = $data['where'];
-		$attributes = $data['attributes'];
+        $id = $params['id'];
 
-		$idsUpdated = $this->getRecordService()->massUpdate($attributes, $ids, $where);
+        if ($entity = $this->getRecordService()->updateEntity($id, $data)) {
+            return $entity->toArray();
+        }
 
-		return $idsUpdated;
-	}
+        throw new Error();
+    }
 
-	public function actionMassDelete($params, $data)
-	{
-		if (!$this->getAcl()->check($this->name, 'delete')) {
-			throw new Forbidden();
-		}
+    public function actionList($params, $data, $request)
+    {
+        if (!$this->getAcl()->check($this->name, 'read')) {
+            throw new Forbidden();
+        }
 
-		$ids = $data['ids'];
-		$where = $data['where'];
+        $where = $request->get('where');
+        $offset = $request->get('offset');
+        $maxSize = $request->get('maxSize');
+        $asc = $request->get('asc') === 'true';
+        $sortBy = $request->get('sortBy');
+        $q = $request->get('q');
 
-		$idsDeleted = $this->getRecordService()->massDelete($ids, $where);
+        if (empty($maxSize)) {
+            $maxSize = self::MAX_SIZE_LIMIT;
+        }
+        if (!empty($maxSize) && $maxSize > self::MAX_SIZE_LIMIT) {
+            throw new Forbidden();
+        }
 
-		return $idsDeleted;
-	}
+        $result = $this->getRecordService()->findEntities(array(
+            'where' => $where,
+            'offset' => $offset,
+            'maxSize' => $maxSize,
+            'asc' => $asc,
+            'sortBy' => $sortBy,
+            'q' => $q,
+        ));
 
-	public function actionCreateLink($params, $data)
-	{
-		$id = $params['id'];
-		$link = $params['link'];
-		
-		$foreignIds = array();		
-		if (isset($data['id'])) {
-			$foreignIds[] = $data['id'];
-		}		
-		if (isset($data['ids']) && is_array($data['ids'])) {
-			foreach ($data['ids'] as $foreignId) {
-				$foreignIds[] = $foreignId;
-			}
-		}		
-		
-		$result = false;
-		foreach ($foreignIds as $foreignId) {
-			if ($this->getRecordService()->linkEntity($id, $link, $foreignId)) {
-				$result = $result || true;
-			}
-		}
-		if ($result) {
-			return true;
-		}	
-		
-		throw new Error();		
-	}
-	
-	public function actionRemoveLink($params, $data)
-	{
-		$id = $params['id'];
-		$link = $params['link'];
-		
-		$foreignIds = array();		
-		if (isset($data['id'])) {
-			$foreignIds[] = $data['id'];
-		}		
-		if (isset($data['ids']) && is_array($data['ids'])) {
-			foreach ($data['ids'] as $foreignId) {
-				$foreignIds[] = $foreignId;
-			}
-		}
-		
-		$result = false;
-		foreach ($foreignIds as $foreignId) {
-			if ($this->getRecordService()->unlinkEntity($id, $link, $foreignId)) {
-				$result = $result || true;
-			}
-		}
-		if ($result) {
-			return true;
-		}	
-		
-		throw new Error();		
-	}
-	
-	public function actionFollow($params)
-	{
-		if (!$this->getAcl()->check($this->name, 'read')) {
-			throw new Forbidden();
-		}
-		$id = $params['id'];
-		return $this->getRecordService()->follow($id);		
-	}
-	
-	public function actionUnfollow($params)
-	{
-		if (!$this->getAcl()->check($this->name, 'read')) {
-			throw new Forbidden();
-		}
-		$id = $params['id'];
-		return $this->getRecordService()->unfollow($id);		
-	}
+        return array(
+            'total' => $result['total'],
+            'list' => $result['collection']->toArray()
+        );
+    }
+
+    public function actionListLinked($params, $data, $request)
+    {
+        $id = $params['id'];
+        $link = $params['link'];
+
+        $where = $request->get('where');
+        $offset = $request->get('offset');
+        $maxSize = $request->get('maxSize');
+        $asc = $request->get('asc') === 'true';
+        $sortBy = $request->get('sortBy');
+        $q = $request->get('q');
+
+        if (empty($maxSize)) {
+            $maxSize = self::MAX_SIZE_LIMIT;
+        }
+        if (!empty($maxSize) && $maxSize > self::MAX_SIZE_LIMIT) {
+            throw new Forbidden();
+        }
+
+        $result = $this->getRecordService()->findLinkedEntities($id, $link, array(
+            'where' => $where,
+            'offset' => $offset,
+            'maxSize' => $maxSize,
+            'asc' => $asc,
+            'sortBy' => $sortBy,
+            'q' => $q,
+        ));
+
+
+        return array(
+            'total' => $result['total'],
+            'list' => $result['collection']->toArray()
+        );
+    }
+
+    public function actionDelete($params)
+    {
+        $id = $params['id'];
+
+        if ($this->getRecordService()->deleteEntity($id)) {
+            return true;
+        }
+        throw new Error();
+    }
+
+    public function actionExport($params, $data, $request)
+    {
+        if ($this->getConfig()->get('disableExport') && !$this->getUser()->isAdmin()) {
+            throw new Forbidden();
+        }
+
+        if (!$this->getAcl()->check($this->name, 'read')) {
+            throw new Forbidden();
+        }
+
+        $ids = $request->get('ids');
+        $where = $request->get('where');
+
+        return array(
+            'id' => $this->getRecordService()->export($ids, $where)
+        );
+    }
+
+    public function actionMassUpdate($params, $data, $request)
+    {
+        if (!$this->getAcl()->check($this->name, 'edit')) {
+            throw new Forbidden();
+        }
+
+        $ids = $data['ids'];
+        $where = $data['where'];
+        $attributes = $data['attributes'];
+
+        $idsUpdated = $this->getRecordService()->massUpdate($attributes, $ids, $where);
+
+        return $idsUpdated;
+    }
+
+    public function actionMassDelete($params, $data, $request)
+    {
+        if (!$this->getAcl()->check($this->name, 'delete')) {
+            throw new Forbidden();
+        }
+
+        $ids = $data['ids'];
+        $where = $data['where'];
+
+        $idsRemoved = $this->getRecordService()->massRemove($ids, $where);
+
+        return $idsRemoved;
+    }
+
+    public function actionCreateLink($params, $data)
+    {
+        $id = $params['id'];
+        $link = $params['link'];
+
+        $foreignIds = array();
+        if (isset($data['id'])) {
+            $foreignIds[] = $data['id'];
+        }
+        if (isset($data['ids']) && is_array($data['ids'])) {
+            foreach ($data['ids'] as $foreignId) {
+                $foreignIds[] = $foreignId;
+            }
+        }
+
+        $result = false;
+        foreach ($foreignIds as $foreignId) {
+            if ($this->getRecordService()->linkEntity($id, $link, $foreignId)) {
+                $result = $result || true;
+            }
+        }
+        if ($result) {
+            return true;
+        }
+
+        throw new Error();
+    }
+
+    public function actionRemoveLink($params, $data)
+    {
+        $id = $params['id'];
+        $link = $params['link'];
+
+        $foreignIds = array();
+        if (isset($data['id'])) {
+            $foreignIds[] = $data['id'];
+        }
+        if (isset($data['ids']) && is_array($data['ids'])) {
+            foreach ($data['ids'] as $foreignId) {
+                $foreignIds[] = $foreignId;
+            }
+        }
+
+        $result = false;
+        foreach ($foreignIds as $foreignId) {
+            if ($this->getRecordService()->unlinkEntity($id, $link, $foreignId)) {
+                $result = $result || true;
+            }
+        }
+        if ($result) {
+            return true;
+        }
+
+        throw new Error();
+    }
+
+    public function actionFollow($params)
+    {
+        if (!$this->getAcl()->check($this->name, 'read')) {
+            throw new Forbidden();
+        }
+        $id = $params['id'];
+        return $this->getRecordService()->follow($id);
+    }
+
+    public function actionUnfollow($params)
+    {
+        if (!$this->getAcl()->check($this->name, 'read')) {
+            throw new Forbidden();
+        }
+        $id = $params['id'];
+        return $this->getRecordService()->unfollow($id);
+    }
 }
 

application/Espo/Core/Cron/ScheduledJob.php

@@ -23,163 +23,163 @@
 namespace Espo\Core\Cron;
 
 use Espo\Core\Exceptions\NotFound,
-	Espo\Core\Utils\Util;
+    Espo\Core\Utils\Util;
 
 class ScheduledJob
 {
-	private $container;
-	private $systemUtil;
+    private $container;
+    private $systemUtil;
 
-	protected $data = null;
+    protected $data = null;
 
-	protected $cacheFile = 'data/cache/application/jobs.php';
+    protected $cacheFile = 'data/cache/application/jobs.php';
 
-	protected $cronFile = 'cron.php';
+    protected $cronFile = 'cron.php';
 
-	protected $allowedMethod = 'run';
+    protected $allowedMethod = 'run';
 
-	/**
-	 * @var array - path to cron job files
-	 */
-	private $paths = array(
-		'corePath' => 'application/Espo/Jobs',
-		'modulePath' => 'application/Espo/Modules/{*}/Jobs',
-		'customPath' => 'custom/Espo/Custom/Jobs',
-	);
+    /**
+     * @var array - path to cron job files
+     */
+    private $paths = array(
+        'corePath' => 'application/Espo/Jobs',
+        'modulePath' => 'application/Espo/Modules/{*}/Jobs',
+        'customPath' => 'custom/Espo/Custom/Jobs',
+    );
 
-	protected $cronSetup = array(
-		'linux' => '* * * * * {PHP-BIN-DIR} -f {CRON-FILE} > /dev/null 2>&1',
-		'windows' => '{PHP-BIN-DIR}.exe -f {CRON-FILE}',
-		'mac' => '* * * * * {PHP-BIN-DIR} -f {CRON-FILE} > /dev/null 2>&1',
-		'default' => '* * * * * {PHP-BIN-DIR} -f {CRON-FILE}',
-	);
+    protected $cronSetup = array(
+        'linux' => '* * * * * {PHP-BIN-DIR} -f {CRON-FILE} > /dev/null 2>&1',
+        'windows' => '{PHP-BIN-DIR}.exe -f {CRON-FILE}',
+        'mac' => '* * * * * {PHP-BIN-DIR} -f {CRON-FILE} > /dev/null 2>&1',
+        'default' => '* * * * * {PHP-BIN-DIR} -f {CRON-FILE}',
+    );
 
 
-	public function __construct(\Espo\Core\Container $container)
-	{
-		$this->container = $container;
-		$this->systemUtil = new \Espo\Core\Utils\System();
-	}
+    public function __construct(\Espo\Core\Container $container)
+    {
+        $this->container = $container;
+        $this->systemUtil = new \Espo\Core\Utils\System();
+    }
 
-	protected function getContainer()
-	{
-		return $this->container;
-	}
+    protected function getContainer()
+    {
+        return $this->container;
+    }
 
-	protected function getEntityManager()
-	{
-		return $this->container->get('entityManager');
-	}
+    protected function getEntityManager()
+    {
+        return $this->container->get('entityManager');
+    }
 
-	protected function getSystemUtil()
-	{
-		return $this->systemUtil;
-	}
+    protected function getSystemUtil()
+    {
+        return $this->systemUtil;
+    }
 
-	public function run(array $job)
-	{
-		$jobName = $job['method'];
+    public function run(array $job)
+    {
+        $jobName = $job['method'];
 
-		$className = $this->getClassName($jobName);
-		if ($className === false) {
-			throw new NotFound();
-		}
+        $className = $this->getClassName($jobName);
+        if ($className === false) {
+            throw new NotFound();
+        }
 
-		$jobClass = new $className($this->container);
-		$method = $this->allowedMethod;
+        $jobClass = new $className($this->container);
+        $method = $this->allowedMethod;
 
-		$jobClass->$method();
-	}
+        $jobClass->$method();
+    }
 
-	/**
-	 * Get list of all jobs
-	 *
-	 * @return array
-	 */
-	public function getAll()
-	{
-		if (!isset($this->data)) {
-			$this->init();
-		}
+    /**
+     * Get list of all jobs
+     *
+     * @return array
+     */
+    public function getAll()
+    {
+        if (!isset($this->data)) {
+            $this->init();
+        }
 
-		return $this->data;
-	}
+        return $this->data;
+    }
 
-	/**
-	 * Get class name of a job by name
-	 *
-	 * @param  string $name
-	 * @return string
-	 */
-	public function get($name)
-	{
-		return $this->getClassName($name);
-	}
+    /**
+     * Get class name of a job by name
+     *
+     * @param  string $name
+     * @return string
+     */
+    public function get($name)
+    {
+        return $this->getClassName($name);
+    }
 
-	/**
-	 * Get list of all job names
-	 *
-	 * @return array
-	 */
-	public function getAllNamesOnly()
-	{
-		$data = $this->getAll();
+    /**
+     * Get list of all job names
+     *
+     * @return array
+     */
+    public function getAllNamesOnly()
+    {
+        $data = $this->getAll();
 
-		$namesOnly = array_keys($data);
+        $namesOnly = array_keys($data);
 
-		return $namesOnly;
-	}
+        return $namesOnly;
+    }
 
-	/**
-	 * Get class name of a job
-	 *
-	 * @param  string $name
-	 * @return string
-	 */
-	protected function getClassName($name)
-	{
-		$name = Util::normilizeClassName($name);
+    /**
+     * Get class name of a job
+     *
+     * @param  string $name
+     * @return string
+     */
+    protected function getClassName($name)
+    {
+        $name = Util::normilizeClassName($name);
 
-		$data = $this->getAll();
+        $data = $this->getAll();
 
-		$name = ucfirst($name);
-		if (isset($data[$name])) {
-			return $data[$name];
-		}
+        $name = ucfirst($name);
+        if (isset($data[$name])) {
+            return $data[$name];
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Load scheduler classes. It loads from ...Jobs, ex. \Espo\Jobs
-	 * @return null
-	 */
-	protected function init()
-	{
-		$classParser = $this->getContainer()->get('classParser');
-		$classParser->setAllowedMethods( array($this->allowedMethod) );
-		$this->data = $classParser->getData($this->paths, $this->cacheFile);
-	}
+    /**
+     * Load scheduler classes. It loads from ...Jobs, ex. \Espo\Jobs
+     * @return null
+     */
+    protected function init()
+    {
+        $classParser = $this->getContainer()->get('classParser');
+        $classParser->setAllowedMethods( array($this->allowedMethod) );
+        $this->data = $classParser->getData($this->paths, $this->cacheFile);
+    }
 
 
-	public function getSetupMessage()
-	{
-		$language = $this->getContainer()->get('language');
+    public function getSetupMessage()
+    {
+        $language = $this->getContainer()->get('language');
 
-		$OS = $this->getSystemUtil()->getOS();
-		$phpBin = $this->getSystemUtil()->getPhpBin();
-		$cronFile = Util::concatPath($this->getSystemUtil()->getRootDir(), $this->cronFile);
-		$desc = $language->translate('cronSetup', 'options', 'ScheduledJob');
+        $OS = $this->getSystemUtil()->getOS();
+        $phpBin = $this->getSystemUtil()->getPhpBin();
+        $cronFile = Util::concatPath($this->getSystemUtil()->getRootDir(), $this->cronFile);
+        $desc = $language->translate('cronSetup', 'options', 'ScheduledJob');
 
-		$message = isset($desc[$OS]) ? $desc[$OS] : $desc['default'];
+        $message = isset($desc[$OS]) ? $desc[$OS] : $desc['default'];
 
-		$command = isset($this->cronSetup[$OS]) ? $this->cronSetup[$OS] : $this->cronSetup['default'];
-		$command = str_replace(array('{PHP-BIN-DIR}', '{CRON-FILE}'), array($phpBin, $cronFile), $command);
+        $command = isset($this->cronSetup[$OS]) ? $this->cronSetup[$OS] : $this->cronSetup['default'];
+        $command = str_replace(array('{PHP-BIN-DIR}', '{CRON-FILE}'), array($phpBin, $cronFile), $command);
 
-		return array(
-			'message' => $message,
-			'command' => $command,
-		);
-	}
+        return array(
+            'message' => $message,
+            'command' => $command,
+        );
+    }
 
 }

application/Espo/Core/Cron/Service.php

@@ -18,50 +18,50 @@
  *
  * 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;
 
 use Espo\Core\Utils\Json,
-	Espo\Core\Exceptions\NotFound;
+    Espo\Core\Exceptions\NotFound;
 
 class Service
 {
-	private $serviceFactory;
+    private $serviceFactory;
 
-	public function __construct(\Espo\Core\ServiceFactory $serviceFactory)
-	{
-		$this->serviceFactory = $serviceFactory;
-	}
+    public function __construct(\Espo\Core\ServiceFactory $serviceFactory)
+    {
+        $this->serviceFactory = $serviceFactory;
+    }
 
-	protected function getServiceFactory()
-	{
-		return $this->serviceFactory;
-	}
+    protected function getServiceFactory()
+    {
+        return $this->serviceFactory;
+    }
 
 
 
-	public function run($job)
-	{
-		$serviceName = $job['service_name'];
+    public function run($job)
+    {
+        $serviceName = $job['service_name'];
 
-		if (!$this->getServiceFactory()->checkExists($serviceName)) {
-			throw new NotFound(); 										
-		}
+        if (!$this->getServiceFactory()->checkExists($serviceName)) {
+            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();					
-		}	
+        if (!method_exists($service, $serviceMethod)) {
+            throw new NotFound();
+        }
 
-		$data = $job['data'];
-		if (Json::isJSON($data)) {
-			$data = Json::decode($data, true);
-		}
+        $data = $job['data'];
+        if (Json::isJSON($data)) {
+            $data = Json::decode($data, true);
+        }
 
-		$service->$serviceMethod($data);		
-	}
+        $service->$serviceMethod($data);
+    }
 
 }

application/Espo/Core/CronManager.php

@@ -24,189 +24,192 @@ namespace Espo\Core;
 
 class CronManager
 {
-	private $container;
-	private $config;
-	private $fileManager;
+    private $container;
+    private $config;
+    private $fileManager;
 
-	private $scheduledJobCron;
-	private $serviceCron;
+    private $scheduledJobCron;
+    private $serviceCron;
 
-	private $jobService;
-	private $scheduledJobService;
+    private $jobService;
+    private $scheduledJobService;
 
-	protected $lastRunTime = 'data/cache/application/cronLastRunTime.php';
+    const PENDING = 'Pending';
+    const RUNNING = 'Running';
+    const SUCCESS = 'Success';
+    const FAILED = 'Failed';
+
+    protected $lastRunTime = 'data/cache/application/cronLastRunTime.php';
 
 
-	public function __construct(\Espo\Core\Container $container)
-	{
-		$this->container = $container;
+    public function __construct(\Espo\Core\Container $container)
+    {
+        $this->container = $container;
 
-		$this->config = $this->container->get('config');
-		$this->fileManager = $this->container->get('fileManager');
+        $this->config = $this->container->get('config');
+        $this->fileManager = $this->container->get('fileManager');
 
-		$this->scheduledJobCron = $this->container->get('scheduledJob');
-		$this->serviceCron = new \Espo\Core\Cron\Service( $this->container->get('serviceFactory'));
+        $this->scheduledJobCron = $this->container->get('scheduledJob');
+        $this->serviceCron = new \Espo\Core\Cron\Service( $this->container->get('serviceFactory'));
 
-		$this->jobService = $this->container->get('serviceFactory')->create('job');
-		$this->scheduledJobService = $this->container->get('serviceFactory')->create('scheduledJob');
-	}
+        $this->jobService = $this->container->get('serviceFactory')->create('job');
+        $this->scheduledJobService = $this->container->get('serviceFactory')->create('scheduledJob');
+    }
 
-	protected function getContainer()
-	{
-		return $this->container;
-	}
+    protected function getContainer()
+    {
+        return $this->container;
+    }
 
-	protected function getConfig()
-	{
-		return $this->config;
-	}
+    protected function getConfig()
+    {
+        return $this->config;
+    }
 
-	protected function getFileManager()
-	{
-		return $this->fileManager;
-	}
+    protected function getFileManager()
+    {
+        return $this->fileManager;
+    }
 
-	protected function getJobService()
-	{
-		return $this->jobService;
-	}
+    protected function getJobService()
+    {
+        return $this->jobService;
+    }
 
-	protected function getScheduledJobService()
-	{
-		return $this->scheduledJobService;
-	}
+    protected function getScheduledJobService()
+    {
+        return $this->scheduledJobService;
+    }
 
-	protected function getScheduledJobCron()
-	{
-		return $this->scheduledJobCron;
-	}
+    protected function getScheduledJobCron()
+    {
+        return $this->scheduledJobCron;
+    }
 
-	protected function getServiceCron()
-	{
-		return $this->serviceCron;
-	}
+    protected function getServiceCron()
+    {
+        return $this->serviceCron;
+    }
 
 
-	protected function getLastRunTime()
-	{
-		$lastRunTime = $this->getFileManager()->getContents($this->lastRunTime);
-		if (!is_int($lastRunTime)) {
-			$lastRunTime = time() - (intval($this->getConfig()->get('cron.minExecutionTime')) + 60);
-		}
+    protected function getLastRunTime()
+    {
+        $lastRunTime = $this->getFileManager()->getContents($this->lastRunTime);
+        if (!is_int($lastRunTime)) {
+            $lastRunTime = time() - (intval($this->getConfig()->get('cron.minExecutionTime')) + 60);
+        }
 
-		return $lastRunTime;
-	}
+        return $lastRunTime;
+    }
 
-	protected function setLastRunTime($time)
-	{
-		return $this->getFileManager()->putContentsPHP($this->lastRunTime, $time);
-	}
+    protected function setLastRunTime($time)
+    {
+        return $this->getFileManager()->putContentsPHP($this->lastRunTime, $time);
+    }
 
-	protected function checkLastRunTime()
-	{
-		$currentTime = time();
-		$lastRunTime = $this->getLastRunTime();
-		$minTime = $this->getConfig()->get('cron.minExecutionTime');
+    protected function checkLastRunTime()
+    {
+        $currentTime = time();
+        $lastRunTime = $this->getLastRunTime();
+        $minTime = $this->getConfig()->get('cron.minExecutionTime');
 
-		if ($currentTime > ($lastRunTime + $minTime) ) {
-			return true;
-		}
+        if ($currentTime > ($lastRunTime + $minTime) ) {
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
 
-	public function run()
-	{
-		if (!$this->checkLastRunTime()) {
-			$GLOBALS['log']->info('Cron Manager: Stop cron running, too frequency execution');
-			return; //stop cron running, too frequency execution
-		}
+    public function run()
+    {
+        if (!$this->checkLastRunTime()) {
+            $GLOBALS['log']->info('Cron Manager: Stop cron running, too frequency execution');
+            return; //stop cron running, too frequency execution
+        }
 
-		$this->setLastRunTime(time());
+        $this->setLastRunTime(time());
 
-		//Check scheduled jobs and create related jobs
-		$this->createJobsFromScheduledJobs();
+        //Check scheduled jobs and create related jobs
+        $this->createJobsFromScheduledJobs();
 
+        $pendingJobs = $this->getJobService()->getPendingJobs();
 
-		$pendingJobs = $this->getJobService()->getPendingJobs();
+        foreach ($pendingJobs as $job) {
 
-		foreach ($pendingJobs as $job) {
+            $this->getJobService()->updateEntity($job['id'], array(
+                'status' => self::RUNNING,
+            ));
 
-			$this->getJobService()->updateEntity($job['id'], array(
-				'status' => 'Running',
-			));
+            $isSuccess = true;
 
-			$isSuccess = true;
+            try {
+                if (!empty($job['scheduled_job_id'])) {
+                    $this->getScheduledJobCron()->run($job);
+                } else {
+                    $this->getServiceCron()->run($job);
+                }
+            } catch (\Exception $e) {
+                $isSuccess = false;
+                $GLOBALS['log']->error('Failed job running, job ['.$job['id'].']. Error Details: '.$e->getMessage());
+            }
 
-			try {
-				if (!empty($job['scheduled_job_id'])) {
-					$this->getScheduledJobCron()->run($job);
-				} else {
-					$this->getServiceCron()->run($job);
-				}
-			} catch (\Exception $e) {
-				$isSuccess = false;
-				$GLOBALS['log']->error('Failed job running, job ['.$job['id'].']. Error Details: '.$e->getMessage());
-			}
+            $status = $isSuccess ? self::SUCCESS : self::FAILED;
 
-			$status = $isSuccess ? 'Success' : 'Failed';
+            $this->getJobService()->updateEntity($job['id'], array(
+                'status' => $status,
+            ));
 
-			$this->getJobService()->updateEntity($job['id'], array(
-				'status' => $status,
-			));
+            //set status in the schedulerJobLog
+            if (!empty($job['scheduled_job_id'])) {
+                $this->getScheduledJobService()->addLogRecord($job['scheduled_job_id'], $status);
+            }
+        }
 
-			//set status in the schedulerJobLog
-			if (!empty($job['scheduled_job_id'])) {
-				$this->getScheduledJobService()->addLogRecord($job['scheduled_job_id'], $status);
-			}
-		}
+    }
 
-	}
+    /**
+     * Check scheduled jobs and create related jobs
+     * @return array List of created Jobs
+     */
+    protected function createJobsFromScheduledJobs()
+    {
+        $activeScheduledJobs = $this->getScheduledJobService()->getActiveJobs();
 
-	/**
-	 * Check scheduled jobs and create related jobs
-	 * @return array List of created Jobs
-	 */
-	protected function createJobsFromScheduledJobs()
-	{
-		$activeScheduledJobs = $this->getScheduledJobService()->getActiveJobs();
+        $createdJobs = array();
+        foreach ($activeScheduledJobs as $scheduledJob) {
 
-		$createdJobs = array();
-		foreach ($activeScheduledJobs as $scheduledJob) {
+            $scheduling = $scheduledJob['scheduling'];
 
-			$scheduling = $scheduledJob['scheduling'];
+            $cronExpression = \Cron\CronExpression::factory($scheduling);
 
-			$cronExpression = \Cron\CronExpression::factory($scheduling);
+            try {
+                $prevDate = $cronExpression->getPreviousRunDate()->format('Y-m-d H:i:s');
+            } catch (\Exception $e) {
+                $GLOBALS['log']->error('ScheduledJob ['.$scheduledJob['id'].']: CronExpression - Impossible CRON expression ['.$scheduling.']');
+                continue;
+            }
 
-			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.']');
-				continue;
-			}
+            if ($cronExpression->isDue()) {
+                $prevDate = date('Y-m-d H:i:00');
+            }
 
-			if ($cronExpression->isDue()) {
-				$prevDate = date('Y-m-d H:i:00');
-			}
+            $existsJob = $this->getJobService()->getJobByScheduledJob($scheduledJob['id'], $prevDate);
 
-			$existsJob = $this->getJobService()->getJobByScheduledJob($scheduledJob['id'], $prevDate);
+            if (!isset($existsJob) || empty($existsJob)) {
+                //create a job
+                $data = array(
+                    'name' => $scheduledJob['name'],
+                    'status' => self::PENDING,
+                    'scheduledJobId' => $scheduledJob['id'],
+                    'executeTime' => $prevDate,
+                    'method' => $scheduledJob['job'],
+                );
+                $createdJobs[] = $this->getJobService()->createEntity($data);
+            }
+        }
 
-			if (!isset($existsJob) || empty($existsJob)) {
-				//create a job
-				$data = array(
-					'name' => $scheduledJob['name'],
-					'status' => 'Pending',
-					'scheduledJobId' => $scheduledJob['id'],
-					'executeTime' => $prevDate,
-					'method' => $scheduledJob['job'],
-				);
-				$createdJobs[] = $this->getJobService()->createEntity($data);
-			}
-		}
-
-		return $createdJobs;
-	}
+        return $createdJobs;
+    }
 }
 

application/Espo/Core/DataManager.php

@@ -24,105 +24,106 @@ namespace Espo\Core;
 
 class DataManager
 {
-	private $container;
+    private $container;
 
-	private $cachePath = 'data/cache';
+    private $cachePath = 'data/cache';
 
 
-	public function __construct(Container $container)
-	{
-		$this->container = $container;
-	}
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+    }
 
-	protected function getContainer()
-	{
-		return $this->container;
-	}
+    protected function getContainer()
+    {
+        return $this->container;
+    }
 
-	/**
-	 * Rebuild the system with metadata, database and cache clearing
-	 *
-	 * @return bool
-	 */
-	public function rebuild($entityList = null)
-	{
-		$result = $this->clearCache();
+    /**
+     * Rebuild the system with metadata, database and cache clearing
+     *
+     * @return bool
+     */
+    public function rebuild($entityList = null)
+    {
+        $result = $this->clearCache();
 
-		$result &= $this->rebuildMetadata();
+        $result &= $this->rebuildMetadata();
 
-		$result &= $this->rebuildDatabase($entityList);
+        $result &= $this->rebuildDatabase($entityList);
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Clear a cache
-	 *
-	 * @return bool
-	 */
-	public function clearCache()
-	{
-		$result = $this->getContainer()->get('fileManager')->removeInDir($this->cachePath);
+    /**
+     * Clear a cache
+     *
+     * @return bool
+     */
+    public function clearCache()
+    {
+        $result = $this->getContainer()->get('fileManager')->removeInDir($this->cachePath);
 
-		if ($result === false) {
-			throw new Exceptions\Error("Error while clearing cache");
-		}
+        if ($result != true) {
+            throw new Exceptions\Error("Error while clearing cache");
+        }
 
-		$this->updateCacheTimestamp();
+        $this->updateCacheTimestamp();
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Rebuild database
-	 *
-	 * @return bool
-	 */
-	public function rebuildDatabase($entityList = null)
-	{
-		try {
-			$result = $this->getContainer()->get('schema')->rebuild($entityList);
-		} catch (\Exception $e) {
-			$result = false;
-			$GLOBALS['log']->error('Fault to rebuild database schema'.'. Details: '.$e->getMessage());
-		}
+    /**
+     * Rebuild database
+     *
+     * @return bool
+     */
+    public function rebuildDatabase($entityList = null)
+    {
+        try {
+            $result = $this->getContainer()->get('schema')->rebuild($entityList);
+        } catch (\Exception $e) {
+            $result = false;
+            $GLOBALS['log']->error('Fault to rebuild database schema'.'. Details: '.$e->getMessage());
+        }
 
-		if ($result === false) {
-			throw new Exceptions\Error("Error while rebuilding database. See log file for details.");
-		}
+        if ($result != true) {
+            throw new Exceptions\Error("Error while rebuilding database. See log file for details.");
+        }
 
-		$this->updateCacheTimestamp();
+        $this->updateCacheTimestamp();
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Rebuild metadata
-	 *
-	 * @return bool
-	 */
-	public function rebuildMetadata()
-	{
-		$metadata = $this->getContainer()->get('metadata');
+    /**
+     * Rebuild metadata
+     *
+     * @return bool
+     */
+    public function rebuildMetadata()
+    {
+        $metadata = $this->getContainer()->get('metadata');
 
-		$metadata->init(true);
+        $metadata->init(true);
 
-		$ormMeta = $metadata->getOrmMetadata(true);
+        $ormMeta = $metadata->getOrmMetadata(true);
 
-		$this->updateCacheTimestamp();
+        $this->updateCacheTimestamp();
 
-		return empty($ormMeta) ? false : true;
-	}
+        return empty($ormMeta) ? false : true;
+    }
 
-	/**
-	 * Update cache timestamp
-	 *
-	 * @return bool
-	 */
-	public function updateCacheTimestamp()
-	{
-		return $this->getContainer()->get('config')->updateCacheTimestamp();
-	}
+    /**
+     * Update cache timestamp
+     *
+     * @return bool
+     */
+    public function updateCacheTimestamp()
+    {
+        $this->getContainer()->get('config')->updateCacheTimestamp();
+        $this->getContainer()->get('config')->save();
+        return true;
+    }
+}
 
-
-}

application/Espo/Core/Entities/Person.php

@@ -24,30 +24,30 @@ namespace Espo\Core\Entities;
 
 class Person extends \Espo\Core\ORM\Entity
 {
-	public static $person = true;
-	
-	public function setLastName($value)
-	{
-		$this->setValue('lastName', $value);
-		
-		$firstName = $this->get('firstName');
-		if (empty($firstName)) {
-			$this->setValue('name', $value);
-		} else {
-			$this->setValue('name', $firstName . ' ' . $value);
-		}
-	}
-	
-	public function setFirstName($value)
-	{
-		$this->setValue('firstName', $value);
-		
-		$lastName = $this->get('lastName');
-		if (empty($lastName)) {
-			$this->setValue('name', $value);
-		} else {
-			$this->setValue('name', $value . ' ' . $lastName);
-		}
-	}
+    public static $person = true;
+    
+    public function _setLastName($value)
+    {
+        $this->setValue('lastName', $value);
+        
+        $firstName = $this->get('firstName');
+        if (empty($firstName)) {
+            $this->setValue('name', $value);
+        } else {
+            $this->setValue('name', $firstName . ' ' . $value);
+        }
+    }
+    
+    public function _setFirstName($value)
+    {
+        $this->setValue('firstName', $value);
+        
+        $lastName = $this->get('lastName');
+        if (empty($lastName)) {
+            $this->setValue('name', $value);
+        } else {
+            $this->setValue('name', $value . ' ' . $lastName);
+        }
+    }
 }
 

application/Espo/Core/EntryPointManager.php

@@ -23,93 +23,93 @@
 namespace Espo\Core;
 
 use \Espo\Core\Exceptions\NotFound,
-	\Espo\Core\Utils\Util;
+    \Espo\Core\Utils\Util;
 
 
 class EntryPointManager
 {
-	private $container;	
-	
-	private $fileManager;	
+    private $container;    
+    
+    private $fileManager;    
 
-	protected $data = null;
+    protected $data = null;
 
-	protected $cacheFile = 'data/cache/application/entryPoints.php';
+    protected $cacheFile = 'data/cache/application/entryPoints.php';
 
-	protected $allowedMethods = array(
-		'run',
-	);	
+    protected $allowedMethods = array(
+        'run',
+    );    
 
-	/**
+    /**
      * @var array - path to entryPoint files
      */
-	private $paths = array(
-		'corePath' => 'application/Espo/EntryPoints',
-    	'modulePath' => 'application/Espo/Modules/{*}/EntryPoints',
-    	'customPath' => 'custom/Espo/Custom/EntryPoints',	                              			
-	);
+    private $paths = array(
+        'corePath' => 'application/Espo/EntryPoints',
+        'modulePath' => 'application/Espo/Modules/{*}/EntryPoints',
+        'customPath' => 'custom/Espo/Custom/EntryPoints',                                              
+    );
 
 
-	public function __construct(\Espo\Core\Container $container)
-	{
-		$this->container = $container;		
-		$this->fileManager = $container->get('fileManager');		
-	}
+    public function __construct(\Espo\Core\Container $container)
+    {
+        $this->container = $container;        
+        $this->fileManager = $container->get('fileManager');        
+    }
 
-	protected function getContainer()
-	{
-		return $this->container;
-	}
+    protected function getContainer()
+    {
+        return $this->container;
+    }
 
-	protected function getFileManager()
-	{
-		return $this->fileManager;
-	}
+    protected function getFileManager()
+    {
+        return $this->fileManager;
+    }
 
-	public function checkAuthRequired($name)
-	{
-		$className = $this->getClassName($name);
-		if ($className === false) {
-			throw new NotFound();
-		}
-		return $className::$authRequired;		
-	}
+    public function checkAuthRequired($name)
+    {
+        $className = $this->getClassName($name);
+        if ($className === false) {
+            throw new NotFound();
+        }
+        return $className::$authRequired;        
+    }
 
-	public function run($name) 
-	{
-		$className = $this->getClassName($name);
-		if ($className === false) {
-			throw new NotFound();
-		}
-		$entryPoint = new $className($this->container);
+    public function run($name) 
+    {
+        $className = $this->getClassName($name);
+        if ($className === false) {
+            throw new NotFound();
+        }
+        $entryPoint = new $className($this->container);
 
-		$entryPoint->run();
-	}
+        $entryPoint->run();
+    }
 
-	protected function getClassName($name)
-	{
-		$name = Util::normilizeClassName($name);
-		
-		if (!isset($this->data)) {
-			$this->init();
-		}
+    protected function getClassName($name)
+    {
+        $name = Util::normilizeClassName($name);
+        
+        if (!isset($this->data)) {
+            $this->init();
+        }
 
-		$name = ucfirst($name);
-		if (isset($this->data[$name])) {
-			return $this->data[$name];
-		}
-		
+        $name = ucfirst($name);
+        if (isset($this->data[$name])) {
+            return $this->data[$name];
+        }
+        
         return false; 
-	}
+    }
 
 
-	protected function init()
-	{
-		$classParser = $this->getContainer()->get('classParser');
-		$classParser->setAllowedMethods($this->allowedMethods);
-		$this->data = $classParser->getData($this->paths, $this->cacheFile);
-	}	
-	 
+    protected function init()
+    {
+        $classParser = $this->getContainer()->get('classParser');
+        $classParser->setAllowedMethods($this->allowedMethods);
+        $this->data = $classParser->getData($this->paths, $this->cacheFile);
+    }    
+     
 
 }
 

application/Espo/Core/EntryPoints/Base.php

@@ -28,51 +28,51 @@ use \Espo\Core\Exceptions\Forbidden;
 
 abstract class Base
 {
-	private $container;
-	
-	public static $authRequired = true;
-	
-	protected function getContainer()
-	{
-		return $this->container;
-	}
-	
-	protected function getUser()
-	{
-		return $this->getContainer()->get('user');
-	}
-	
-	protected function getAcl()
-	{
-		return $this->getContainer()->get('acl');
-	}
-	
-	protected function getEntityManager()
-	{
-		return $this->getContainer()->get('entityManager');
-	}
-	
-	protected function getServiceFactory()
-	{
-		return $this->getContainer()->get('serviceFactory');
-	}	
-	
-	protected function getConfig()
-	{
-		return $this->getContainer()->get('config');
-	}
-	
-	protected function getMetadata()
-	{
-		return $this->getContainer()->get('metadata');
-	}	
-	
-	public function __construct(Container $container)
-	{
-		$this->container = $container;
-	}
-	
-	abstract public function run();	
+    private $container;
+    
+    public static $authRequired = true;
+    
+    protected function getContainer()
+    {
+        return $this->container;
+    }
+    
+    protected function getUser()
+    {
+        return $this->getContainer()->get('user');
+    }
+    
+    protected function getAcl()
+    {
+        return $this->getContainer()->get('acl');
+    }
+    
+    protected function getEntityManager()
+    {
+        return $this->getContainer()->get('entityManager');
+    }
+    
+    protected function getServiceFactory()
+    {
+        return $this->getContainer()->get('serviceFactory');
+    }    
+    
+    protected function getConfig()
+    {
+        return $this->getContainer()->get('config');
+    }
+    
+    protected function getMetadata()
+    {
+        return $this->getContainer()->get('metadata');
+    }    
+    
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+    }
+    
+    abstract public function run();    
 
 }
 

application/Espo/Core/Exceptions/BadRequest.php

@@ -24,7 +24,7 @@ namespace Espo\Core\Exceptions;
 
 class BadRequest extends \Exception
 {
-	protected $code = 400;
+    protected $code = 400;
 
 }
 

application/Espo/Core/Exceptions/Conflict.php

@@ -24,7 +24,7 @@ namespace Espo\Core\Exceptions;
 
 class Conflict extends \Exception
 {
-	protected $code = 409;
+    protected $code = 409;
 
 }
 

application/Espo/Core/Exceptions/Forbidden.php

@@ -24,7 +24,7 @@ namespace Espo\Core\Exceptions;
 
 class Forbidden extends \Exception
 {
-	protected $code = 403;
+    protected $code = 403;
 
 }
 

application/Espo/Core/Exceptions/InternalServerError.php

@@ -24,6 +24,6 @@ namespace Espo\Core\Exceptions;
 
 class InternalServerError extends \Exception
 {
-	protected $code = 500;
+    protected $code = 500;
 
 }

application/Espo/Core/Exceptions/NotFound.php

@@ -24,7 +24,7 @@ namespace Espo\Core\Exceptions;
 
 class NotFound extends \Exception
 {
-	protected $code = 404;
+    protected $code = 404;
 
 }
 

application/Espo/Core/Exceptions/Unauthorized.php

@@ -24,7 +24,7 @@ namespace Espo\Core\Exceptions;
 
 class Unauthorized extends \Exception
 {
-	protected $code = 401;
+    protected $code = 401;
 
 }
 

application/Espo/Core/ExtensionManager.php

@@ -0,0 +1,41 @@
+<?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;
+
+class ExtensionManager extends Upgrades\Base
+{
+    protected $name = 'Extension';
+
+    protected $params = array(
+        'packagePath' => 'data/upload/extensions',
+
+        'backupPath' => 'data/.backup/extensions',
+
+        'scriptNames' => array(
+            'before' => 'BeforeInstall',
+            'after' => 'AfterInstall',
+            'beforeUninstall' => 'BeforeUninstall',
+            'afterUninstall' => 'AfterUninstall',
+        )
+    );
+}

application/Espo/Core/ExternalAccount/ClientManager.php

@@ -0,0 +1,125 @@
+<?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\ExternalAccount;
+
+use \Espo\Core\Exceptions\Error;
+use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\NotFound;
+
+class ClientManager
+{
+    protected $entityManager;
+    
+    protected $metadata;
+    
+    protected $clientMap = array();
+    
+    public function __construct($entityManager, $metadata, $config)
+    {
+        $this->entityManager = $entityManager;
+        $this->metadata = $metadata;
+        $this->config = $config;
+    }
+    
+    protected function getMetadata()
+    {
+        return $this->metadata;
+    }
+    
+    protected function getEntityManager()
+    {
+        return $this->entityManager;
+    }
+    
+    protected function getConfig()
+    {
+        return $this->config;
+    }
+    
+    public function storeAccessToken($hash, $data)
+    {
+        if (!empty($this->clientMap[$hash]) && !empty($this->clientMap[$hash]['externalAccountEntity'])) {
+            $externalAccountEntity = $this->clientMap[$hash]['externalAccountEntity'];
+            $externalAccountEntity->set('accessToken', $data['accessToken']);
+            $externalAccountEntity->set('tokenType', $data['tokenType']);
+            $this->getEntityManager()->saveEntity($externalAccountEntity);
+        }
+    } 
+    
+    public function create($integration, $userId)
+    {
+        $authMethod = $this->getMetadata()->get("integrations.{$integration}.authMethod");        
+        $methodName = 'create' . ucfirst($authMethod);        
+        return $this->$methodName($integration, $userId);        
+    }
+    
+    protected function createOAuth2($integration, $userId)
+    {        
+        $integrationEntity = $this->getEntityManager()->getEntity('Integration', $integration);
+        $externalAccountEntity = $this->getEntityManager()->getEntity('ExternalAccount', $integration . '__' . $userId);
+        
+        $className = $this->getMetadata()->get("integrations.{$integration}.clientClassName");
+        
+        $redirectUri = $this->getConfig()->get('siteUrl') . '/oauthcallback'; // TODO move to client class
+        
+        if (!$externalAccountEntity) {
+            throw new Error("External Account {$integration} not found for {$userId}");
+        }
+        
+        if (!$integrationEntity->get('enabled')) {
+            return null;
+        }        
+        if (!$externalAccountEntity->get('enabled')) {
+            return null;
+        }        
+        
+        $oauth2Client = new \Espo\Core\ExternalAccount\OAuth2\Client();        
+                
+        $client = new $className($oauth2Client, array(
+            'endpoint' => $this->getMetadata()->get("integrations.{$integration}.params.endpoint"),
+            'tokenEndpoint' => $this->getMetadata()->get("integrations.{$integration}.params.tokenEndpoint"),
+            'clientId' => $integrationEntity->get('clientId'),
+            'clientSecret' => $integrationEntity->get('clientSecret'),
+            'redirectUri' => $redirectUri,
+            'accessToken' => $externalAccountEntity->get('accessToken'),
+            'refreshToken' => $externalAccountEntity->get('refreshToken'),
+            'tokenType' => $externalAccountEntity->get('tokenType'),
+        ), $this);
+        
+        $this->addToClientMap($client, $integrationEntity, $externalAccountEntity, $userId);
+        
+        return $client;        
+    }
+    
+    protected function addToClientMap($client, $integrationEntity, $externalAccountEntity, $userId)
+    {
+        $this->clientMap[spl_object_hash($client)] = array(
+            'client' => $client,
+            'userId' => $userId,
+            'integration' => $integrationEntity->id,
+            'integrationEntity' => $integrationEntity,
+            'externalAccountEntity' => $externalAccountEntity,
+        );
+    }
+}
+

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

@@ -0,0 +1,34 @@
+<?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\ExternalAccount\Clients;
+
+use \Espo\Core\Exceptions\Error;
+
+class Google extends OAuth2Abstract
+{
+    protected function getPingUrl()
+    {
+        return 'https://www.googleapis.com/calendar/v3/users/me/calendarList';
+    }
+}
+

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

@@ -0,0 +1,35 @@
+<?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\ExternalAccount\Clients;
+
+interface IClient
+{
+    public function getParam($name);
+    
+    public function setParam($name, $value);
+    
+    public function setParams(array $params);
+
+    public function ping();
+}
+

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

@@ -0,0 +1,209 @@
+<?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\ExternalAccount\Clients;
+
+use \Espo\Core\Exceptions\Error;
+
+use \Espo\Core\ExternalAccount\OAuth2\Client;
+
+abstract class OAuth2Abstract implements IClient
+{
+    protected $client = null;
+    
+    protected $manager = null;
+    
+    protected $paramList = array(
+        'endpoint',
+        'tokenEndpoint',
+        'clientId',
+        'clientSecret',
+        'tokenType',
+        'accessToken',
+        'refreshToken',
+        'redirectUri',
+    );
+    
+    protected $clientId = null;
+    
+    protected $clientSecret = null;
+    
+    protected $accessToken = null;
+    
+    protected $refreshToken = null;
+    
+    protected $redirectUri = null;
+    
+    public function __construct($client, array $params = array(), $manager = null)
+    {
+        $this->client = $client;
+
+        $this->setParams($params);
+        
+        $this->manager = $manager;
+    }
+    
+    public function getParam($name)
+    {
+        if (in_array($name, $this->paramList)) {
+            return $this->$name;
+        }
+    }
+    
+    public function setParam($name, $value)
+    {
+        if (in_array($name, $this->paramList)) {
+            $methodName = 'set' . ucfirst($name);
+            if (method_exists($this->client, $methodName)) {
+                $this->client->$methodName($value);
+            }
+            $this->$name = $value;
+        }
+    }
+    
+    public function setParams(array $params)
+    {
+        foreach ($this->paramList as $name) {
+            if (!empty($params[$name])) {
+                $this->setParam($name, $params[$name]);
+            }
+        }
+    }
+    
+    protected function afterTokenRefreshed($data)
+    {
+        if ($this->manager) {
+            $this->manager->storeAccessToken(spl_object_hash($this), $data);
+        }
+    }
+    
+    public function getAccessTokenFromAuthorizationCode($code)
+    {
+        $r = $this->client->getAccessToken($this->getParam('tokenEndpoint'), Client::GRANT_TYPE_AUTHORIZATION_CODE, array(
+            'code' => $code,
+            'redirect_uri' => $this->getParam('redirectUri')
+        ));
+        
+        
+        if ($r['code'] == 200) {
+            $data = array();
+            if (!empty($r['result'])) {
+                $data['accessToken'] = $r['result']['access_token'];
+                $data['tokenType'] = $r['result']['token_type'];
+                $data['refreshToken'] = $r['result']['refresh_token'];        
+            }
+            return $data;
+        }
+        return null;
+    }
+    
+    abstract protected function getPingUrl();
+    
+    public function ping()
+    {
+        if (empty($this->accessToken) || empty($this->clientId) || empty($this->clientSecret)) {
+            return false;
+        }
+        
+        $url = $this->getPingUrl();
+
+        try {
+            $this->request($url);
+            return true;
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+    
+    public function request($url, $params = array(), $httpMethod = Client::HTTP_METHOD_GET, $allowRenew = true)
+    {
+        $r = $this->client->request($url, $params, $httpMethod);
+        
+        $code = null;
+        if (!empty($r['code'])) {
+            $code = $r['code'];
+        }        
+        
+        if ($code == 200) {
+            return $r['result'];
+        } else {
+            $handledData = $this->handleErrorResponse($r);
+            
+            if ($allowRenew && is_array($handledData)) {
+                if ($handledData['action'] == 'refreshToken') {
+                    if ($this->refreshToken()) {                
+                        return $this->request($url, $params, $httpMethod, false);                        
+                    }
+                } else if ($handledData['action'] == 'renew') {
+                    return $this->request($url, $params, $httpMethod, false);    
+                }
+            }
+        }
+        
+        throw new Error("Error after requesting {$httpMethod} {$url}.", $code);
+    }
+    
+    protected function refreshToken()
+    {
+        if (!empty($this->refreshToken)) {
+            $r = $this->client->getAccessToken($this->getParam('tokenEndpoint'), Client::GRANT_TYPE_REFRESH_TOKEN, array(
+                'refresh_token' => $this->refreshToken,
+            ));
+            if ($r['code'] == 200) {
+                if (is_array($r['result'])) {
+                    if (!empty($r['result']['access_token'])) {
+                        $data = array();
+                        $data['accessToken'] = $r['result']['access_token'];
+                        $data['tokenType'] = $r['result']['token_type'];
+
+                        $this->setParams($data);
+                        $this->afterTokenRefreshed($data);
+                        return true;
+                    }
+                }
+            }
+        }
+    }
+    
+    protected function handleErrorResponse($r)
+    {
+        if ($r['code'] == 401 && !empty($r['result'])) {
+            $result = $r['result'];            
+            if (strpos($r['header'], 'error=invalid_token') !== false) {
+                return array(
+                    'action' => 'refreshToken'
+                );
+            } else {
+                return array(
+                    'action' => 'renew'
+                );
+            }
+        } else if ($r['code'] == 400 && !empty($r['result'])) {
+            if ($r['result']['error'] == 'invalid_token') {                
+                return array(
+                    'action' => 'refreshToken'
+                );
+            }
+        }
+    }
+}
+

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

@@ -0,0 +1,248 @@
+<?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\ExternalAccount\OAuth2;
+
+class Client
+{
+    const AUTH_TYPE_URI = 0;
+    const AUTH_TYPE_AUTHORIZATION_BASIC = 1;
+    const AUTH_TYPE_FORM = 2;
+
+    const TOKEN_TYPE_URI = 'Uri';
+    const TOKEN_TYPE_BEARER = 'Bearer';
+    const TOKEN_TYPE_OAUTH = 'OAuth';
+
+    const CONTENT_TYPE_APPLICATION = 0;
+    const CONTENT_TYPE_MULTIPART = 1;
+
+    const HTTP_METHOD_GET = 'GET';
+    const HTTP_METHOD_POST = 'POST';
+    const HTTP_METHOD_PUT = 'PUT';
+
+    const HTTP_METHOD_DELETE = 'DELETE';
+    const HTTP_METHOD_HEAD = 'HEAD';
+    const HTTP_METHOD_PATCH = 'PATCH';
+
+    const GRANT_TYPE_AUTHORIZATION_CODE = 'authorization_code';
+    const GRANT_TYPE_REFRESH_TOKEN = 'refresh_token';
+    const GRANT_TYPE_PASSWORD = 'password';
+    const GRANT_TYPE_CLIENT_CREDENTIALS = 'client_credentials';
+
+    protected $clientId = null;
+
+    protected $clientSecret = null;
+
+    protected $accessToken = null;
+
+    protected $authType = self::AUTH_TYPE_URI;
+
+    protected $tokenType = self::TOKEN_TYPE_URI;
+
+    protected $accessTokenSecret = null;
+
+    protected $accessTokenParamName = 'access_token';
+
+    protected $certificateFile = null;
+
+    protected $curlOptions = array();
+
+    public function __construct(array $params = array())
+    {
+        if (!extension_loaded('curl')) {
+            throw new \Exception('CURL extension not found.');
+        }
+    }
+
+    public function setClientId($clientId)
+    {
+        $this->clientId = $clientId;
+    }
+
+    public function setClientSecret($clientSecret)
+    {
+        $this->clientSecret = $clientSecret;
+    }
+
+    public function setAccessToken($accessToken)
+    {
+        $this->accessToken = $accessToken;
+    }
+
+    public function setAuthType($authType)
+    {
+        $this->authType = $authType;
+    }
+
+    public function setCertificateFile($certificateFile)
+    {
+        $this->certificateFile = $certificateFile;
+    }
+
+    public function setCurlOption($option, $value)
+    {
+        $this->curlOptions[$option] = $value;
+    }
+
+    public function setCurlOptions($options)
+    {
+        $this->curlOptions = array_merge($this->curlOptions, $options);
+    }
+
+    public function setTokenType($tokenType)
+    {
+        $this->tokenType = $tokenType;
+    }
+
+    public function setAccessTokenSecret($accessTokenSecret)
+    {
+        $this->accessTokenSecret = $accessTokenSecret;
+    }
+
+    public function request($url, $params = array(), $httpMethod = self::HTTP_METHOD_GET, array $httpHeaders = array(), $contentType = self::CONTENT_TYPE_MULTIPART)
+    {
+        if ($this->accessToken) {
+            switch ($this->tokenType) {
+                case self::TOKEN_TYPE_URI:
+                    $params[$this->accessTokenParamName] = $this->accessToken;
+                    break;
+                case self::TOKEN_TYPE_BEARER:
+                    $httpHeaders['Authorization'] = 'Bearer ' . $this->accessToken;
+                    break;
+                case self::TOKEN_TYPE_OAUTH:
+                    $httpHeaders['Authorization'] = 'OAuth ' . $this->accessToken;
+                    break;
+                default:
+                    throw new \Exception('Unknown access token type.');
+
+            }
+        }
+
+        return $this->execute($url, $params, $httpMethod, $httpHeaders, $contentType);
+    }
+
+    private function execute($url, $params = array(), $httpMethod, array $httpHeaders = array(), $contentType = self::CONTENT_TYPE_MULTIPART)
+    {
+        $curlOptions = array(
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_SSL_VERIFYPEER => true,
+            CURLOPT_CUSTOMREQUEST => $httpMethod
+        );
+
+        switch ($httpMethod) {
+            case self::HTTP_METHOD_POST:
+                $curlOptions[CURLOPT_POST] = true;
+            case self::HTTP_METHOD_PUT:
+            case self::HTTP_METHOD_PATCH:
+                if (self::CONTENT_TYPE_APPLICATION === $contentType) {
+                    $postFields = http_build_query($params, null, '&');
+                }
+                $curlOptions[CURLOPT_POSTFIELDS] = $postFields;
+                break;
+            case self::HTTP_METHOD_HEAD:
+                $curlOptions[CURLOPT_NOBODY] = true;
+            case self::HTTP_METHOD_DELETE:
+            case self::HTTP_METHOD_GET:
+                if (strpos($url, '?') === false) {
+                    $url .= '?';
+                }
+                $url .= http_build_query($params, null, '&');
+                break;
+            default:
+                break;
+        }
+
+        $curlOptions[CURLOPT_URL] = $url;
+
+        $curlOptHttpHeader = array();
+        foreach ($httpHeaders as $key => $value) {
+             $curlOptHttpHeader[] = "{$key}: {$value}";
+        }
+        $curlOptions[CURLOPT_HTTPHEADER] = $curlOptHttpHeader;
+
+        $ch = curl_init();
+        curl_setopt_array($ch, $curlOptions);
+
+        curl_setopt($ch, CURLOPT_HEADER, 1);
+
+        if (!empty($this->certificateFile)) {
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+            curl_setopt($ch, CURLOPT_CAINFO, $this->certificateFile);
+        } else {
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+        }
+
+        if (!empty($this->curlOptions)) {
+            curl_setopt_array($ch, $this->curlOptions);
+        }
+
+        $response = curl_exec($ch);
+
+        $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+        $headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+
+        $responceHeader = substr($response, 0, $headerSize);
+        $responceBody = substr($response, $headerSize);
+
+        $resultArray = null;
+
+        if ($curlError = curl_error($ch)) {
+            throw new \Exception($curlError);
+        } else {
+            $resultArray = json_decode($responceBody, true);
+        }
+        curl_close($ch);
+
+        return array(
+            'result' => (null !== $resultArray) ? $resultArray: $responceBody,
+            'code' => intval($httpCode),
+            'contentType' => $contentType,
+            'header' => $responceHeader,
+        );
+    }
+
+    public function getAccessToken($url, $grantType, array $params)
+    {
+        $params['grant_type'] = $grantType;
+
+        $httpHeaders = array();
+        switch ($this->clientAuth) {
+            case self::AUTH_TYPE_URI:
+            case self::AUTH_TYPE_FORM:
+                $params['client_id'] = $this->clientId;
+                $params['client_secret'] = $this->clientSecret;
+                break;
+            case self::AUTH_TYPE_AUTHORIZATION_BASIC:
+                $params['client_id'] = $this->clientId;
+                $httpHeaders['Authorization'] = 'Basic ' . base64_encode($this->clientId .  ':' . $this->clientSecret);
+                break;
+            default:
+                throw new \Exception();
+        }
+
+        return $this->execute($url, $params, self::HTTP_METHOD_POST, $httpHeaders, self::CONTENT_TYPE_APPLICATION);
+    }
+}
+

application/Espo/Core/HookManager.php

@@ -23,162 +23,162 @@
 namespace Espo\Core;
 
 use \Espo\Core\Exceptions\Error,
-	\Espo\Core\Utils\Util;
+    \Espo\Core\Utils\Util;
 
 class HookManager
 {
-	private $container;
+    private $container;
 
-	private $data;
+    private $data;
 
-	private $hooks;
+    private $hooks;
 
-	protected $cacheFile = 'data/cache/application/hooks.php';
+    protected $cacheFile = 'data/cache/application/hooks.php';
 
-	/**
+    /**
      * List of defined hooks
      *
      * @var array
      */
-	protected $hookList = array(
-		'beforeSave',
-		'afterSave',
-		'beforeRemove',
-		'afterRemove',
-	);
+    protected $hookList = array(
+        'beforeSave',
+        'afterSave',
+        'beforeRemove',
+        'afterRemove',
+    );
 
-	protected $paths = array(
-		'corePath' => 'application/Espo/Hooks',
-    	'modulePath' => 'application/Espo/Modules/{*}/Hooks',
-    	'customPath' => 'custom/Espo/Custom/Hooks',
-	);
+    protected $paths = array(
+        'corePath' => 'application/Espo/Hooks',
+        'modulePath' => 'application/Espo/Modules/{*}/Hooks',
+        'customPath' => 'custom/Espo/Custom/Hooks',
+    );
 
 
     public function __construct(Container $container)
     {
-    	$this->container = $container;
-    	$this->loadHooks();
+        $this->container = $container;
+        $this->loadHooks();
     }
 
     protected function getConfig()
     {
-    	return $this->container->get('config');
+        return $this->container->get('config');
     }
 
-	protected function getFileManager()
-	{
-		return $this->container->get('fileManager');
-	}
+    protected function getFileManager()
+    {
+        return $this->container->get('fileManager');
+    }
 
     protected function loadHooks()
     {
-    	if ($this->getConfig()->get('useCache') && file_exists($this->cacheFile)) {
-    		$this->data = $this->getFileManager()->getContents($this->cacheFile);
-    		return;
-    	}
+        if ($this->getConfig()->get('useCache') && file_exists($this->cacheFile)) {
+            $this->data = $this->getFileManager()->getContents($this->cacheFile);
+            return;
+        }
 
-    	$metadata = $this->container->get('metadata');
+        $metadata = $this->container->get('metadata');
 
-		$this->data = $this->getHookData($this->paths['corePath']);
+        $this->data = $this->getHookData($this->paths['corePath']);
 
-    	foreach ($metadata->getModuleList() as $moduleName) {
-    		$modulePath = str_replace('{*}', $moduleName, $this->paths['modulePath']);
-			$this->data = array_merge($this->data, $this->getHookData($modulePath));
-    	}
+        foreach ($metadata->getModuleList() as $moduleName) {
+            $modulePath = str_replace('{*}', $moduleName, $this->paths['modulePath']);
+            $this->data = array_merge($this->data, $this->getHookData($modulePath));
+        }
 
-    	$this->data = array_merge($this->data, $this->getHookData($this->paths['customPath']));
+        $this->data = array_merge($this->data, $this->getHookData($this->paths['customPath']));
 
-    	if ($this->getConfig()->get('useCache')) {
-			$this->getFileManager()->putContentsPHP($this->cacheFile, $this->data);
-    	}
+        if ($this->getConfig()->get('useCache')) {
+            $this->getFileManager()->putContentsPHP($this->cacheFile, $this->data);
+        }
     }
 
     public function process($scope, $hookName, $injection = null)
     {
-    	if ($scope != 'Common') {
-    		$this->process('Common', $hookName, $injection);
-    	}
+        if ($scope != 'Common') {
+            $this->process('Common', $hookName, $injection);
+        }
 
-    	if (!empty($this->data[$scope])) {
-    		if (!empty($this->data[$scope][$hookName])) {
-    			foreach ($this->data[$scope][$hookName] as $className) {
-    				if (empty($this->hooks[$className])) {
-    					$this->hooks[$className] = $this->createHookByClassName($className);
-    				}
-    				$hook = $this->hooks[$className];
-    				$hook->$hookName($injection);
-    			}
-    		}
-    	}
+        if (!empty($this->data[$scope])) {
+            if (!empty($this->data[$scope][$hookName])) {
+                foreach ($this->data[$scope][$hookName] as $className) {
+                    if (empty($this->hooks[$className])) {
+                        $this->hooks[$className] = $this->createHookByClassName($className);
+                    }
+                    $hook = $this->hooks[$className];
+                    $hook->$hookName($injection);
+                }
+            }
+        }
     }
 
-	public function createHookByClassName($className)
-	{
-    	if (class_exists($className)) {
-    		$hook = new $className();
-    		$dependencies = $hook->getDependencyList();
-    		foreach ($dependencies as $name) {
-    			$hook->inject($name, $this->container->get($name));
-    		}
-    		return $hook;
-    	}
-    	throw new Error("Class '$className' does not exist");
-	}
+    public function createHookByClassName($className)
+    {
+        if (class_exists($className)) {
+            $hook = new $className();
+            $dependencies = $hook->getDependencyList();
+            foreach ($dependencies as $name) {
+                $hook->inject($name, $this->container->get($name));
+            }
+            return $hook;
+        }
+        throw new Error("Class '$className' does not exist");
+    }
 
     /**
      * Get and merge hook data by checking the files exist in $hookDirs
-	 *
-	 * @param array $hookDirs - it can be an array('Espo/Hooks', 'Espo/Custom/Hooks', 'Espo/Modules/Crm/Hooks')
-	 *
-	 * @return array
-	 */
-	protected function getHookData($hookDirs)
-	{
-		if (is_string($hookDirs)) {
-			$hookDirs = (array) $hookDirs;
-		}
+     *
+     * @param array $hookDirs - it can be an array('Espo/Hooks', 'Espo/Custom/Hooks', 'Espo/Modules/Crm/Hooks')
+     *
+     * @return array
+     */
+    protected function getHookData($hookDirs)
+    {
+        if (is_string($hookDirs)) {
+            $hookDirs = (array) $hookDirs;
+        }
 
-		$hooks = array();
+        $hooks = array();
 
-		foreach ($hookDirs as $hookDir) {
+        foreach ($hookDirs as $hookDir) {
 
-			if (file_exists($hookDir)) {
-	        	$fileList = $this->getFileManager()->getFileList($hookDir, 1, '\.php$', 'file');
+            if (file_exists($hookDir)) {
+                $fileList = $this->getFileManager()->getFileList($hookDir, 1, '\.php$', true);
 
-	            foreach ($fileList as $scopeName => $hookFiles) {
+                foreach ($fileList as $scopeName => $hookFiles) {
 
-					$hookScopeDirPath = Util::concatPath($hookDir, $scopeName);
+                    $hookScopeDirPath = Util::concatPath($hookDir, $scopeName);
 
-					$scopeHooks = array();
-					foreach($hookFiles as $hookFile) {
-						$hookFilePath = Util::concatPath($hookScopeDirPath, $hookFile);
-	                	$className = Util::getClassName($hookFilePath);
+                    $scopeHooks = array();
+                    foreach($hookFiles as $hookFile) {
+                        $hookFilePath = Util::concatPath($hookScopeDirPath, $hookFile);
+                        $className = Util::getClassName($hookFilePath);
 
-						foreach($this->hookList as $hookName) {
-							if (method_exists($className, $hookName)) {
-								$scopeHooks[$hookName][$className::$order][] = $className;
-							}
-						}
-					}
+                        foreach($this->hookList as $hookName) {
+                            if (method_exists($className, $hookName)) {
+                                $scopeHooks[$hookName][$className::$order][] = $className;
+                            }
+                        }
+                    }
 
-					//sort hooks by order
-	                foreach ($scopeHooks as $hookName => $hookList) {
-						ksort($hookList);
+                    //sort hooks by order
+                    foreach ($scopeHooks as $hookName => $hookList) {
+                        ksort($hookList);
 
-						$sortedHookList = array();
-						foreach($hookList as $hookDetails) {
-	                    	$sortedHookList = array_merge($sortedHookList, $hookDetails);
-						}
+                        $sortedHookList = array();
+                        foreach($hookList as $hookDetails) {
+                            $sortedHookList = array_merge($sortedHookList, $hookDetails);
+                        }
 
                         $hooks[$scopeName][$hookName] = isset($hooks[$scopeName][$hookName]) ? array_merge($hooks[$scopeName][$hookName], $sortedHookList) : $sortedHookList;
-					}
-	            }
-			}
+                    }
+                }
+            }
 
-		}
+        }
 
-		return $hooks;
-	}
+        return $hooks;
+    }
 
 }
 

application/Espo/Core/Hooks/Base.php

@@ -26,70 +26,70 @@ use \Espo\Core\Interfaces\Injectable;
 
 class Base implements Injectable
 {
-	protected $dependencies = array(
-		'entityManager',
-		'config',
-		'metadata',
-		'acl',
-		'user',
-	);
+    protected $dependencies = array(
+        'entityManager',
+        'config',
+        'metadata',
+        'acl',
+        'user',
+    );
 
-	protected $injections = array();
+    protected $injections = array();
 
-	public static $order = 9;
+    public static $order = 9;
 
-	public function __construct()
-	{
-		$this->init();
-	}
+    public function __construct()
+    {
+        $this->init();
+    }
 
-	protected function init()
-	{
-	}
+    protected function init()
+    {
+    }
 
-	public function getDependencyList()
-	{
-		return $this->dependencies;
-	}
+    public function getDependencyList()
+    {
+        return $this->dependencies;
+    }
 
-	protected function getInjection($name)
-	{
-		return $this->injections[$name];
-	}
+    protected function getInjection($name)
+    {
+        return $this->injections[$name];
+    }
 
-	public function inject($name, $object)
-	{
-		$this->injections[$name] = $object;
-	}
+    public function inject($name, $object)
+    {
+        $this->injections[$name] = $object;
+    }
 
-	protected function getEntityManager()
-	{
-		return $this->injections['entityManager'];
-	}
+    protected function getEntityManager()
+    {
+        return $this->injections['entityManager'];
+    }
 
-	protected function getUser()
-	{
-		return $this->injections['user'];
-	}
+    protected function getUser()
+    {
+        return $this->injections['user'];
+    }
 
-	protected function getAcl()
-	{
-		return $this->injections['acl'];
-	}
+    protected function getAcl()
+    {
+        return $this->injections['acl'];
+    }
 
-	protected function getConfig()
-	{
-		return $this->injections['config'];
-	}
+    protected function getConfig()
+    {
+        return $this->injections['config'];
+    }
 
-	protected function getMetadata()
-	{
-		return $this->injections['metadata'];
-	}
+    protected function getMetadata()
+    {
+        return $this->injections['metadata'];
+    }
 
-	protected function getRepository()
-	{
-		return $this->getEntityManager()->getRepository($this->entityName);
-	}
+    protected function getRepository()
+    {
+        return $this->getEntityManager()->getRepository($this->entityName);
+    }
 }
 

application/Espo/Core/Interfaces/Injectable.php

@@ -24,8 +24,8 @@ namespace Espo\Core\Interfaces;
 
 interface Injectable
 {
-	public function getDependencyList();
-	
-	public function inject($name, $object);
+    public function getDependencyList();
+    
+    public function inject($name, $object);
 }
 

application/Espo/Core/Interfaces/Loader.php

@@ -0,0 +1,29 @@
+<?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\Interfaces;
+
+interface Loader
+{
+    public function load();
+}
+

application/Espo/Core/Jobs/Base.php

@@ -27,44 +27,44 @@ use \Espo\Core\Container;
 
 abstract class Base
 {
-	private $container;
+    private $container;
 
-	protected function getContainer()
-	{
-		return $this->container;
-	}
+    protected function getContainer()
+    {
+        return $this->container;
+    }
 
-	protected function getEntityManager()
-	{
-		return $this->getContainer()->get('entityManager');
-	}
+    protected function getEntityManager()
+    {
+        return $this->getContainer()->get('entityManager');
+    }
 
-	protected function getServiceFactory()
-	{
-		return $this->getContainer()->get('serviceFactory');
-	}
+    protected function getServiceFactory()
+    {
+        return $this->getContainer()->get('serviceFactory');
+    }
 
-	protected function getConfig()
-	{
-		return $this->getContainer()->get('config');
-	}
+    protected function getConfig()
+    {
+        return $this->getContainer()->get('config');
+    }
 
-	protected function getMetadata()
-	{
-		return $this->getContainer()->get('metadata');
-	}
+    protected function getMetadata()
+    {
+        return $this->getContainer()->get('metadata');
+    }
 
-	protected function getUser()
-	{
-		return $this->getContainer()->get('user');
-	}
+    protected function getUser()
+    {
+        return $this->getContainer()->get('user');
+    }
 
-	public function __construct(Container $container)
-	{
-		$this->container = $container;
-	}
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+    }
 
-	abstract public function run();
+    abstract public function run();
 
 }
 

application/Espo/Core/Loaders/Base.php

@@ -0,0 +1,38 @@
+<?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;
+
+abstract class Base implements \Espo\Core\Interfaces\Loader
+{
+    private $container;
+
+    public function __construct(\Espo\Core\Container $container)
+    {
+        $this->container = $container;
+    }
+
+    protected function getContainer()
+    {
+        return $this->container;
+    }
+}

application/Espo/Core/Loaders/EntityManager.php

@@ -22,43 +22,28 @@
 
 namespace Espo\Core\Loaders;
 
-use Doctrine\ORM\Tools\Setup,
-    Espo\Core\Doctrine\ORM\Mapping\Driver\EspoPHPDriver;
-
-class EntityManager
+class EntityManager extends Base
 {
-	private $container;
+    public function load()
+    {
+        $config = $this->getContainer()->get('config');
 
-	public function __construct(\Espo\Core\Container $container)
-	{
-		$this->container = $container;
-	}
+        $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'),
+            'metadata' => $this->getContainer()->get('metadata')->getOrmMetadata(),
+            'repositoryFactoryClassName' => '\\Espo\\Core\\ORM\\RepositoryFactory',
+        );
 
-	protected function getContainer()
-	{
-    	return $this->container;
-	}
+        $entityManager = new \Espo\Core\ORM\EntityManager($params);
+        $entityManager->setEspoMetadata($this->getContainer()->get('metadata'));
+        $entityManager->setHookManager($this->getContainer()->get('hookManager'));
+        $entityManager->setContainer($this->getContainer());
 
-	public function load()
-	{
-		$config = $this->getContainer()->get('config');
-
-		$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'),
-			'metadata' => $this->getContainer()->get('metadata')->getOrmMetadata(),
-			'repositoryFactoryClassName' => '\\Espo\\Core\\ORM\\RepositoryFactory',
-		);
-
-		$entityManager = new \Espo\Core\ORM\EntityManager($params);
-		$entityManager->setEspoMetadata($this->getContainer()->get('metadata'));
-		$entityManager->setHookManager($this->getContainer()->get('hookManager'));
-		$entityManager->setContainer($this->getContainer());
-
-		return $entityManager;
-	}
+        return $entityManager;
+    }
 }
 

application/Espo/Core/Loaders/Log.php

@@ -23,42 +23,30 @@
 namespace Espo\Core\Loaders;
 
 use Espo\Core\Utils,
-	Espo\Core\Utils\Log\Monolog\Handler;
+    Espo\Core\Utils\Log\Monolog\Handler;
 
-class Log
+class Log extends Base
 {
-	private $container;
+    public function load()
+    {
+        $logConfig = $this->getContainer()->get('config')->get('logger');
 
-	public function __construct(\Espo\Core\Container $container)
-	{
-		$this->container = $container;
-	}
+        $log = new Utils\Log('Espo');
 
-	protected function getContainer()
-	{
-    	return $this->container;
-	}
+        $levelCode = $log->getLevelCode($logConfig['level']);
 
-	public function load()
-	{
-		$logConfig = $this->getContainer()->get('config')->get('logger');
+        if ($logConfig['isRotate']) {
+            $handler = new Handler\RotatingFileHandler($logConfig['path'], $logConfig['maxRotateFiles'], $levelCode);
+        } else {
+            $handler = new Handler\StreamHandler($logConfig['path'], $levelCode);
+        }
+        $log->pushHandler($handler);
 
-		$log = new Utils\Log('Espo');
+        $errorHandler = new \Monolog\ErrorHandler($log);
+        $errorHandler->registerExceptionHandler(null, false);
+        $errorHandler->registerErrorHandler(array(), false);
 
-		$levelCode = $log->getLevelCode($logConfig['level']);
-
-		if ($logConfig['isRotate']) {
-			$handler = new Handler\RotatingFileHandler($logConfig['path'], $logConfig['maxRotateFiles'], $levelCode);
-		} else {
-			$handler = new Handler\StreamHandler($logConfig['path'], $levelCode);
-		}
-		$log->pushHandler($handler);
-
-		$errorHandler = new \Monolog\ErrorHandler($log);
-		$errorHandler->registerExceptionHandler(null, false);
-		$errorHandler->registerErrorHandler(array(), false);
-
-		return $log;
-	}
+        return $log;
+    }
 }
 

application/Espo/Core/Mail/Importer.php

@@ -0,0 +1,249 @@
+<?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');
+            
+            $subject = $message->subject;
+            if ($subject !== '0' && empty($subject)) {
+                $subject = '--empty--';
+            }
+            
+            $email->set('isHtml', false);        
+            $email->set('name', $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

@@ -36,221 +36,247 @@ use \Espo\Core\Exceptions\Error;
 
 class Sender
 {
-	protected $config;
+    protected $config;
 
-	protected $transport;
+    protected $transport;
 
-	protected $isGlobal = false;
+    protected $isGlobal = false;
 
-	protected $params = array();
+    protected $params = array();
 
-	public function __construct($config)
-	{
-		$this->config = $config;
-		$this->useGlobal();
-	}
+    public function __construct($config)
+    {
+        $this->config = $config;
+        $this->useGlobal();
+    }
 
-	public function resetParams()
-	{
-		$this->params = array();
-		return $this;
-	}
+    public function resetParams()
+    {
+        $this->params = array();
+        return $this;
+    }
 
-	public function setParams(array $params = array())
-	{
-		$this->params = array_merge($this->params, $params);
-		return $this;
-	}
+    public function setParams(array $params = array())
+    {
+        $this->params = array_merge($this->params, $params);
+        return $this;
+    }
 
-	public function useSmtp(array $params = array())
-	{
-		$this->isGlobal = false;
-		$this->params = $params;
+    public function useSmtp(array $params = array())
+    {
+        $this->isGlobal = false;
+        $this->params = $params;
 
-		$this->transport = new SmtpTransport();
+        $this->transport = new SmtpTransport();
+        
+        $opts = array(
+            'name' => 'admin',
+            'host' => $params['server'],
+            'port' => $params['port'],
+            'connection_config' => array()
+        );
+        if ($params['auth']) {
+            $opts['connection_class'] = 'login';
+            $opts['connection_config']['username'] = $params['username'];
+            $opts['connection_config']['password'] = $params['password'];
+        }
+        if ($params['security']) {
+            $opts['connection_config']['ssl'] = strtolower($params['security']);
+        }
+        
+        if (in_array('fromName', $params)) {
+            $this->params['fromName'] = $params['fromName'];
+        }        
+        if (in_array('fromAddress', $params)) {
+            $this->params['fromAddress'] = $params['fromAddress'];
+        }
+        
+        $options = new SmtpOptions($opts);
+        $this->transport->setOptions($options);
 
-		$opts = array(
-			'name' => 'admin',
-			'host' => $params['server'],
-			'port' => $params['port'],
-			'connection_config' => array()
-		);
-		if ($params['auth']) {
-			$opts['connection_class'] = 'login';
-			$opts['connection_config']['username'] = $params['username'];
-			$opts['connection_config']['password'] = $params['password'];
-		}
-		if ($params['security']) {
-			$opts['connection_config']['ssl'] = strtolower($params['security']);
-		}
+        return $this;
+    }
 
-		$options = new SmtpOptions($opts);
-		$this->transport->setOptions($options);
+    public function useGlobal()
+    {
+        $this->params = array();
+        if ($this->isGlobal) {
+            return $this;
+        }
 
-		return $this;
-	}
+        $this->transport = new SmtpTransport();
 
-	public function useGlobal()
-	{
-		$this->params = array();
-		if ($this->isGlobal) {
-			return $this;
-		}
+        $config = $this->config;
 
-		$this->transport = new SmtpTransport();
+        $opts = array(
+            'name' => 'admin',
+            'host' => $config->get('smtpServer'),
+            'port' => $config->get('smtpPort'),
+            'connection_config' => array()
+        );
+        if ($config->get('smtpAuth')) {
+            $opts['connection_class'] = 'login';
+            $opts['connection_config']['username'] = $config->get('smtpUsername');
+            $opts['connection_config']['password'] = $config->get('smtpPassword');
+        }
+        if ($config->get('smtpSecurity')) {
+            $opts['connection_config']['ssl'] = strtolower($config->get('smtpSecurity'));
+        }
 
-		$config = $this->config;
+        $options = new SmtpOptions($opts);
+        $this->transport->setOptions($options);
 
-		$opts = array(
-			'name' => 'admin',
-			'host' => $config->get('smtpServer'),
-			'port' => $config->get('smtpPort'),
-			'connection_config' => array()
-		);
-		if ($config->get('smtpAuth')) {
-			$opts['connection_class'] = 'login';
-			$opts['connection_config']['username'] = $config->get('smtpUsername');
-			$opts['connection_config']['password'] = $config->get('smtpPassword');
-		}
-		if ($config->get('smtpSecurity')) {
-			$opts['connection_config']['ssl'] = strtolower($config->get('smtpSecurity'));
-		}
+        $this->isGlobal = true;
 
-		$options = new SmtpOptions($opts);
-		$this->transport->setOptions($options);
+        return $this;
+    }
 
-		$this->isGlobal = true;
+    public function send(Email $email, $params = array())
+    {
+        $message = new Message();
+        $config = $this->config;        
+        $params = $this->params + $params;        
 
-		return $this;
-	}
+        if ($email->get('from')) {
+            $fromName = null;
+            if (!empty($params['fromName'])) {
+                $fromName = $params['fromName'];
+            } else {
+                $fromName = $config->get('outboundEmailFromName');
+            }
+            $message->addFrom(trim($email->get('from')), $fromName);
+        } else {
+            if (!empty($params['fromAddress'])) {
+                $fromAddress = $params['fromAddress'];
+            } else {
+                if (!$config->get('outboundEmailFromAddress')) {
+                    throw new Error('outboundEmailFromAddress is not specified in config.');
+                }
+                $fromAddress = $config->get('outboundEmailFromAddress');
+            }
 
-	public function send(Email $email)
-	{
-		$message = new Message();
+            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);
+        }
 
-		$config = $this->config;
+        $value = $email->get('to');
+        if ($value) {
+            $arr = explode(';', $value);
+            if (is_array($arr)) {
+                foreach ($arr as $address) {
+                    $message->addTo(trim($address));
+                }
+            }
+        }
 
-		if ($email->get('from')) {
-			$fromName = null;
-			if (!empty($this->params['fromName'])) {
-				$fromName = $this->params['fromName'];
-			} else {
-				$fromName = $config->get('outboundEmailFromName');
-			}
-			$message->addFrom(trim($email->get('from')), $fromName);
-		} else {
-			if (!empty($this->params['fromAddress'])) {
-				$fromAddress = $this->params['fromAddress'];
-			} else {
-				if (!$config->get('outboundEmailFromAddress')) {
-					throw new Error('outboundEmailFromAddress is not specified in config.');
-				}
-				$fromAddress = $config->get('outboundEmailFromAddress');
-			}
+        $value = $email->get('cc');
+        if ($value) {
+            $arr = explode(';', $value);
+            if (is_array($arr)) {
+                foreach ($arr as $address) {
+                    $message->addCC(trim($address));
+                }
+            }
+        }
 
-			if (!empty($this->params['fromName'])) {
-				$fromName = $this->params['fromName'];
-			} else {
-				$fromName = $config->get('outboundEmailFromName');
-			}
+        $value = $email->get('bcc');
+        if ($value) {
+            $arr = explode(';', $value);
+            if (is_array($arr)) {
+                foreach ($arr as $address) {
+                    $message->addBCC(trim($address));
+                }
+            }
+        }
 
-			$message->addFrom($fromAddress, $fromName);
-		}
+        $message->setSubject($email->get('name'));
 
-		$value = $email->get('to');
-		if ($value) {
-			$arr = explode(';', $value);
-			if (is_array($arr)) {
-				foreach ($arr as $address) {
-					$message->addTo(trim($address));
-				}
-			}
-		}
+        $body = new MimeMessage;
+        $parts = array();
+    
 
-		$value = $email->get('cc');
-		if ($value) {
-			$arr = explode(';', $value);
-			if (is_array($arr)) {
-				foreach ($arr as $address) {
-					$message->addCC(trim($address));
-				}
-			}
-		}
+        $bodyPart = new MimePart($email->getBodyPlainForSending());            
+        $bodyPart->type = 'text/plain';
+        $bodyPart->charset = 'utf-8';
+        $parts[] = $bodyPart;
 
-		$value = $email->get('bcc');
-		if ($value) {
-			$arr = explode(';', $value);
-			if (is_array($arr)) {
-				foreach ($arr as $address) {
-					$message->addBCC(trim($address));
-				}
-			}
-		}
+        
+        if ($email->get('isHtml')) {
+            $bodyPart = new MimePart($email->getBodyForSending());
+            $bodyPart->type = 'text/html';
+            $bodyPart->charset = 'utf-8';
+            $parts[] = $bodyPart;
+        }
+        
 
-		$message->setSubject($email->get('name'));
+        $aCollection = $email->get('attachments');
+        if (!empty($aCollection)) {
+            foreach ($aCollection as $a) {
+                $fileName = 'data/upload/' . $a->id;
+                $attachment = new MimePart(file_get_contents($fileName));
+                $attachment->disposition = Mime::DISPOSITION_ATTACHMENT;
+                $attachment->encoding = Mime::ENCODING_BASE64;
+                $attachment->filename = $a->get('name');
+                if ($a->get('type')) {
+                    $attachment->type = $a->get('type');
+                }
+                $parts[] = $attachment;
+            }
+        }
+        
+        $aCollection = $email->getInlineAttachments();
+        if (!empty($aCollection)) {
+            foreach ($aCollection as $a) {
+                $fileName = 'data/upload/' . $a->id;
+                $attachment = new MimePart(file_get_contents($fileName));
+                $attachment->disposition = Mime::DISPOSITION_INLINE;
+                $attachment->encoding = Mime::ENCODING_BASE64;
+                $attachment->id = $a->id;
+                if ($a->get('type')) {
+                    $attachment->type = $a->get('type');
+                }
+                $parts[] = $attachment;
+            }
+        }
 
-		$body = new MimeMessage;
-		$parts = array();
-		
+        $body->setParts($parts);
+        $message->setBody($body);
+        
+        if ($email->get('isHtml')) {
+            $message->getHeaders()->get('content-type')->setType('multipart/alternative');
+        }
 
-		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';
-		}
+        try {
+            if ($email->get('parentType') && $email->get('parentId')) {
+                $messageId = '<' . $email->get('parentType') .'/' . $email->get('parentId') . '/' . time() . '@espo>';
+            } else {
+                $messageId = '<' . md5($email->get('name')) . '/' . time() . '@espo>';
+            }
+            $message->getHeaders()->addHeaderLine('Message-Id', $messageId);
 
-		$parts[] = $bodyPart;
+            $this->transport->send($message);
 
-		$aCollection = $email->get('attachments');
-		if (!empty($aCollection)) {
-			foreach ($aCollection as $a) {
-				$fileName = 'data/upload/' . $a->id;
-				$attachment = new MimePart(file_get_contents($fileName));
-				$attachment->disposition = Mime::DISPOSITION_ATTACHMENT;
-				$attachment->encoding = Mime::ENCODING_BASE64;
-				$attachment->filename = $a->get('name');
-				if ($a->get('type')) {
-					$attachment->type = $a->get('type');
-				}
-				$parts[] = $attachment;
-			}
-		}
-		
-		$aCollection = $email->getInlineAttachments();
-		if (!empty($aCollection)) {
-			foreach ($aCollection as $a) {
-				$fileName = 'data/upload/' . $a->id;
-				$attachment = new MimePart(file_get_contents($fileName));
-				$attachment->disposition = Mime::DISPOSITION_INLINE;
-				$attachment->encoding = Mime::ENCODING_BASE64;
-				$attachment->id = $a->id;
-				if ($a->get('type')) {
-					$attachment->type = $a->get('type');
-				}
-				$parts[] = $attachment;
-			}
-		}
+            $email->set('messageId', $message_id);
+            $email->set('status', 'Sent');
+            $email->set('dateSent', date("Y-m-d H:i:s"));
+        } catch (\Exception $e) {
+            throw new Error($e->getMessage(), 500);
+        }
 
-		$body->setParts($parts);
-		$message->setBody($body);
-
-		try {
-			$this->transport->send($message);
-			$email->set('status', 'Sent');
-			$email->set('dateSent', date("Y-m-d H:i:s"));
-		} catch (\Exception $e) {
-			throw new Error($e->getMessage(), 500);
-		}
-
-		$this->useGlobal();
-	}
+        $this->useGlobal();
+    }
 }
 

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/DB/MysqlMapper.php

@@ -18,12 +18,12 @@
  *
  * 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\ORM\DB;
 
 class MysqlMapper extends \Espo\ORM\DB\MysqlMapper
 {
-	protected $returnCollection = false;
+    protected $returnCollection = false;
 }
 

application/Espo/Core/ORM/Entity.php

@@ -18,26 +18,46 @@
  *
  * 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\ORM;
 
 class Entity extends \Espo\ORM\Entity
 {
-	public function loadLinkMultipleField($field)
-	{
-		if ($this->hasRelation($field) && $this->hasField($field . 'Ids')) {
-			$collection = $this->get($field);
-			$ids = array();
-			$names = new \stdClass();		
-			foreach ($collection as $e) {
-				$id = $e->id;
-				$ids[] = $id;
-				$names->$id = $e->get('name');
-			}			
-			$this->set($field . 'Ids', $ids);
-			$this->set($field . 'Names', $names);
-		}
-	}
+
+    public function loadLinkMultipleField($field, $columns = null)
+    {
+        if ($this->hasRelation($field) && $this->hasField($field . 'Ids')) {
+
+            $defs = array();
+            if (!empty($columns)) {
+                $defs['additionalColumns'] = $columns;
+            }
+
+            $collection = $this->get($field, $defs);
+            $ids = array();
+            $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

@@ -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\ORM;
 
@@ -26,75 +26,80 @@ use \Espo\Core\Utils\Util;
 
 class EntityManager extends \Espo\ORM\EntityManager
 {
-	protected $espoMetadata;
-	
-	private $hookManager;
-	
-	protected $user;
-	
-	protected $container;
-	
-	private $repositoryClassNameHash = array();
-	
-	private $entityClassNameHash = array();
-	
-	public function setContainer(\Espo\Core\Container $container)
-	{
-		$this->container = $container;	
-	}
-	
-	public function getContainer()
-	{
-		return $this->container;	
-	}
-	
-	public function setUser($user)
-	{
-		$this->user = $user;
-	}
-	
-	public function getUser()
-	{
-		return $this->user;
-	}	
+    protected $espoMetadata;
 
-	public function setEspoMetadata($espoMetadata)
-	{
-		$this->espoMetadata = $espoMetadata;
-	}
-	
-	public function setHookManager(\Espo\Core\HookManager $hookManager)
-	{
-		$this->hookManager = $hookManager;
-	}
-	
-	public function getHookManager()
-	{
-		return $this->hookManager;
-	}
+    private $hookManager;
 
-	public function normalizeRepositoryName($name)
-	{			
-		if (empty($this->repositoryClassNameHash[$name])) {
-			$className = '\\Espo\\Custom\\Repositories\\' . Util::normilizeClassName($name);
-			if (!class_exists($className)) {
-				$className = $this->espoMetadata->getRepositoryPath($name);
-			}
-			$this->repositoryClassNameHash[$name] = $className;
-		}
-		return $this->repositoryClassNameHash[$name];
-	}
-	
-	public function normalizeEntityName($name)
-	{			
-		if (empty($this->entityClassNameHash[$name])) {
-			$className = '\\Espo\\Custom\\Entities\\' . Util::normilizeClassName($name);
-			if (!class_exists($className)) {
-				$className = $this->espoMetadata->getEntityPath($name);
-			}
-			$this->entityClassNameHash[$name] = $className;
-		}
-		return $this->entityClassNameHash[$name];
-	}
+    protected $user;
+
+    protected $container;
+
+    private $repositoryClassNameHash = array();
+
+    private $entityClassNameHash = array();
+
+    public function setContainer(\Espo\Core\Container $container)
+    {
+        $this->container = $container;
+    }
+
+    public function getContainer()
+    {
+        return $this->container;
+    }
+
+    public function setUser($user)
+    {
+        $this->user = $user;
+    }
+
+    public function getUser()
+    {
+        return $this->user;
+    }
+
+    public function getEspoMetadata()
+    {
+        return $this->espoMetadata;
+    }
+
+    public function setEspoMetadata($espoMetadata)
+    {
+        $this->espoMetadata = $espoMetadata;
+    }
+
+    public function setHookManager(\Espo\Core\HookManager $hookManager)
+    {
+        $this->hookManager = $hookManager;
+    }
+
+    public function getHookManager()
+    {
+        return $this->hookManager;
+    }
+
+    public function normalizeRepositoryName($name)
+    {
+        if (empty($this->repositoryClassNameHash[$name])) {
+            $className = '\\Espo\\Custom\\Repositories\\' . Util::normilizeClassName($name);
+            if (!class_exists($className)) {
+                $className = $this->espoMetadata->getRepositoryPath($name);
+            }
+            $this->repositoryClassNameHash[$name] = $className;
+        }
+        return $this->repositoryClassNameHash[$name];
+    }
+
+    public function normalizeEntityName($name)
+    {
+        if (empty($this->entityClassNameHash[$name])) {
+            $className = '\\Espo\\Custom\\Entities\\' . Util::normilizeClassName($name);
+            if (!class_exists($className)) {
+                $className = $this->espoMetadata->getEntityPath($name);
+            }
+            $this->entityClassNameHash[$name] = $className;
+        }
+        return $this->entityClassNameHash[$name];
+    }
 }
 

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

@@ -26,195 +26,290 @@ use \Espo\ORM\EntityManager;
 use \Espo\ORM\EntityFactory;
 use \Espo\ORM\Entity;
 use \Espo\ORM\IEntity;
+use Espo\Core\Utils\Util;
 
 use \Espo\Core\Interfaces\Injectable;
 
 class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
 {
-	public static $mapperClassName = '\\Espo\\Core\\ORM\\DB\\MysqlMapper';
+    public static $mapperClassName = '\\Espo\\Core\\ORM\\DB\\MysqlMapper';
 
-	protected $dependencies = array(
-		'metadata'
-	);
+    protected $dependencies = array(
+        'metadata'
+    );
 
-	protected $injections = array();
+    protected $injections = array();
 
-	public function inject($name, $object)
-	{
-		$this->injections[$name] = $object;
-	}
+    public function inject($name, $object)
+    {
+        $this->injections[$name] = $object;
+    }
 
-	protected function getInjection($name)
-	{
-		return $this->injections[$name];
-	}
+    protected function getInjection($name)
+    {
+        return $this->injections[$name];
+    }
 
-	public function getDependencyList()
-	{
-		return $this->dependencies;
-	}
+    public function getDependencyList()
+    {
+        return $this->dependencies;
+    }
 
-	protected function getMetadata()
-	{
-		return $this->getInjection('metadata');
-	}
+    protected function getMetadata()
+    {
+        return $this->getInjection('metadata');
+    }
 
-	protected function handleSelectParams(&$params, $entityName = false)
-	{
-		$this->handleEmailAddressParams($params, $entityName);
-	}
+    public function handleSelectParams(&$params)
+    {
+        $this->handleEmailAddressParams($params);
+        $this->handlePhoneNumberParams($params);
+        $this->handleCurrencyParams($params);
+    }
 
-	protected function handleEmailAddressParams(&$params, $entityName = false)
-	{
-		if (empty($entityName)) {
-			$entityName = $this->entityName;
-		}
+    protected function handleCurrencyParams(&$params)
+    {
+        $entityName = $this->entityName;
 
-		$defs = $this->getEntityManager()->getMetadata()->get($entityName);
-		if (!empty($defs['relations']) && array_key_exists('emailAddresses', $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'] = array('emailAddresses');
-			$params['joinConditions'] = array(
-				'emailAddresses' => array(
-					'primary' => 1
-				)
-			);
-		}
-	}
+        $metadata = $this->getMetadata();
 
-	protected function beforeRemove(Entity $entity)
-	{
-		parent::beforeRemove($entity);
-		$this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeRemove', $entity);
-	}
+        if (!$metadata) {
+            return;
+        }
 
-	protected function afterRemove(Entity $entity)
-	{
-		parent::afterRemove($entity);
-		$this->getEntityManager()->getHookManager()->process($this->entityName, 'afterRemove', $entity);
-	}
+        $defs = $metadata->get('entityDefs.' . $entityName);
 
-	public function remove(Entity $entity)
-	{
-		$this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeRemove', $entity);
+        foreach ($defs['fields'] as $field => $d) {
+            if (isset($d['type']) && $d['type'] == 'currency') {
+                if (empty($params['customJoin'])) {
+                    $params['customJoin'] = '';
+                }
+                $alias = Util::toUnderScore($field) . "_currency_alias";
+                $params['customJoin'] .= "
+                    LEFT JOIN currency AS `{$alias}` ON {$alias}.id = ".Util::toUnderScore($entityName).".".Util::toUnderScore($field)."_currency
+                ";
+            }
+        }
 
-		$result = parent::remove($entity);
-		if ($result) {
-			$this->getEntityManager()->getHookManager()->process($this->entityName, 'afterRemove', $entity);
-		}
-		return $result;
-	}
+    }
 
-	protected function beforeSave(Entity $entity)
-	{
-		parent::beforeSave($entity);
-		$this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeSave', $entity);
-	}
+    protected function handleEmailAddressParams(&$params)
+    {
+        $entityName = $this->entityName;
 
-	protected function afterSave(Entity $entity)
-	{
-		parent::afterSave($entity);
-		$this->getEntityManager()->getHookManager()->process($this->entityName, 'afterSave', $entity);
-	}
+        $defs = $this->getEntityManager()->getMetadata()->get($entityName);
+        if (!empty($defs['relations']) && array_key_exists('emailAddresses', $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'][] = 'emailAddresses';
+            $params['joinConditions']['emailAddresses'] = array(
+                'primary' => 1
+            );
+        }
+    }
 
-	public function save(Entity $entity)
-	{
-		$nowString = date('Y-m-d H:i:s', time());
-		$restoreData = array();
+    protected function handlePhoneNumberParams(&$params)
+    {
+        $entityName = $this->entityName;
 
-		if ($entity->isNew()) {
-			if (!$entity->has('id')) {
-				$entity->set('id', uniqid());
-			}
+        $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
+            );
+        }
+    }
 
-			if ($entity->hasField('createdAt')) {
-				$entity->set('createdAt', $nowString);
-			}
-			if ($entity->hasField('createdById')) {
-				$entity->set('createdById', $this->entityManager->getUser()->id);
-			}
+    protected function beforeRemove(Entity $entity)
+    {
+        parent::beforeRemove($entity);
+        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeRemove', $entity);
+    }
 
-			if ($entity->has('modifiedById')) {
-				$restoreData['modifiedById'] = $entity->get('modifiedById');
-			}
-			if ($entity->has('modifiedAt')) {
-				$restoreData['modifiedAt'] = $entity->get('modifiedAt');
-			}
-			$entity->clear('modifiedById');
-			$entity->clear('modifiedAt');
-		} else {
-			if ($entity->hasField('modifiedAt')) {
-				$entity->set('modifiedAt', $nowString);
-			}
-			if ($entity->hasField('modifiedById')) {
-				$entity->set('modifiedById', $this->entityManager->getUser()->id);
-			}
+    protected function afterRemove(Entity $entity)
+    {
+        parent::afterRemove($entity);
+        $this->getEntityManager()->getHookManager()->process($this->entityName, 'afterRemove', $entity);
+    }
 
-			if ($entity->has('createdById')) {
-				$restoreData['createdById'] = $entity->get('createdById');
-			}
-			if ($entity->has('createdAt')) {
-				$restoreData['createdAt'] = $entity->get('createdAt');
-			}
-			$entity->clear('createdById');
-			$entity->clear('createdAt');
-		}
-		$result = parent::save($entity);
+    public function remove(Entity $entity)
+    {
+        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeRemove', $entity);
 
-		$entity->set($restoreData);
+        $result = parent::remove($entity);
+        if ($result) {
+            $this->getEntityManager()->getHookManager()->process($this->entityName, 'afterRemove', $entity);
+        }
+        return $result;
+    }
 
-		$this->handleEmailAddressSave($entity);
-		$this->handleSpecifiedRelations($entity);
+    protected function beforeSave(Entity $entity)
+    {
+        parent::beforeSave($entity);
+        $this->getEntityManager()->getHookManager()->process($this->entityName, 'beforeSave', $entity);
+    }
 
-		return $result;
-	}
+    protected function afterSave(Entity $entity)
+    {
+        parent::afterSave($entity);
+        $this->getEntityManager()->getHookManager()->process($this->entityName, 'afterSave', $entity);
+    }
 
-	protected function handleEmailAddressSave(Entity $entity)
-	{		
-		if ($entity->hasRelation('emailAddresses') && $entity->hasField('emailAddress')) {		
-			$emailAddressRepository = $this->getEntityManager()->getRepository('EmailAddress')->storeEntityEmailAddress($entity);
-		}
-	}
+    public function save(Entity $entity)
+    {
+        $nowString = date('Y-m-d H:i:s', time());
+        $restoreData = array();
 
-	protected function handleSpecifiedRelations(Entity $entity)
-	{
-		$relationTypes = array($entity::HAS_MANY, $entity::MANY_MANY, $entity::HAS_CHILDREN);
-		foreach ($entity->getRelations() as $name => $defs) {
-			if (in_array($defs['type'], $relationTypes)) {
-				$fieldName = $name . 'Ids';
-				if ($entity->has($fieldName)) {
-					$specifiedIds = $entity->get($fieldName);
-					if (is_array($specifiedIds)) {
-						$toRemoveIds = array();
-						$existingIds = array();
-						foreach ($entity->get($name) as $foreignEntity) {
-							$existingIds[] = $foreignEntity->id;
-						}
-						foreach ($existingIds as $id) {
-							if (!in_array($id, $specifiedIds)) {
-								$toRemoveIds[] = $id;
-							}
-						}
-						foreach ($specifiedIds as $id) {
-							if (!in_array($id, $existingIds)) {
-								$this->relate($entity, $name, $id);
-							}
-						}
-						foreach ($toRemoveIds as $id) {
-							$this->unrelate($entity, $name, $id);
-						}
-					}
-				}
-			}
-		}
-	}
+        if ($entity->isNew()) {
+            if (!$entity->has('id')) {
+                $entity->set('id', uniqid());
+            }
+
+            if ($entity->hasField('createdAt')) {
+                $entity->set('createdAt', $nowString);
+            }
+            if ($entity->hasField('modifiedAt')) {
+                $entity->set('modifiedAt', $nowString);
+            }
+            if ($entity->hasField('createdById')) {
+                $entity->set('createdById', $this->entityManager->getUser()->id);
+            }
+
+            if ($entity->has('modifiedById')) {
+                $restoreData['modifiedById'] = $entity->get('modifiedById');
+            }
+            if ($entity->has('modifiedAt')) {
+                $restoreData['modifiedAt'] = $entity->get('modifiedAt');
+            }
+            $entity->clear('modifiedById');
+        } else {
+            if ($entity->hasField('modifiedAt')) {
+                $entity->set('modifiedAt', $nowString);
+            }
+            if ($entity->hasField('modifiedById')) {
+                $entity->set('modifiedById', $this->entityManager->getUser()->id);
+            }
+
+            if ($entity->has('createdById')) {
+                $restoreData['createdById'] = $entity->get('createdById');
+            }
+            if ($entity->has('createdAt')) {
+                $restoreData['createdAt'] = $entity->get('createdAt');
+            }
+            $entity->clear('createdById');
+            $entity->clear('createdAt');
+        }
+        $result = parent::save($entity);
+
+        $entity->set($restoreData);
+
+        $this->handleEmailAddressSave($entity);
+        $this->handlePhoneNumberSave($entity);
+        $this->handleSpecifiedRelations($entity);
+
+        return $result;
+    }
+
+    protected function handleEmailAddressSave(Entity $entity)
+    {
+        if ($entity->hasRelation('emailAddresses') && $entity->hasField('emailAddress')) {
+            $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)
+    {
+        $relationTypes = array($entity::HAS_MANY, $entity::MANY_MANY, $entity::HAS_CHILDREN);
+        foreach ($entity->getRelations() as $name => $defs) {
+            if (in_array($defs['type'], $relationTypes)) {
+                $fieldName = $name . 'Ids';
+                if ($entity->has($fieldName)) {
+                    $specifiedIds = $entity->get($fieldName);
+                    if (is_array($specifiedIds)) {
+                        $toRemoveIds = array();
+                        $existingIds = array();
+                        $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)) {
+                                $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/ORM/Repository.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\ORM;
 
@@ -26,23 +26,23 @@ use \Espo\Core\Interfaces\Injectable;
 
 abstract class Repository extends \Espo\ORM\Repository implements Injectable
 {
-	protected $dependencies = array();
-	
-	protected $injections = array();
-	
-	public function inject($name, $object)
-	{
-		$this->injections[$name] = $object;
-	}	
-	
-	protected function getInjection($name)
-	{
-		return $this->injections[$name];
-	}
-	
-	public function getDependencyList()
-	{
-		return $this->dependencies;
-	}	
+    protected $dependencies = array();
+
+    protected $injections = array();
+
+    public function inject($name, $object)
+    {
+        $this->injections[$name] = $object;
+    }
+
+    protected function getInjection($name)
+    {
+        return $this->injections[$name];
+    }
+
+    public function getDependencyList()
+    {
+        return $this->dependencies;
+    }
 }
 

application/Espo/Core/ORM/RepositoryFactory.php

@@ -18,23 +18,23 @@
  *
  * 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\ORM;
 
 class RepositoryFactory extends \Espo\ORM\RepositoryFactory
-{	
-	protected $defaultRepositoryClassName = '\\Espo\\Core\\ORM\\Repositories\\RDB';
+{
+    protected $defaultRepositoryClassName = '\\Espo\\Core\\ORM\\Repositories\\RDB';
 
-	public function create($name)
-	{
-		$repository = parent::create($name);
-		
-    	$dependencies = $repository->getDependencyList();
-    	foreach ($dependencies as $name) {
-    		$repository->inject($name, $this->entityManager->getContainer()->get($name));
-    	}
-		return $repository;
-	}
+    public function create($name)
+    {
+        $repository = parent::create($name);
+
+        $dependencies = $repository->getDependencyList();
+        foreach ($dependencies as $name) {
+            $repository->inject($name, $this->entityManager->getContainer()->get($name));
+        }
+        return $repository;
+    }
 }
 

application/Espo/Core/SelectManagerFactory.php

@@ -28,41 +28,41 @@ use \Espo\Core\Utils\Util;
 
 class SelectManagerFactory
 {
-	private $entityManager;
-	
-	private $user;
-	
-	private $acl;
-	
-	private $metadata;
+    private $entityManager;
+    
+    private $user;
+    
+    private $acl;
+    
+    private $metadata;
 
     public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, $metadata)
     {
-    	$this->entityManager = $entityManager;
-    	$this->user = $user;
-    	$this->acl = $acl;
-    	$this->metadata = $metadata;
+        $this->entityManager = $entityManager;
+        $this->user = $user;
+        $this->acl = $acl;
+        $this->metadata = $metadata;
     }
     
-	public function create($entityName)
-	{
-    	$className = '\\Espo\\Custom\\SelectManagers\\' . Util::normilizeClassName($entityName);
-		if (!class_exists($className)) {
-			$moduleName = $this->metadata->getScopeModuleName($entityName);
-			if ($moduleName) {
-				$className = '\\Espo\\Modules\\' . $moduleName . '\\SelectManagers\\' . Util::normilizeClassName($entityName);
-			} else {
-				$className = '\\Espo\\SelectManagers\\' . Util::normilizeClassName($entityName);
-			}    	
-			if (!class_exists($className)) {
-				$className = '\\Espo\\Core\\SelectManagers\\Base';
-			}
-    	}
-		
-		$selectManager = new $className($this->entityManager, $this->user, $this->acl, $this->metadata);
-		$selectManager->setEntityName($entityName);
-				
-		return $selectManager;
-	}	
+    public function create($entityName)
+    {
+        $className = '\\Espo\\Custom\\SelectManagers\\' . Util::normilizeClassName($entityName);
+        if (!class_exists($className)) {
+            $moduleName = $this->metadata->getScopeModuleName($entityName);
+            if ($moduleName) {
+                $className = '\\Espo\\Modules\\' . $moduleName . '\\SelectManagers\\' . Util::normilizeClassName($entityName);
+            } else {
+                $className = '\\Espo\\SelectManagers\\' . Util::normilizeClassName($entityName);
+            }        
+            if (!class_exists($className)) {
+                $className = '\\Espo\\Core\\SelectManagers\\Base';
+            }
+        }
+        
+        $selectManager = new $className($this->entityManager, $this->user, $this->acl, $this->metadata);
+        $selectManager->setEntityName($entityName);
+                
+        return $selectManager;
+    }    
 }
 

application/Espo/Core/SelectManagers/Base.php

@@ -28,262 +28,374 @@ use \Espo\Core\Acl;
 
 class Base
 {
-	protected $container;
+    protected $container;
 
-	protected $user;
+    protected $user;
 
-	protected $acl;
+    protected $acl;
 
-	protected $entityManager;
+    protected $entityManager;
 
-	protected $entityName;
+    protected $entityName;
 
-	protected $metadata;
+    protected $metadata;
+
+    const MIN_LENGTH_FOR_CONTENT_SEARCH = 4;
 
     public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, $metadata)
     {
-    	$this->entityManager = $entityManager;
-    	$this->user = $user;
-    	$this->acl = $acl;
-    	$this->metadata = $metadata;
+        $this->entityManager = $entityManager;
+        $this->user = $user;
+        $this->acl = $acl;
+        $this->metadata = $metadata;
     }
 
     public function setEntityName($entityName)
     {
-    	$this->entityName = $entityName;
+        $this->entityName = $entityName;
     }
 
     protected function limit($params, &$result)
     {
-		if (isset($params['offset']) && !is_null($params['offset'])) {
-			$result['offset'] = $params['offset'];
-		}
-		if (isset($params['maxSize']) && !is_null($params['maxSize'])) {
-			$result['limit'] = $params['maxSize'];
-		}
+        if (isset($params['offset']) && !is_null($params['offset'])) {
+            $result['offset'] = $params['offset'];
+        }
+        if (isset($params['maxSize']) && !is_null($params['maxSize'])) {
+            $result['limit'] = $params['maxSize'];
+        }
     }
 
     protected function order($params, &$result)
     {
-		if (!empty($params['sortBy'])) {
-			$result['orderBy'] = $params['sortBy'];
-			$type = $this->metadata->get("entityDefs.{$this->entityName}.fields." . $result['orderBy'] . ".type");
-			if ($type == 'link') {
-				$result['orderBy'] .= 'Name';
-			} else if ($type == 'linkParent') {
-				$result['orderBy'] .= 'Type';
-			}
-		}
-		if (isset($params['asc'])) {
-			if ($params['asc']) {
-				$result['order'] = 'ASC';
-			} else {
-				$result['order'] = 'DESC';
-			}
-		}
+        if (!empty($params['sortBy'])) {
+            $result['orderBy'] = $params['sortBy'];
+            $type = $this->metadata->get("entityDefs.{$this->entityName}.fields." . $result['orderBy'] . ".type");
+            if ($type == 'link') {
+                $result['orderBy'] .= 'Name';
+            } else if ($type == 'linkParent') {
+                $result['orderBy'] .= 'Type';
+            }
+        }
+        if (isset($params['asc'])) {
+            if ($params['asc']) {
+                $result['order'] = 'ASC';
+            } else {
+                $result['order'] = 'DESC';
+            }
+        }
+    }
+
+    protected function getTextFilterFields()
+    {
+        return $this->metadata->get("entityDefs.{$this->entityName}.collection.textFilterFields", array('name'));
     }
 
     protected function where($params, &$result)
     {
-		if (!empty($params['where']) && is_array($params['where'])) {
-			$where = array();
+        if (!empty($params['where']) && is_array($params['where'])) {
+            $where = array();
 
-			foreach	($params['where'] as $item) {
-				if ($item['type'] == 'boolFilters' && !empty($item['value']) && is_array($item['value'])) {
-					foreach ($item['value'] as $filter) {
-						$p = $this->getBoolFilterWhere($filter);
-						if (!empty($p)) {
-							$params['where'][] = $p;
-						}
-					}
-				}
-			}
+            foreach    ($params['where'] as $item) {
+                if ($item['type'] == 'boolFilters' && !empty($item['value']) && is_array($item['value'])) {
+                    foreach ($item['value'] as $filter) {
+                        $p = $this->getBoolFilterWhere($filter);
+                        if (!empty($p)) {
+                            $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;
+                    }
+                }
+            }
 
-			$linkedWith = array();
-			$ignoreList = array('linkedWith', 'boolFilters');
-			foreach	($params['where'] as $item) {
-				if (!in_array($item['type'], $ignoreList)) {
-					$part = $this->getWherePart($item);
-					if (!empty($part)) {
-						$where[] = $part;
-					}
-				} else {
-					if ($item['type'] == 'linkedWith') {
-						$linkedWith[$item['field']] = $item['value'];
-					}
-				}
-			}
+            $linkedWith = array();
+            $ignoreList = array('linkedWith', 'boolFilters');
+            foreach    ($params['where'] as $item) {
+                if (!in_array($item['type'], $ignoreList)) {
+                    $part = $this->getWherePart($item);
+                    if (!empty($part)) {
+                        $where[] = $part;
+                    }
+                } else {
+                    if ($item['type'] == 'linkedWith' && !empty($item['value'])) {
+                        $linkedWith[$item['field']] = $item['value'];
+                    }
+                }
+            }
 
-			if (!empty($linkedWith)) {
-				$joins = array();
+            if (!empty($linkedWith)) {
+                $joins = array();
 
-				$part = array();
-				foreach ($linkedWith as $link => $ids) {
-					$joins[] = $link;
-					$defs = $this->entityManager->getMetadata()->get($this->entityName);
+                $part = array();
+                foreach ($linkedWith as $link => $ids) {
+                    $joins[] = $link;
+                    $defs = $this->entityManager->getMetadata()->get($this->entityName);
 
-					$entityName = $defs['relations'][$link]['entity'];
-					if ($entityName) {
-						$part[$entityName . '.id'] = $ids;
-					}
-				}
+                    $entityName = $defs['relations'][$link]['entity'];
+                    if ($entityName) {
+                        $part[$entityName . '.id'] = $ids;
+                    }
+                }
 
-				if (!empty($part)) {
-					$where[] = $part;
-				}
-				$result['joins'] = $joins;
-				$result['distinct'] = true;
+                if (!empty($part)) {
+                    $where[] = $part;
+                }
+                $result['joins'] = $joins;
+                $result['distinct'] = true;
 
-			}
+            }
 
-			$result['whereClause'] = $where;
-		}
+            $result['whereClause'] = $where;
+        }
     }
 
     protected function q($params, &$result)
     {
-		if (!empty($params['q'])) {
-			if (empty($result['whereClause'])) {
-				$result['whereClause'] = array();
-			}
-			$result['whereClause']['name*'] = $params['q'] . '%';
-		}
-	}
+        if (!empty($params['q'])) {
+            if (empty($result['whereClause'])) {
+                $result['whereClause'] = array();
+            }
+
+            $fieldDefs = $this->entityManager->getEntity($this->entityName)->getFields();
+
+            $value = $params['q'];
+
+            $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 . '*'] = '%' . $value . '%';
+                } else {
+                    $d[$field . '*'] = $value . '%';
+                }
+            }
+
+            $result['whereClause']['OR'] = $d;
+        }
+    }
 
     protected function access(&$result)
     {
-    	if ($this->acl->checkReadOnlyOwn($this->entityName)) {
+        if ($this->acl->checkReadOnlyOwn($this->entityName)) {
 
-    		if (!array_key_exists('whereClause', $result)) {
-    			$result['whereClause'] = array();
-    		}
-    		$result['whereClause']['assignedUserId'] = $this->user->id;
-    	}
-    	if ($this->acl->checkReadOnlyTeam($this->entityName)) {
-    		if (!array_key_exists('whereClause', $result)) {
-    			$result['whereClause'] = array();
-    		}
-    		if (!array_key_exists('joins', $result)) {
-    			$result['joins'] = array();
-    		}
-    		if (!in_array('teams', $result['joins'])) {
-    			$result['joins'][] = 'teams';
-    		}
+            if (!array_key_exists('whereClause', $result)) {
+                $result['whereClause'] = array();
+            }
+            $result['whereClause']['assignedUserId'] = $this->user->id;
+        }
+        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['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');
+        }
     }
 
     public function getAclParams()
     {
-    	$result = array();
-    	$this->access($result);
-    	return $result;
+        $result = array();
+        $this->access($result);
+        return $result;
     }
 
-	public function getSelectParams(array $params, $withAcl = false)
-	{
-		$result = array();
+    public function getSelectParams(array $params, $withAcl = false)
+    {
+        $result = array();
 
-		$this->order($params, $result);
-		$this->limit($params, $result);
-		$this->where($params, $result);
-		$this->q($params, $result);
+        $this->order($params, $result);
+        $this->limit($params, $result);
+        $this->where($params, $result);
+        $this->q($params, $result);
 
-		if ($withAcl) {
-			$this->access($result);
-		}
+        if ($withAcl) {
+            $this->access($result);
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	protected function getWherePart($item)
-	{
-		$part = array();
+    protected function getWherePart($item)
+    {
+        $part = array();
 
-		if (!empty($item['type'])) {
-			switch ($item['type']) {
-				case 'or':
-				case 'and':
-					if (is_array($item['value'])) {
-						$arr = array();
-						foreach ($item['value'] as $i) {
-							$a = $this->getWherePart($i);
-							foreach ($a as $left => $right) {
-								if (!empty($right)) {
-									$arr[$left] = $right;
-								}
-							}
-						}
-						$part[strtoupper($item['type'])] = $arr;
-					}
-					break;
-				case 'like':
-					$part[$item['field'] . '*'] = $item['value'];
-					break;
-				case 'equals':
-				case 'on':
-					$part[$item['field'] . '='] = $item['value'];
-					break;
-				case 'notEquals':
-				case 'notOn':
-					$part[$item['field'] . '!='] = $item['value'];
-					break;
-				case 'greaterThan':
-				case 'after':
-					$part[$item['field'] . '>'] = $item['value'];
-					break;
-				case 'lessThan':
-				case 'before':
-					$part[$item['field'] . '<'] = $item['value'];
-					break;
-				case 'greaterThanOrEquals':
-					$part[$item['field'] . '>='] = $item['value'];
-					break;
-				case 'lessThanOrEquals':
-					$part[$item['field'] . '<'] = $item['value'];
-					break;
-				case 'in':
-					$part[$item['field'] . '='] = $item['value'];
-					break;
-				case 'notIn':
-					$part[$item['field'] . '!='] = $item['value'];
-					break;
-				case 'isTrue':
-					$part[$item['field'] . '='] = true;
-					break;
-				case 'isFalse':
-					$part[$item['field'] . '='] = false;
-					break;
-				case 'between':
-					if (is_array($item['value'])) {
-						$part['AND'] = array(
-							$item['field'] . '>=' => $item['value'][0],
-							$item['field'] . '<=' => $item['value'][1],
-						);
-					}
-					break;
-			}
-		}
+        if (!empty($item['type'])) {
+            switch ($item['type']) {
+                case 'or':
+                case 'and':
+                    if (is_array($item['value'])) {
+                        $arr = array();
+                        foreach ($item['value'] as $i) {
+                            $a = $this->getWherePart($i);
+                            foreach ($a as $left => $right) {
+                                if (!empty($right)) {
+                                    $arr[$left] = $right;
+                                }
+                            }
+                        }
+                        $part[strtoupper($item['type'])] = $arr;
+                    }
+                    break;
+                case 'like':
+                    $part[$item['field'] . '*'] = $item['value'];
+                    break;
+                case 'equals':
+                case 'on':
+                    $part[$item['field'] . '='] = $item['value'];
+                    break;
+                case 'notEquals':
+                case 'notOn':
+                    $part[$item['field'] . '!='] = $item['value'];
+                    break;
+                case 'greaterThan':
+                case 'after':
+                    $part[$item['field'] . '>'] = $item['value'];
+                    break;
+                case 'lessThan':
+                case 'before':
+                    $part[$item['field'] . '<'] = $item['value'];
+                    break;
+                case 'greaterThanOrEquals':
+                    $part[$item['field'] . '>='] = $item['value'];
+                    break;
+                case 'lessThanOrEquals':
+                    $part[$item['field'] . '<'] = $item['value'];
+                    break;
+                case 'in':
+                    $part[$item['field'] . '='] = $item['value'];
+                    break;
+                case 'notIn':
+                    $part[$item['field'] . '!='] = $item['value'];
+                    break;
+                case 'isTrue':
+                    $part[$item['field'] . '='] = true;
+                    break;
+                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 'currentMonth':
+                    $dt = new \DateTime();
+                    $part['AND'] = array(
+                        $item['field'] . '>=' => $dt->modify('first day of this month')->format('Y-m-d'),
+                        $item['field'] . '<' => $dt->add(new \DateInterval('P1M'))->format('Y-m-d'),
+                    );
+                    break;
+                case 'lastMonth':
+                    $dt = new \DateTime();
+                    $part['AND'] = array(
+                        $item['field'] . '>=' => $dt->modify('first day of last month')->format('Y-m-d'),
+                        $item['field'] . '<' => $dt->add(new \DateInterval('P1M'))->format('Y-m-d'),
+                    );
+                    break;
+                case 'currentQuarter':
+                    $dt = new \DateTime();
+                    $quarter = ceil($dt->format('m') / 3);
+                    $dt->modify('first day of January this year');
+                    $part['AND'] = array(
+                        $item['field'] . '>=' => $dt->add(new \DateInterval('P'.(($quarter - 1) * 3).'M'))->format('Y-m-d'),
+                        $item['field'] . '<' => $dt->add(new \DateInterval('P3M'))->format('Y-m-d'),
+                    );
+                    break;
+                case 'lastQuarter':
+                    $dt = new \DateTime();
+                    $quarter = ceil($dt->format('m') / 3);
+                    $dt->modify('first day of January this year');
+                    $quarter--;
+                    if ($quarter == 0) {
+                        $quarter = 4;
+                        $dt->sub('P1Y');
+                    }
+                    $part['AND'] = array(
+                        $item['field'] . '>=' => $dt->add(new \DateInterval('P'.(($quarter - 1) * 3).'M'))->format('Y-m-d'),
+                        $item['field'] . '<' => $dt->add(new \DateInterval('P3M'))->format('Y-m-d'),
+                    );
+                    break;
+                case 'currentYear':
+                    $dt = new \DateTime();
+                    $part['AND'] = array(
+                        $item['field'] . '>=' => $dt->modify('first day of January this year')->format('Y-m-d'),
+                        $item['field'] . '<' => $dt->add(new \DateInterval('P1Y'))->format('Y-m-d'),
+                    );
+                    break;
+                case 'lastYear':
+                    $dt = new \DateTime();
+                    $part['AND'] = array(
+                        $item['field'] . '>=' => $dt->modify('first day of January last year')->format('Y-m-d'),
+                        $item['field'] . '<' => $dt->add(new \DateInterval('P1Y'))->format('Y-m-d'),
+                    );
+                    break;
+                case 'between':
+                    if (is_array($item['value'])) {
+                        $part['AND'] = array(
+                            $item['field'] . '>=' => $item['value'][0],
+                            $item['field'] . '<=' => $item['value'][1],
+                        );
+                    }
+                    break;
+            }
+        }
 
-		return $part;
-	}
+        return $part;
+    }
 
-	protected function getBoolFilterWhere($filterName)
-	{
-		$method = 'getBoolFilterWhere' . ucfirst($filterName);
-		if (method_exists($this, $method)) {
-			return $this->$method();
-		}
-	}
+    protected function getBoolFilterWhere($filterName)
+    {
+        $method = 'getBoolFilterWhere' . ucfirst($filterName);
+        if (method_exists($this, $method)) {
+            return $this->$method();
+        }
+    }
 
-	protected function getBoolFilterWhereOnlyMy()
-	{
-		return array(
-			'type' => 'equals',
-			'field' => 'assignedUserId',
-			'value' => $this->user->id,
-		);
-	}
+    protected function getBoolFilterWhereOnlyMy()
+    {
+        return array(
+            'type' => 'equals',
+            'field' => 'assignedUserId',
+            'value' => $this->user->id,
+        );
+    }
 }
 

application/Espo/Core/ServiceFactory.php

@@ -28,127 +28,127 @@ use \Espo\Core\Utils\Util;
 
 class ServiceFactory
 {
-	private $container;
+    private $container;
 
-	protected $cacheFile = 'data/cache/application/services.php';
+    protected $cacheFile = 'data/cache/application/services.php';
 
-	/**
+    /**
      * @var array - path to Service files
      */
-	protected $paths = array(
-		'corePath' => 'application/Espo/Services',
-    	'modulePath' => 'application/Espo/Modules/{*}/Services',
-    	'customPath' => 'custom/Espo/Custom/Services',
-	);
+    protected $paths = array(
+        'corePath' => 'application/Espo/Services',
+        'modulePath' => 'application/Espo/Modules/{*}/Services',
+        'customPath' => 'custom/Espo/Custom/Services',
+    );
 
-	protected $data;
+    protected $data;
 
     public function __construct(Container $container)
     {
-    	$this->container = $container;
+        $this->container = $container;
     }
 
-	protected function init()
-	{
-		$config = $this->getContainer()->get('config');
+    protected function init()
+    {
+        $config = $this->getContainer()->get('config');
 
-		if (file_exists($this->cacheFile) && $config->get('useCache')) {
-			$this->data = $this->getFileManager()->getContents($this->cacheFile);
-		} else {
-			$this->data = $this->getClassNameHash($this->paths['corePath']);
+        if (file_exists($this->cacheFile) && $config->get('useCache')) {
+            $this->data = $this->getFileManager()->getContents($this->cacheFile);
+        } else {
+            $this->data = $this->getClassNameHash($this->paths['corePath']);
 
-	    	foreach ($this->getContainer()->get('metadata')->getModuleList() as $moduleName) {
-	    		$path = str_replace('{*}', $moduleName, $this->paths['modulePath']);
-				$this->data = array_merge($this->data, $this->getClassNameHash($path));
-	    	}
+            foreach ($this->getContainer()->get('metadata')->getModuleList() as $moduleName) {
+                $path = str_replace('{*}', $moduleName, $this->paths['modulePath']);
+                $this->data = array_merge($this->data, $this->getClassNameHash($path));
+            }
 
-	    	$this->data = array_merge($this->data, $this->getClassNameHash($this->paths['customPath']));
+            $this->data = array_merge($this->data, $this->getClassNameHash($this->paths['customPath']));
 
-			if ($config->get('useCache')) {
-				$result = $this->getFileManager()->putContentsPHP($this->cacheFile, $this->data);
-				if ($result == false) {
-					throw new \Espo\Core\Exceptions\Error();
-				}
-			}
-		}
-	}
+            if ($config->get('useCache')) {
+                $result = $this->getFileManager()->putContentsPHP($this->cacheFile, $this->data);
+                if ($result == false) {
+                    throw new \Espo\Core\Exceptions\Error();
+                }
+            }
+        }
+    }
 
-	protected function getFileManager()
-	{
-		return $this->container->get('fileManager');
-	}
+    protected function getFileManager()
+    {
+        return $this->container->get('fileManager');
+    }
 
-	protected function getContainer()
-	{
-		return $this->container;
-	}
+    protected function getContainer()
+    {
+        return $this->container;
+    }
 
-	protected function getClassName($name)
-	{
-		$name = Util::normilizeClassName($name);
+    protected function getClassName($name)
+    {
+        $name = Util::normilizeClassName($name);
 
-		if (!isset($this->data)) {
-			$this->init();
-		}
+        if (!isset($this->data)) {
+            $this->init();
+        }
 
-		$name = ucfirst($name);
-		if (isset($this->data[$name])) {
-			return $this->data[$name];
-		}
+        $name = ucfirst($name);
+        if (isset($this->data[$name])) {
+            return $this->data[$name];
+        }
 
         return false;
-	}
+    }
 
-	public function checkExists($name) {
-		$className = $this->getClassName($name);
-		if (!empty($className)) {
-			return true;
-		}
-	}
+    public function checkExists($name) {
+        $className = $this->getClassName($name);
+        if (!empty($className)) {
+            return true;
+        }
+    }
 
     public function create($name)
     {
-    	$className = $this->getClassName($name);
-    	if (empty($className)) {
-    		throw new Error();
-    	}
-    	return $this->createByClassName($className);
+        $className = $this->getClassName($name);
+        if (empty($className)) {
+            throw new Error();
+        }
+        return $this->createByClassName($className);
     }
 
-	protected function createByClassName($className)
-	{
-    	if (class_exists($className)) {
-    		$service = new $className();
-    		$dependencies = $service->getDependencyList();
-    		foreach ($dependencies as $name) {
-    			$service->inject($name, $this->container->get($name));
-    		}
-    		return $service;
-    	}
-    	throw new Error("Class '$className' does not exist");
-	}
+    protected function createByClassName($className)
+    {
+        if (class_exists($className)) {
+            $service = new $className();
+            $dependencies = $service->getDependencyList();
+            foreach ($dependencies as $name) {
+                $service->inject($name, $this->container->get($name));
+            }
+            return $service;
+        }
+        throw new Error("Class '$className' does not exist");
+    }
 
-	// TODO delegate to another class
-	protected function getClassNameHash($dirs)
-	{
-		if (is_string($dirs)) {
-			$dirs = (array) $dirs;
-		}
+    // TODO delegate to another class
+    protected function getClassNameHash($dirs)
+    {
+        if (is_string($dirs)) {
+            $dirs = (array) $dirs;
+        }
 
-		$data = array();
+        $data = array();
 
-		foreach ($dirs as $dir) {
-			if (file_exists($dir)) {
-	        	$fileList = $this->getFileManager()->getFileList($dir, false, '\.php$', 'file');
-	            foreach ($fileList as $file) {
-					$filePath = Util::concatPath($dir, $file);
-                	$className = Util::getClassName($filePath);
-                	$fileName = $this->getFileManager()->getFileName($filePath);
-					$data[$fileName] = $className;
-	            }
-			}
-		}
-		return $data;
-	}
+        foreach ($dirs as $dir) {
+            if (file_exists($dir)) {
+                $fileList = $this->getFileManager()->getFileList($dir, false, '\.php$', true);
+                foreach ($fileList as $file) {
+                    $filePath = Util::concatPath($dir, $file);
+                    $className = Util::getClassName($filePath);
+                    $fileName = $this->getFileManager()->getFileName($filePath);
+                    $data[$fileName] = $className;
+                }
+            }
+        }
+        return $data;
+    }
 }
 

application/Espo/Core/Services/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\Services;
 
@@ -26,32 +26,51 @@ use \Espo\Core\Interfaces\Injectable;
 
 abstract class Base implements Injectable
 {
-	protected $dependencies = array();
-	
-	protected $injections = array();
-	
-	public function inject($name, $object)
-	{
-		$this->injections[$name] = $object;
-	}
-	
-	public function __construct()
-	{
-		$this->init();
-	}
-	
-	protected function init()
-	{	
-	}
-	
-	protected function getInjection($name)
-	{
-		return $this->injections[$name];
-	}
-	
-	public function getDependencyList()
-	{
-		return $this->dependencies;
-	}
+    protected $dependencies = array(
+        'config',
+        'entityManager',
+        'user',
+    );
+
+    protected $injections = array();
+
+    public function inject($name, $object)
+    {
+        $this->injections[$name] = $object;
+    }
+
+    public function __construct()
+    {
+        $this->init();
+    }
+
+    protected function init()
+    {
+    }
+
+    protected function getInjection($name)
+    {
+        return $this->injections[$name];
+    }
+
+    public function getDependencyList()
+    {
+        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/UpgradeManager.php

@@ -26,11 +26,14 @@ use Espo\Core\Exceptions\Error;
 
 class UpgradeManager extends Upgrades\Base
 {
-	protected $packagePath = 'data/upload/upgrades';
+    protected $name = 'Upgrade';
 
-	protected $scriptNames = array(
-		'before' => 'BeforeUpgrade',
-		'after' => 'AfterUpgrade',
-	);
+    protected $params = array(
+        'packagePath' => 'data/upload/upgrades',
 
+        'scriptNames' => array(
+            'before' => 'BeforeUpgrade',
+            'after' => 'AfterUpgrade',
+        )
+    );
 }

application/Espo/Core/Upgrades/ActionManager.php

@@ -0,0 +1,102 @@
+<?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\Upgrades;
+
+use Espo\Core\Exceptions\Error;
+
+class ActionManager
+{
+    private $managerName;
+
+    private $container;
+
+    private $objects;
+
+    protected $currentAction;
+
+    protected $params;
+
+    public function __construct($managerName, $container, $params)
+    {
+        $this->managerName = $managerName;
+        $this->container = $container;
+
+        $params['name'] = $managerName;
+        $this->params = $params;
+    }
+
+    protected function getManagerName()
+    {
+        return $this->managerName;
+    }
+
+    protected function getContainer()
+    {
+        return $this->container;
+    }
+
+    public function setAction($action)
+    {
+        $this->currentAction = $action;
+    }
+
+    public function getAction()
+    {
+        return $this->currentAction;
+    }
+
+    public function getParams()
+    {
+        return $this->params;
+    }
+
+    public function run($data)
+    {
+        $object = $this->getObject();
+
+        return $object->run($data);
+    }
+
+    public function getManifest()
+    {
+        return $this->getObject()->getManifest();
+    }
+
+    protected function getObject()
+    {
+        $managerName = $this->getManagerName();
+        $actionName = $this->getAction();
+
+        if (!isset($this->objects[$managerName][$actionName])) {
+            $class = '\Espo\Core\Upgrades\Actions\\' . ucfirst($managerName) . '\\' . ucfirst($actionName);
+
+            if (!class_exists($class)) {
+                throw new Error('Could not find an action ['.ucfirst($actionName).'], class ['.$class.'].');
+            }
+
+            $this->objects[$managerName][$actionName] = new $class($this->container, $this);
+        }
+
+        return $this->objects[$managerName][$actionName];
+    }
+}

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

@@ -0,0 +1,495 @@
+<?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\Upgrades\Actions;
+
+use Espo\Core\Utils\Util,
+    Espo\Core\Utils\Json,
+    Espo\Core\Exceptions\Error;
+
+abstract class Base
+{
+    private $config;
+
+    private $entityManager;
+
+    protected $data;
+
+    protected $params = null;
+
+    private $container;
+
+    private $actionManager;
+
+    private $zipUtil;
+
+    private $fileManager;
+
+    protected $processId = null;
+
+    protected $manifestName = 'manifest.json';
+
+    protected $packagePostfix = 'z';
+
+    /**
+     * Directory name of files in a package
+     */
+    const FILES = 'files';
+
+    /**
+     * Directory name of scripts in a package
+     */
+    const SCRIPTS = 'scripts';
+
+    /**
+     * Package types
+     */
+    protected $packageTypes = array(
+        'upgrade' => 'upgrade',
+        'extension' => 'extension',
+    );
+
+    /**
+     * Default package type
+     */
+    protected $defaultPackageType = 'extension';
+
+
+    public function __construct(\Espo\Core\Container $container, \Espo\Core\Upgrades\ActionManager $actionManager)
+    {
+        $this->container = $container;
+        $this->actionManager = $actionManager;
+        $this->params = $actionManager->getParams();
+
+        $this->zipUtil = new \Espo\Core\Utils\File\ZipArchive($container->get('fileManager'));
+    }
+
+    public function __destruct()
+    {
+        $this->processId = null;
+        $this->data = null;
+    }
+
+    protected function getContainer()
+    {
+        return $this->container;
+    }
+
+    protected function getActionManager()
+    {
+        return $this->actionManager;
+    }
+
+    protected function getParams($name = null)
+    {
+        if (isset($this->params[$name])) {
+            return $this->params[$name];
+        }
+
+        return $this->params;
+    }
+
+    protected function getZipUtil()
+    {
+        return $this->zipUtil;
+    }
+
+    protected function getFileManager()
+    {
+        if (!isset($this->fileManager)) {
+            $this->fileManager = $this->getContainer()->get('fileManager');
+        }
+        return $this->fileManager;
+    }
+
+    protected function getConfig()
+    {
+        if (!isset($this->config)) {
+            $this->config = $this->getContainer()->get('config');
+        }
+        return $this->config;
+    }
+
+    protected function getEntityManager()
+    {
+        if (!isset($this->entityManager)) {
+            $this->entityManager = $this->getContainer()->get('entityManager');
+        }
+        return $this->entityManager;
+    }
+
+    protected function throwErrorAndRemovePackage($errorMessage = '')
+    {
+        $this->deletePackageFiles();
+        $this->deletePackageArchive();
+        throw new Error($errorMessage);
+    }
+
+    abstract public function run($data);
+
+    protected function createProcessId()
+    {
+        if (isset($this->processId)) {
+            throw new Error('Another installation process is currently running.');
+        }
+
+        $this->processId = uniqid();
+
+        return $this->processId;
+    }
+
+    protected function getProcessId()
+    {
+        if (!isset($this->processId)) {
+            throw new Error('Installation ID was not specified.');
+        }
+
+        return $this->processId;
+    }
+
+    protected function setProcessId($processId)
+    {
+        $this->processId = $processId;
+    }
+
+    /**
+     * Check if version of upgrade/extension is acceptable to current version of EspoCRM
+     *
+     * @param  string  $version
+     * @return boolean
+     */
+    protected function isAcceptable()
+    {
+        $res = $this->checkPackageType();
+        $res &= $this->checkVersions();
+
+        return (bool) $res;
+    }
+
+    protected function checkVersions()
+    {
+        $manifest = $this->getManifest();
+
+        /** check acceptable versions */
+        $version = $manifest['acceptableVersions'];
+        if (empty($version)) {
+            return true;
+        }
+
+        $currentVersion = $this->getConfig()->get('version');
+
+        if (is_string($version)) {
+            $version = (array) $version;
+        }
+
+        foreach ($version as $strVersion) {
+
+            $strVersion = trim($strVersion);
+
+            if ($strVersion == $currentVersion) {
+                return true;
+            }
+
+            $strVersion = str_replace('\\', '', $strVersion);
+            $strVersion = preg_quote($strVersion);
+            $strVersion = str_replace('\\*', '+', $strVersion);
+
+            if (preg_match('/^'.$strVersion.'/', $currentVersion)) {
+                return true;
+            }
+        }
+
+        $this->throwErrorAndRemovePackage('Your EspoCRM version doesn\'t match for this installation package.');
+    }
+
+    protected function checkPackageType()
+    {
+        $manifest = $this->getManifest();
+
+        /** check package type */
+        $type = strtolower( $this->getParams('name') );
+        $manifestType = isset($manifest['type']) ? strtolower($manifest['type']) : $this->defaultPackageType;
+
+        if (!in_array($manifestType, $this->packageTypes)) {
+            $this->throwErrorAndRemovePackage('Unknown package type.');
+        }
+
+        if ($type != $manifestType) {
+            $this->throwErrorAndRemovePackage('Wrong package type. You cannot install '.$manifestType.' package via '.ucfirst($type).' Manager.');
+        }
+
+        return true;
+    }
+
+    /**
+     * Run scripts by type
+     * @param  string $type Ex. "before", "after"
+     * @return void
+     */
+    protected function runScript($type)
+    {
+        $packagePath = $this->getPackagePath();
+        $scriptNames = $this->getParams('scriptNames');
+
+        $scriptName = $scriptNames[$type];
+        if (!isset($scriptName)) {
+            return;
+        }
+
+        $beforeInstallScript = Util::concatPath( array($packagePath, self::SCRIPTS, $scriptName) ) . '.php';
+
+        if (file_exists($beforeInstallScript)) {
+            require_once($beforeInstallScript);
+            $script = new $scriptName();
+
+            try {
+                $script->run($this->getContainer());
+            } catch (\Exception $e) {
+                $this->throwErrorAndRemovePackage($e->getMessage());
+            }
+        }
+    }
+
+    /**
+     * Get package path
+     *
+     * @param  string $processId
+     * @return string
+     */
+    protected function getPath($name = 'packagePath', $isPackage = false)
+    {
+        $postfix = $isPackage ? $this->packagePostfix : '';
+
+        $processId = $this->getProcessId();
+        $path = Util::concatPath($this->getParams($name), $processId);
+
+        return $path . $postfix;
+    }
+
+    protected function getPackagePath($isPackage = false)
+    {
+        return $this->getPath('packagePath', $isPackage);
+    }
+
+    /**
+     * Get a list of files defined in manifest.json
+     *
+     * @return [type] [description]
+     */
+    protected function getDeleteFileList()
+    {
+        $manifest = $this->getManifest();
+
+        if (!empty($manifest['delete'])) {
+            return $manifest['delete'];
+        }
+
+        return array();
+    }
+
+    /**
+     * Delete files defined in a manifest
+     *
+     * @return boolen
+     */
+    protected function deleteFiles($withEmptyDirs = false)
+    {
+        $deleteFileList = $this->getDeleteFileList();
+
+        //remove directories, leave only files
+        foreach ($deleteFileList as $key => $filePath) {
+            if (!is_file($filePath)) {
+                unset($deleteFileList[$key]);
+            }
+        }
+
+        if (!empty($deleteFileList)) {
+            return $this->getFileManager()->remove($deleteFileList, null, $withEmptyDirs);
+        }
+
+        return true;
+    }
+
+    protected function getCopyFileList()
+    {
+        if (!isset($this->data['fileList'])) {
+            $packagePath = $this->getPackagePath();
+            $filesPath = Util::concatPath($packagePath, self::FILES);
+
+            $this->data['fileList'] = $this->getFileManager()->getFileList($filesPath, true, '', true, true);
+        }
+
+        return $this->data['fileList'];
+    }
+
+    protected function copy($sourcePath, $destPath, $recursively = false, array $fileList = null, $copyOnlyFiles = false)
+    {
+        try {
+            $res = $this->getFileManager()->copy($sourcePath, $destPath, $recursively, $fileList, $copyOnlyFiles);
+        } catch (\Exception $e) {
+            $this->throwErrorAndRemovePackage($e->getMessage());
+        }
+
+        return $res;
+    }
+
+    /**
+     * Copy files from upgrade/extension package
+     *
+     * @param  string $processId
+     * @return boolean
+     */
+    protected function copyFiles()
+    {
+        $packagePath = $this->getPackagePath();
+        $filesPath = Util::concatPath($packagePath, self::FILES);
+
+        return $this->copy($filesPath, '', true);
+    }
+
+    public function getManifest()
+    {
+        if (!isset($this->data['manifest'])) {
+            $packagePath = $this->getPackagePath();
+
+            $manifestPath = Util::concatPath($packagePath, $this->manifestName);
+            if (!file_exists($manifestPath)) {
+                $this->throwErrorAndRemovePackage('It\'s not an Installation package.');
+            }
+
+            $manifestJson = $this->getFileManager()->getContents($manifestPath);
+            $this->data['manifest'] = Json::decode($manifestJson, true);
+
+            if (!$this->data['manifest']) {
+                $this->throwErrorAndRemovePackage('Syntax error in manifest.json.');
+            }
+
+            if (!$this->checkManifest($this->data['manifest'])) {
+                $this->throwErrorAndRemovePackage('Unsupported package.');
+            }
+        }
+
+        return $this->data['manifest'];
+    }
+
+    /**
+     * Check if the manifest is correct
+     *
+     * @param  array  $manifest
+     * @return boolean
+     */
+    protected function checkManifest(array $manifest)
+    {
+        $requiredFields = array(
+            'name',
+            'version',
+        );
+
+        foreach ($requiredFields as $fieldName) {
+            if (empty($manifest[$fieldName])) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Unzip a package archieve
+     *
+     * @return void
+     */
+    protected function unzipArchive($packagePath = null)
+    {
+        $packagePath = isset($packagePath) ? $packagePath : $this->getPackagePath();
+        $packageArchivePath = $this->getPackagePath(true);
+
+        if (!file_exists($packageArchivePath)) {
+            throw new Error('Package Archive doesn\'t exist.');
+        }
+
+        $res = $this->getZipUtil()->unzip($packageArchivePath, $packagePath);
+        if ($res === false) {
+            throw new Error('Unnable to unzip the file - '.$packagePath.'.');
+        }
+    }
+
+    /**
+     * Delete temporary package files
+     *
+     * @return boolean
+     */
+    protected function deletePackageFiles()
+    {
+        $packagePath = $this->getPackagePath();
+        $res = $this->getFileManager()->removeInDir($packagePath, true);
+
+        return $res;
+    }
+
+    /**
+     * Delete temporary package archive
+     *
+     * @return boolean
+     */
+    protected function deletePackageArchive()
+    {
+        $packageArchive = $this->getPackagePath(true);
+        $res = $this->getFileManager()->removeFile($packageArchive);
+
+        return $res;
+    }
+
+    protected function systemRebuild()
+    {
+        return $this->getContainer()->get('dataManager')->rebuild();
+    }
+
+    /**
+     * Execute an action. For ex., execute uninstall action in install
+     *
+     * @param  [type] $actionName [description]
+     * @param  [type] $data       [description]
+     * @return [type]             [description]
+     */
+    protected function executeAction($actionName, $data)
+    {
+        $currentAction = $this->getActionManager()->getAction();
+
+        $this->getActionManager()->setAction($actionName);
+        $this->getActionManager()->run($data);
+
+        $this->getActionManager()->setAction($currentAction);
+    }
+
+    protected function beforeRunAction()
+    {
+
+    }
+
+    protected function afterRunAction()
+    {
+
+    }
+
+
+}

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

@@ -0,0 +1,55 @@
+<?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\Upgrades\Actions\Base;
+
+class Delete extends \Espo\Core\Upgrades\Actions\Base
+{
+    public function run($processId)
+    {
+        $GLOBALS['log']->debug('Delete package process ['.$processId.']: start run.');
+
+        if (empty($processId)) {
+            throw new Error('Delete package package ID was not specified.');
+        }
+
+        $this->setProcessId($processId);
+
+        $this->beforeRunAction();
+
+        /* delete a package */
+        $this->deletePackage();
+
+        $this->afterRunAction();
+
+        $GLOBALS['log']->debug('Delete package process ['.$processId.']: end run.');
+    }
+
+    protected function deletePackage()
+    {
+        $packageArchivePath = $this->getPackagePath(true);
+        $res = $this->getFileManager()->removeFile($packageArchivePath);
+
+        return $res;
+    }
+
+}

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

@@ -0,0 +1,112 @@
+<?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\Upgrades\Actions\Base;
+
+use Espo\Core\Exceptions\Error;
+
+class Install extends \Espo\Core\Upgrades\Actions\Base
+{
+    /**
+     * Is copied extension files to Espo
+     *
+     * @var [type]
+     */
+    protected $isCopied = null;
+
+    /**
+     * Main installation process
+     *
+     * @param  string $processId Upgrade/Extension ID, gotten in upload stage
+     * @return bool
+     */
+    public function run($processId)
+    {
+        $GLOBALS['log']->debug('Installation process ['.$processId.']: start run.');
+
+        if (empty($processId)) {
+            throw new Error('Installation package ID was not specified.');
+        }
+
+        $this->setProcessId($processId);
+
+        $this->isCopied = false;
+
+        /** check if an archive is unzipped, if no then unzip */
+        $packagePath = $this->getPackagePath();
+        if (!file_exists($packagePath)) {
+            $this->unzipArchive();
+            $this->isAcceptable();
+        }
+
+        $this->beforeRunAction();
+
+        /* run before install script */
+        $this->runScript('before');
+
+        /* remove files defined in a manifest */
+        if (!$this->deleteFiles()) {
+            $this->throwErrorAndRemovePackage('Permission denied to delete files.');
+        }
+
+        /* copy files from directory "Files" to EspoCRM files */
+        if (!$this->copyFiles()) {
+            $this->throwErrorAndRemovePackage('Cannot copy files.');
+        }
+        $this->isCopied = true;
+
+        if (!$this->systemRebuild()) {
+            $this->throwErrorAndRemovePackage('Error occurred while EspoCRM rebuild.');
+        }
+
+        /* run before install script */
+        $this->runScript('after');
+
+        $this->afterRunAction();
+
+        /* delete unziped files */
+        $this->deletePackageFiles();
+
+        $GLOBALS['log']->debug('Installation process ['.$processId.']: end run.');
+    }
+
+    protected function restoreFiles()
+    {
+        $backupPath = $this->getPath('backupPath');
+
+        $res = true;
+        if ($this->isCopied) {
+            $res &= $this->copy(array($backupPath, self::FILES), '', true);
+            $GLOBALS['log']->info('Restore: copy back');
+        }
+
+        $res &= $this->getFileManager()->removeInDir($backupPath, true);
+
+        return $res;
+    }
+
+    protected function throwErrorAndRemovePackage($errorMessage = '')
+    {
+        $this->restoreFiles();
+        parent::throwErrorAndRemovePackage($errorMessage);
+    }
+}

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

@@ -0,0 +1,132 @@
+<?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\Upgrades\Actions\Base;
+
+use Espo\Core\Exceptions\Error,
+    Espo\Core\Utils\Util;
+
+class Uninstall extends \Espo\Core\Upgrades\Actions\Base
+{
+    public function run($processId)
+    {
+        $GLOBALS['log']->debug('Uninstallation process ['.$processId.']: start run.');
+
+        if (empty($processId)) {
+            throw new Error('Uninstallation package ID was not specified.');
+        }
+
+        $this->setProcessId($processId);
+
+        $this->beforeRunAction();
+
+        /* run before install script */
+        $this->runScript('beforeUninstall');
+
+        $backupPath = $this->getPath('backupPath');
+        if (file_exists($backupPath)) {
+
+            /* remove extension files, saved in fileList */
+            if (!$this->deleteFiles(true)) {
+                throw new Error('Permission denied to delete files.');
+            }
+
+            /* copy core files */
+            if (!$this->copyFiles()) {
+                throw new Error('Cannot copy files.');
+            }
+        }
+
+        if (!$this->systemRebuild()) {
+            throw new Error('Error occurred while EspoCRM rebuild.');
+        }
+
+        /* run before install script */
+        $this->runScript('afterUninstall');
+
+        $this->afterRunAction();
+
+        /* delete backup files */
+        $this->deletePackageFiles();
+
+        $GLOBALS['log']->debug('Uninstallation process ['.$processId.']: end run.');
+    }
+
+    protected function getDeleteFileList()
+    {
+        $extensionEntity = $this->getExtensionEntity();
+        return $extensionEntity->get('fileList');
+    }
+
+    protected function restoreFiles()
+    {
+        $packagePath = $this->getPath('packagePath');
+        $filesPath = Util::concatPath($packagePath, self::FILES);
+
+        if (!file_exists($filesPath)) {
+            $this->unzipArchive($packagePath);
+        }
+
+        $res = $this->copy($filesPath, '', true);
+        $res &= $this->getFileManager()->removeInDir($packagePath, true);
+
+        return $res;
+    }
+
+    protected function copyFiles()
+    {
+        $backupPath = $this->getPath('backupPath');
+        $res = $this->copy(array($backupPath, self::FILES), '', true);
+
+        return $res;
+    }
+
+    /**
+     * Get backup path
+     *
+     * @param  string $processId
+     * @return string
+     */
+    protected function getPackagePath($isPackage = false)
+    {
+        if ($isPackage) {
+            return $this->getPath('packagePath', $isPackage);
+        }
+
+        return $this->getPath('backupPath');
+    }
+
+    protected function deletePackageFiles()
+    {
+        $backupPath = $this->getPath('backupPath');
+        $res = $this->getFileManager()->removeInDir($backupPath, true);
+
+        return $res;
+    }
+
+    protected function throwErrorAndRemovePackage($errorMessage = '')
+    {
+        $this->restoreFiles();
+        throw new Error($errorMessage);
+    }
+
+}

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

@@ -0,0 +1,62 @@
+<?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\Upgrades\Actions\Base;
+
+use Espo\Core\Exceptions\Error;
+
+class Upload extends \Espo\Core\Upgrades\Actions\Base
+{
+    /**
+     * Upload an upgrade/extension package
+     *
+     * @param  [type] $contents
+     * @return string  ID of upgrade/extension process
+     */
+    public function run($data)
+    {
+        $processId = $this->createProcessId();
+
+        $GLOBALS['log']->debug('Installation process ['.$processId.']: start upload the package.');
+
+        $packagePath = $this->getPackagePath();
+        $packageArchivePath = $this->getPackagePath(true);
+
+        if (!empty($data)) {
+            list($prefix, $contents) = explode(',', $data);
+            $contents = base64_decode($contents);
+        }
+
+        $res = $this->getFileManager()->putContents($packageArchivePath, $contents);
+        if ($res === false) {
+            throw new Error('Could not upload the package.');
+        }
+
+        $this->unzipArchive();
+
+        $this->isAcceptable();
+
+        $GLOBALS['log']->debug('Installation process ['.$processId.']: end upload the package.');
+
+        return $processId;
+    }
+}

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

@@ -0,0 +1,69 @@
+<?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\Upgrades\Actions\Extension;
+
+use Espo\Core\Exceptions\Error;
+
+class Delete extends \Espo\Core\Upgrades\Actions\Base\Delete
+{
+    protected $extensionEntity;
+
+    /**
+     * Get entity of this extension
+     *
+     * @return \Espo\Entities\Extension
+     */
+    protected function getExtensionEntity()
+    {
+        return $this->extensionEntity;
+    }
+
+    /**
+     * Set Extension Entity
+     *
+     * @param \Espo\Entities\Extension $extensionEntity
+     */
+    protected function setExtensionEntity(\Espo\Entities\Extension $extensionEntity)
+    {
+        $this->extensionEntity = $extensionEntity;
+    }
+
+    protected function beforeRunAction()
+    {
+        $processId = $this->getProcessId();
+
+        /** get extension entity */
+        $extensionEntity = $this->getEntityManager()->getEntity('Extension', $processId);
+        if (!isset($extensionEntity)) {
+            throw new Error('Extension Entity not found.');
+        }
+        $this->setExtensionEntity($extensionEntity);
+    }
+
+    protected function afterRunAction()
+    {
+        /** Delete extension entity */
+        $extensionEntity = $this->getExtensionEntity();
+        $this->getEntityManager()->removeEntity($extensionEntity);
+    }
+}

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

@@ -0,0 +1,229 @@
+<?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\Upgrades\Actions\Extension;
+
+use Espo\Core\Exceptions\Error,
+    Espo\Core\ExtensionManager;
+
+class Install extends \Espo\Core\Upgrades\Actions\Base\Install
+{
+    protected $extensionEntity = null;
+
+    protected function beforeRunAction()
+    {
+        $this->findExtension();
+        if (!$this->isNew()) {
+            $this->compareVersion();
+            $this->uninstallExtension();
+            $this->deleteExtension();
+        }
+
+        $this->copyExistingFiles();
+    }
+
+    protected function afterRunAction()
+    {
+        $this->storeExtension();
+    }
+
+    /**
+     * Copy Existing files to backup directory
+     *
+     * @return bool
+     */
+    protected function copyExistingFiles()
+    {
+        $fileList = $this->getCopyFileList();
+        $backupPath = $this->getPath('backupPath');
+
+        $res = $this->copy('', array($backupPath, self::FILES), false, $fileList);
+
+        /** copy scripts files */
+        $packagePath = $this->getPackagePath();
+        $res &= $this->copy(array($packagePath, self::SCRIPTS), array($backupPath, self::SCRIPTS), true);
+
+        return $res;
+    }
+
+    protected function restoreFiles()
+    {
+        $res = true;
+        if ($this->isCopied) {
+            $extensionFileList = $this->getCopyFileList();
+            $res &= $this->getFileManager()->remove($extensionFileList);
+        }
+
+        $res &= parent::restoreFiles();
+
+        return $res;
+    }
+
+    protected function isNew()
+    {
+        $extensionEntity = $this->getExtensionEntity();
+
+        if (isset($extensionEntity)) {
+            $id = $this->getExtensionEntity()->get('id');
+        }
+
+        return isset($id) ? false : true;
+    }
+
+    /**
+     * Get extension ID. It's an ID of existing entity (if available) or Installation ID
+     *
+     * @return string
+     */
+    protected function getExtensionId()
+    {
+        $extensionEntity = $this->getExtensionEntity();
+        if (isset($extensionEntity)) {
+            $extensionEntityId = $extensionEntity->get('id');
+        }
+
+        if (!isset($extensionEntityId)) {
+            return $this->getProcessId();
+        }
+
+        return $extensionEntityId;
+    }
+
+    /**
+     * Get entity of this extension
+     *
+     * @return \Espo\Entities\Extension
+     */
+    protected function getExtensionEntity()
+    {
+        return $this->extensionEntity;
+    }
+
+    /**
+     * Find Extension entity
+     *
+     * @return \Espo\Entities\Extension
+     */
+    protected function findExtension()
+    {
+        $manifest = $this->getManifest();
+
+        $this->extensionEntity = $this->getEntityManager()->getRepository('Extension')->where(array(
+            'name' => $manifest['name'],
+            'isInstalled' => true,
+        ))->findOne();
+
+        return $this->extensionEntity;
+    }
+
+    /**
+     * Create a record of Extension Entity
+     *
+     * @return bool
+     */
+    protected function storeExtension()
+    {
+        $entityManager = $this->getEntityManager();
+
+        $extensionEntity = $entityManager->getEntity('Extension', $this->getProcessId());
+        if (!isset($extensionEntity)) {
+            $extensionEntity = $entityManager->getEntity('Extension');
+        }
+
+        $manifest = $this->getManifest();
+        $fileList = $this->getCopyFileList();
+
+        $data = array(
+            'id' => $this->getProcessId(),
+            'name' => $manifest['name'],
+            'isInstalled' => true,
+            'version' => $manifest['version'],
+            'fileList' => $fileList,
+            'description' => $manifest['description'],
+        );
+        $extensionEntity->set($data);
+
+        return $entityManager->saveEntity($extensionEntity);
+    }
+
+    /**
+     * Compare version between installed and a new extensions
+     *
+     * @return void
+     */
+    protected function compareVersion()
+    {
+        $manifest = $this->getManifest();
+        $extensionEntity = $this->getExtensionEntity();
+
+        if (isset($extensionEntity)) {
+            $comparedVersion = version_compare($manifest['version'], $extensionEntity->get('version'));
+            if ($comparedVersion <= 0) {
+                $this->throwErrorAndRemovePackage('You cannot install an older version of this extension.');
+            }
+        }
+    }
+
+    /**
+     * Throw an exception and remove package files.
+     * Redeclared to prevent of deleting a package of installed extension.
+     *
+     * @param  string $errorMessage [description]
+     * @return [type]               [description]
+     */
+    protected function throwErrorAndRemovePackage($errorMessage = '')
+    {
+        if (!$this->isNew()) {
+            throw new Error($errorMessage);
+        }
+
+        return parent::throwErrorAndRemovePackage($errorMessage);
+    }
+
+    /**
+     * If extension already installed, uninstall an old version
+     *
+     * @return void
+     */
+    protected function uninstallExtension()
+    {
+        $extensionEntity = $this->getExtensionEntity();
+
+        $this->executeAction(ExtensionManager::UNINSTALL, $extensionEntity->get('id'));
+    }
+
+    /**
+     * Delete extension package
+     *
+     * @return void
+     */
+    protected function deleteExtension()
+    {
+        $extensionEntity = $this->getExtensionEntity();
+
+        $this->executeAction(ExtensionManager::DELETE, $extensionEntity->get('id'));
+    }
+
+
+
+
+}

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

@@ -0,0 +1,71 @@
+<?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\Upgrades\Actions\Extension;
+
+use Espo\Core\Exceptions\Error;
+
+class Uninstall extends \Espo\Core\Upgrades\Actions\Base\Uninstall
+{
+    protected $extensionEntity;
+
+    /**
+     * Get entity of this extension
+     *
+     * @return \Espo\Entities\Extension
+     */
+    protected function getExtensionEntity()
+    {
+        return $this->extensionEntity;
+    }
+
+    /**
+     * Set Extension Entity
+     *
+     * @param \Espo\Entities\Extension $extensionEntity [description]
+     */
+    protected function setExtensionEntity(\Espo\Entities\Extension $extensionEntity)
+    {
+        $this->extensionEntity = $extensionEntity;
+    }
+
+    protected function beforeRunAction()
+    {
+        $processId = $this->getProcessId();
+
+        /** get extension entity */
+        $extensionEntity = $this->getEntityManager()->getEntity('Extension', $processId);
+        if (!isset($extensionEntity)) {
+            throw new Error('Extension Entity not found.');
+        }
+        $this->setExtensionEntity($extensionEntity);
+    }
+
+    protected function afterRunAction()
+    {
+        /** Set extension entity, isInstalled = false */
+        $extensionEntity = $this->getExtensionEntity();
+
+        $extensionEntity->set('isInstalled', false);
+        $this->getEntityManager()->saveEntity($extensionEntity);
+    }
+}

application/Espo/Core/Upgrades/Actions/Extension/Upload.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\Core\Upgrades\Actions\Extension;
+
+class Upload extends \Espo\Core\Upgrades\Actions\Base\Upload
+{
+
+}

application/Espo/Core/Upgrades/Actions/Upgrade/Install.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\Core\Upgrades\Actions\Upgrade;
+
+class Install extends \Espo\Core\Upgrades\Actions\Base\Install
+{
+    protected function systemRebuild()
+    {
+        $manifest = $this->getManifest();
+
+        $res = $this->getConfig()->set('version', $manifest['version']);
+        if (method_exists($this->getConfig(), 'save')) {
+            $res = $this->getConfig()->save();
+        }
+        $res &= parent::systemRebuild();
+
+        return $res;
+    }
+
+    /**
+     * Delete temporary package files
+     *
+     * @return boolean
+     */
+    protected function deletePackageFiles()
+    {
+        $res = parent::deletePackageFiles();
+        $res &= $this->deletePackageArchive();
+
+        return $res;
+    }
+}

application/Espo/Core/Upgrades/Actions/Upgrade/Upload.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\Core\Upgrades\Actions\Upgrade;
+
+class Upload extends \Espo\Core\Upgrades\Actions\Base\Upload
+{
+
+}

application/Espo/Core/Upgrades/Base.php

@@ -23,362 +23,72 @@
 namespace Espo\Core\Upgrades;
 
 use Espo\Core\Utils\Util,
-	Espo\Core\Utils\Json,
-	Espo\Core\Exceptions\Error;
+    Espo\Core\Utils\Json,
+    Espo\Core\Exceptions\Error;
 
 abstract class Base
 {
-	private $container;
+    private $container;
 
-	private $zipUtil;
+    protected $name = null;
 
-	private $fileManager;
+    protected $params = array();
 
-	private $config;
+    const UPLOAD = 'upload';
 
-	protected $upgradeId = null;
+    const INSTALL = 'install';
 
-	protected $manifestName = 'manifest.json';
+    const UNINSTALL = 'uninstall';
 
-	protected $data;
+    const DELETE = 'delete';
 
-	protected $packagePath = null;
+    public function __construct($container)
+    {
+        $this->container = $container;
 
-	protected $packagePostfix = 'z';
+        $this->actionManager = new ActionManager($this->name, $container, $this->params);
+    }
 
-	protected $scriptNames = array(
-		'before' => 'Before',
-		'after' => 'After',
-	);
+    protected function getContainer()
+    {
+        return $this->container;
+    }
 
-	protected $paths = array(
-		'files' => 'files',
-		'scripts' => 'scripts',
-	);
+    protected function getActionManager()
+    {
+        return $this->actionManager;
+    }
 
+    public function getManifest()
+    {
+        return $this->getActionManager()->getManifest();
+    }
 
-	public function __construct($container)
-	{
-		$this->container = $container;
+    public function upload($data)
+    {
+        $this->getActionManager()->setAction(self::UPLOAD);
 
-		$this->zipUtil = new \Espo\Core\Utils\File\ZipArchive($container->get('fileManager'));
-	}
+        return $this->getActionManager()->run($data);
+    }
 
-	public function __destruct()
-	{
-		$this->upgradeId = null;
-		$this->data = null;
-	}
+    public function install($processId)
+    {
+        $this->getActionManager()->setAction(self::INSTALL);
 
-	protected function getContainer()
-	{
-		return $this->container;
-	}
+        return $this->getActionManager()->run($processId);
+    }
 
-	protected function getZipUtil()
-	{
-		return $this->zipUtil;
-	}
+    public function uninstall($processId)
+    {
+        $this->getActionManager()->setAction(self::UNINSTALL);
 
-	protected function getFileManager()
-	{
-		if (!isset($this->fileManager)) {
-			$this->fileManager = $this->getContainer()->get('fileManager');
-		}
-		return $this->fileManager;
-	}
+        return $this->getActionManager()->run($processId);
+    }
 
-	protected function getConfig()
-	{
-		if (!isset($this->config)) {
-			$this->config = $this->getContainer()->get('config');
-		}
-		return $this->config;
-	}
+    public function delete($processId)
+    {
+        $this->getActionManager()->setAction(self::DELETE);
 
-
-	/**
-	 * Upload an upgrade package
-	 *
-	 * @param  [type] $contents
-	 * @return string  ID of upgrade process
-	 */
-	public function upload($data)
-	{
-		$upgradeId = $this->createUpgradeId();
-
-		$GLOBALS['log']->debug('Upgrade process ['.$upgradeId.']: start upload the package.');
-
-		$upgradePath = $this->getUpgradePath();
-		$upgradePackagePath = $this->getUpgradePath(true);
-
-		if (!empty($data)) {
-			list($prefix, $contents) = explode(',', $data);
-			$contents = base64_decode($contents);
-		}
-
-		$res = $this->getFileManager()->putContents($upgradePackagePath, $contents);
-		if ($res === false) {
-			throw new Error('Could not upload the package.');
-		}
-
-		$res = $this->getZipUtil()->unzip($upgradePackagePath, $upgradePath);
-		if ($res === false) {
-			throw new Error('Unnable to unzip the file - '.$upgradePath.'.');
-		}
-
-		if (!$this->isAcceptable()) {
-			throw new Error("Your EspoCRM version doesn't match for this upgrade package.");
-		}
-
-		$GLOBALS['log']->debug('Upgrade process ['.$upgradeId.']: end upload the package.');
-
-		return $upgradeId;
-	}
-
-	/**
-	 * Main upgrade process
-	 *
-	 * @param  string $upgradeId Upgrade ID, gotten in upload stage
-	 * @return bool
-	 */
-	public function run($upgradeId)
-	{
-		$GLOBALS['log']->debug('Upgrade process ['.$upgradeId.']: start run.');
-
-		if (empty($upgradeId)) {
-			throw new Error('Upgrade ID was not specified.');
-		}
-
-		$this->setUpgradeId($upgradeId);
-
-		/* run before install script */
-		$this->runScript('before');
-
-		/* remove files defined in a manifest */
-		if (!$this->deleteFiles()) {
-			throw new Error('Permission denied to delete files.');
-		}
-
-		/* copy files from directory "Files" to EspoCRM files */
-		if (!$this->copyFiles()) {
-			throw new Error('Cannot copy files.');
-		}
-
-		if (!$this->systemRebuild()) {
-			throw new Error('Error occurred while EspoCRM rebuild.');
-		}
-
-		/* run before install script */
-		$this->runScript('after');
-
-		/* delete unziped files */
-		$this->deletePackageFiles();
-
-		$GLOBALS['log']->debug('Upgrade process ['.$upgradeId.']: end run.');
-	}
-
-
-	protected function createUpgradeId()
-	{
-		if (isset($this->upgradeId)) {
-			throw new Error('Another upgrade process is currently running.');
-		}
-
-		$this->upgradeId = uniqid();
-
-		return $this->upgradeId;
-	}
-
-	protected function getUpgradeId()
-	{
-		if (!isset($this->upgradeId)) {
-			throw new Error("Upgrade ID was not specified.");
-		}
-
-		return $this->upgradeId;
-	}
-
-	protected function setUpgradeId($upgradeId)
-	{
-		$this->upgradeId = $upgradeId;
-	}
-
-	/**
-	 * Check if version of upgrade is acceptable to current version of EspoCRM
-	 *
-	 * @param  string  $version
-	 * @return boolean
-	 */
-	protected function isAcceptable()
-	{
-		$manifest = $this->getManifest();
-		$version = $manifest['acceptableVersions'];
-
-		$currentVersion = $this->getConfig()->get('version');
-
-		if (is_string($version)) {
-			$version = (array) $version;
-		}
-
-		foreach ($version as $strVersion) {
-
-			$strVersion = trim($strVersion);
-
-			if ($strVersion == $currentVersion) {
-				return true;
-			}
-
-			$strVersion = str_replace('\\', '', $strVersion);
-			$strVersion = preg_quote($strVersion);
-			$strVersion = str_replace('\\*', '+', $strVersion);
-
-			if (preg_match('/^'.$strVersion.'/', $currentVersion)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Run scripts by type
-	 * @param  string $type Ex. "before", "after"
-	 * @return void
-	 */
-	protected function runScript($type)
-	{
-		$upgradePath = $this->getUpgradePath();
-
-		$scriptName = $this->scriptNames[$type];
-		if (!isset($scriptName)) {
-			return;
-		}
-
-		$beforeInstallScript = Util::concatPath( array($upgradePath, $this->paths['scripts'], $scriptName) ) . '.php';
-
-		if (file_exists($beforeInstallScript)) {
-			require_once($beforeInstallScript);
-			$script = new $scriptName();
-			$script->run($this->getContainer());
-		}
-	}
-
-	/**
-	 * Get upgrade path
-	 *
-	 * @param  string $upgradeId
-	 * @return string
-	 */
-	protected function getUpgradePath($isPackage = false)
-	{
-		$postfix = $isPackage ? $this->packagePostfix : '';
-
-		if (!isset($this->data['upgradePath'])) {
-			$upgradeId = $this->getUpgradeId();
-			$this->data['upgradePath'] = Util::concatPath($this->packagePath, $upgradeId);
-		}
-
-		return $this->data['upgradePath'] . $postfix;
-	}
-
-	/**
-	 * Delete files defined in a manifest
-	 *
-	 * @return boolen
-	 */
-	protected function deleteFiles()
-	{
-		$manifest = $this->getManifest();
-
-		if (!empty($manifest['delete'])) {
-			return $this->getFileManager()->remove($manifest['delete']);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Copy files from upgrade package
-	 *
-	 * @param  string $upgradeId
-	 * @return boolean
-	 */
-	protected function copyFiles()
-	{
-		$upgradePath = $this->getUpgradePath();
-		$filesPath = Util::concatPath($upgradePath, $this->paths['files']);
-
-		return $this->getFileManager()->copy($filesPath, '', true);
-	}
-
-	public function getManifest()
-	{
-		if (!isset($this->data['manifest'])) {
-			$upgradePath = $this->getUpgradePath();
-			$manifestJson = $this->getFileManager()->getContents(array($upgradePath, $this->manifestName));
-			$this->data['manifest'] = Json::decode($manifestJson, true);
-
-			if (!$this->data['manifest']) {
-				throw new Error('Syntax error in manifest.json.');
-			}
-
-			if (!$this->checkManifest($this->data['manifest'])) {
-				throw new Error('Unsupported package.');
-			}
-		}
-
-		return $this->data['manifest'];
-	}
-
-	/**
-	 * Check if the manifest is correct
-	 *
-	 * @param  array  $manifest
-	 * @return boolean
-	 */
-	protected function checkManifest(array $manifest)
-	{
-		$requiredFields = array(
-			'name',
-			'version',
-			'acceptableVersions',
-		);
-
-		foreach ($requiredFields as $fieldName) {
-			if (empty($manifest[$fieldName])) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Delete temporary package files
-	 *
-	 * @return boolean
-	 */
-	protected function deletePackageFiles()
-	{
-		$upgradePath = $this->getUpgradePath();
-		$upgradePackagePath = $this->getUpgradePath(true);
-
-		$res = $this->getFileManager()->removeInDir($upgradePath, true);
-		$res &= $this->getFileManager()->removeFile($upgradePackagePath);
-
-		return $res;
-	}
-
-	protected function systemRebuild()
-	{
-		$manifest = $this->getManifest();
-
-		$res = $this->getConfig()->set('version', $manifest['version']);
-		$res &= $this->getContainer()->get('dataManager')->rebuild();
-
-		return $res;
-	}
-
-
-}
+        return $this->getActionManager()->run($processId);
+    }
+}

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

@@ -26,108 +26,108 @@ use \Espo\Core\Utils\Api\Slim;
 
 class Auth extends \Slim\Middleware
 {
-	protected $auth;
+    protected $auth;
 
-	protected $authRequired = null;
+    protected $authRequired = null;
 
-	protected $showDialog = false;
+    protected $showDialog = false;
 
-	public function __construct(\Espo\Core\Utils\Auth $auth, $authRequired = null, $showDialog = false)
-	{
-		$this->auth = $auth;
-		$this->authRequired = $authRequired;
-		$this->showDialog = $showDialog;
-	}
+    public function __construct(\Espo\Core\Utils\Auth $auth, $authRequired = null, $showDialog = false)
+    {
+        $this->auth = $auth;
+        $this->authRequired = $authRequired;
+        $this->showDialog = $showDialog;
+    }
 
-	function call()
-	{
-		$req = $this->app->request();
+    function call()
+    {
+        $req = $this->app->request();
 
-		$uri = $req->getResourceUri();
-		$httpMethod = $req->getMethod();
+        $uri = $req->getResourceUri();
+        $httpMethod = $req->getMethod();
 
-		$authUsername = $req->headers('PHP_AUTH_USER');
-		$authPassword = $req->headers('PHP_AUTH_PW');
+        $authUsername = $req->headers('PHP_AUTH_USER');
+        $authPassword = $req->headers('PHP_AUTH_PW');
 
-		$espoAuth = $req->headers('HTTP_ESPO_AUTHORIZATION');
-		if (isset($espoAuth)) {
-			list($authUsername, $authPassword) = explode(':', base64_decode($espoAuth));
-		}
+        $espoAuth = $req->headers('HTTP_ESPO_AUTHORIZATION');
+        if (isset($espoAuth)) {
+            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)));
-		}
+        $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)) {
-			$routes = $this->app->router()->getMatchedRoutes($httpMethod, $uri);
+        if (is_null($this->authRequired)) {
+            $routes = $this->app->router()->getMatchedRoutes($httpMethod, $uri);
 
-			if (!empty($routes[0])) {
-				$routeConditions = $routes[0]->getConditions();
-				if (isset($routeConditions['auth']) && $routeConditions['auth'] === false) {
+            if (!empty($routes[0])) {
+                $routeConditions = $routes[0]->getConditions();
+                if (isset($routeConditions['auth']) && $routeConditions['auth'] === false) {
 
-					if ($authUsername && $authPassword) {
-						$isAuthenticated = $this->auth->login($authUsername, $authPassword);
-						if ($isAuthenticated) {
-							$this->next->call();
-							return;
-						}
-					}
+                    if ($authUsername && $authPassword) {
+                        $isAuthenticated = $this->auth->login($authUsername, $authPassword);
+                        if ($isAuthenticated) {
+                            $this->next->call();
+                            return;
+                        }
+                    }
 
-					$this->auth->useNoAuth();
-					$this->next->call();
-					return;
-				}
-			}
-		} else {
-			if (!$this->authRequired) {
-				$this->auth->useNoAuth();
-				$this->next->call();
-				return;
-			}
-		}
+                    $this->auth->useNoAuth();
+                    $this->next->call();
+                    return;
+                }
+            }
+        } else {
+            if (!$this->authRequired) {
+                $this->auth->useNoAuth();
+                $this->next->call();
+                return;
+            }
+        }
 
-		if ($authUsername && $authPassword) {
+        if ($authUsername && $authPassword) {
 
-			$isAuthenticated = $this->auth->login($authUsername, $authPassword);
+            $isAuthenticated = $this->auth->login($authUsername, $authPassword);
 
-			if ($isAuthenticated) {
-				$this->next->call();
-			} else {
-				$this->processUnauthorized();
-			}
-		} else {
-			if (!$this->isXMLHttpRequest()) {
-				$this->showDialog = true;
-			}
-			$this->processUnauthorized();
-		}
-	}
+            if ($isAuthenticated) {
+                $this->next->call();
+            } else {
+                $this->processUnauthorized();
+            }
+        } else {
+            if (!$this->isXMLHttpRequest()) {
+                $this->showDialog = true;
+            }
+            $this->processUnauthorized();
+        }
+    }
 
-	protected function processUnauthorized()
-	{
-		$res = $this->app->response();
+    protected function processUnauthorized()
+    {
+        $res = $this->app->response();
 
-		if ($this->showDialog) {
-			$res->header('WWW-Authenticate', 'Basic realm=""');
-		} else {
-			$res->header('WWW-Authenticate');
-		}
-		$res->status(401);
-	}
+        if ($this->showDialog) {
+            $res->header('WWW-Authenticate', 'Basic realm=""');
+        } else {
+            $res->header('WWW-Authenticate');
+        }
+        $res->status(401);
+    }
 
-	protected function isXMLHttpRequest()
-	{
-		$req = $this->app->request();
+    protected function isXMLHttpRequest()
+    {
+        $req = $this->app->request();
 
-		$httpXRequestedWith = $req->headers('HTTP_X_REQUESTED_WITH');
+        $httpXRequestedWith = $req->headers('HTTP_X_REQUESTED_WITH');
 
-		if (isset($httpXRequestedWith) && strtolower($httpXRequestedWith) == 'xmlhttprequest') {
-			return true;
-		}
+        if (isset($httpXRequestedWith) && strtolower($httpXRequestedWith) == 'xmlhttprequest') {
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
 }
 

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

@@ -24,94 +24,94 @@ namespace Espo\Core\Utils\Api;
 
 class Output
 {
-	private $slim;
+    private $slim;
 
-	protected $errorDesc = array(
-		400 => 'Bad Request',
-		401 => 'Unauthorized',
-		403 => 'Forbidden',
-		404 => 'Page Not Found',
-		409 => 'Conflict',
-		500 => 'Internal Server Error',
-	);
+    protected $errorDesc = array(
+        400 => 'Bad Request',
+        401 => 'Unauthorized',
+        403 => 'Forbidden',
+        404 => 'Page Not Found',
+        409 => 'Conflict',
+        500 => 'Internal Server Error',
+    );
 
 
-	public function __construct(\Espo\Core\Utils\Api\Slim $slim)
-	{
-		$this->slim = $slim;
-	}
+    public function __construct(\Espo\Core\Utils\Api\Slim $slim)
+    {
+        $this->slim = $slim;
+    }
 
-	protected function getSlim()
-	{
-		return $this->slim;
-	}
+    protected function getSlim()
+    {
+        return $this->slim;
+    }
 
-	/**
-	* Output the result
-	*
-	* @param mixed $data - JSON
-	*/
-	public function render($data = null)
-	{
-		if (is_array($data)) {
-			$dataArr = array_values($data);
-			$data = empty($dataArr[0]) ? false : $dataArr[0];
-		}
+    /**
+    * Output the result
+    *
+    * @param mixed $data - JSON
+    */
+    public function render($data = null)
+    {
+        if (is_array($data)) {
+            $dataArr = array_values($data);
+            $data = empty($dataArr[0]) ? false : $dataArr[0];
+        }
 
-		ob_clean();
-		echo $data;
-	}
+        ob_clean();
+        echo $data;
+    }
 
-	public function processError($message = 'Error', $code = 500, $isPrint = false)
-	{
-		$GLOBALS['log']->error('API ['.$this->getSlim()->request()->getMethod().']:'.$this->getSlim()->router()->getCurrentRoute()->getPattern().', Params:'.print_r($this->getSlim()->router()->getCurrentRoute()->getParams(), true).', InputData: '.$this->getSlim()->request()->getBody().' - '.$message);
-		$this->displayError($message, $code, $isPrint);
-	}
+    public function processError($message = 'Error', $code = 500, $isPrint = false)
+    {
+        $GLOBALS['log']->error('API ['.$this->getSlim()->request()->getMethod().']:'.$this->getSlim()->router()->getCurrentRoute()->getPattern().', Params:'.print_r($this->getSlim()->router()->getCurrentRoute()->getParams(), true).', InputData: '.$this->getSlim()->request()->getBody().' - '.$message);
+        $this->displayError($message, $code, $isPrint);
+    }
 
-	/**
-	* Output the error and stop app execution
-	*
-	* @param string $text
-	* @param int $statusCode
-	*
-	* @return void
-	*/
-	public function displayError($text, $statusCode = 500, $isPrint = false)
-	{
-		$GLOBALS['log']->error('Display Error: '.$text.', Code: '.$statusCode.' URL: '.$_SERVER['REQUEST_URI']);
+    /**
+    * Output the error and stop app execution
+    *
+    * @param string $text
+    * @param int $statusCode
+    *
+    * @return void
+    */
+    public function displayError($text, $statusCode = 500, $isPrint = false)
+    {
+        $GLOBALS['log']->error('Display Error: '.$text.', Code: '.$statusCode.' URL: '.$_SERVER['REQUEST_URI']);
 
-		if (!empty( $this->slim)) {
-			$this->getSlim()->response()->status($statusCode);
-			$this->getSlim()->response()->header('X-Status-Reason', $text);
+        if (!empty( $this->slim)) {
+            $this->getSlim()->response()->status($statusCode);
+            $this->getSlim()->response()->header('X-Status-Reason', $text);
 
-			if ($isPrint) {
-				$status = $this->getCodeDesc($statusCode);
-				$status = isset($status) ? $statusCode.' '.$status : 'HTTP '.$statusCode;
-				$this->getSlim()->printError($text, $status);
-			}
+            if ($isPrint) {
+                $status = $this->getCodeDesc($statusCode);
+                $status = isset($status) ? $statusCode.' '.$status : 'HTTP '.$statusCode;
+                $this->getSlim()->printError($text, $status);
+            }
 
-			$this->getSlim()->stop();
-		}
-		else {
-			$GLOBALS['log']->info('Could not get Slim instance. It looks like a direct call (bypass API). URL: '.$_SERVER['REQUEST_URI']);
-			die($text);
-		}
-	}
+            $this->getSlim()->stop();
+        }
+        else {
+            $GLOBALS['log']->info('Could not get Slim instance. It looks like a direct call (bypass API). URL: '.$_SERVER['REQUEST_URI']);
+            die($text);
+        }
+    }
 
-	/**
-	 * Get status code desription
-	 *
-	 * @param  int $statusCode
-	 * @return string | null
-	 */
-	protected function getCodeDesc($statusCode)
-	{
-		if (isset($this->errorDesc[$statusCode])) {
-			return $this->errorDesc[$statusCode];
-		}
+    /**
+     * Get status code desription
+     *
+     * @param  int $statusCode
+     * @return string | null
+     */
+    protected function getCodeDesc($statusCode)
+    {
+        if (isset($this->errorDesc[$statusCode])) {
+            return $this->errorDesc[$statusCode];
+        }
 
-		return null;
-	}
+        return null;
+    }
 
 
 

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

@@ -26,60 +26,60 @@ namespace Espo\Core\Utils\Api;
 class Slim extends \Slim\Slim
 {
 
-	/**
-	 * Redefine the run method
-	 *
-	 * We no need to use a Slim handler
-	 */
-	public function run()
-	{
-		//set_error_handler(array('\Slim\Slim', 'handleErrors')); //Espo: no needs to use this handler
+    /**
+     * Redefine the run method
+     *
+     * We no need to use a Slim handler
+     */
+    public function run()
+    {
+        //set_error_handler(array('\Slim\Slim', 'handleErrors')); //Espo: no needs to use this handler
 
-		//Apply final outer middleware layers
-		if ($this->config('debug')) {
-			//Apply pretty exceptions only in debug to avoid accidental information leakage in production
-			//$this->add(new \Slim\Middleware\PrettyExceptions()); //Espo: no needs to use this handler
-		}
+        //Apply final outer middleware layers
+        if ($this->config('debug')) {
+            //Apply pretty exceptions only in debug to avoid accidental information leakage in production
+            //$this->add(new \Slim\Middleware\PrettyExceptions()); //Espo: no needs to use this handler
+        }
 
-		//Invoke middleware and application stack
-		$this->middleware[0]->call();
+        //Invoke middleware and application stack
+        $this->middleware[0]->call();
 
-		//Fetch status, header, and body
-		list($status, $headers, $body) = $this->response->finalize();
+        //Fetch status, header, and body
+        list($status, $headers, $body) = $this->response->finalize();
 
-		// Serialize cookies (with optional encryption)
-		\Slim\Http\Util::serializeCookies($headers, $this->response->cookies, $this->settings);
+        // Serialize cookies (with optional encryption)
+        \Slim\Http\Util::serializeCookies($headers, $this->response->cookies, $this->settings);
 
-		//Send headers
-		if (headers_sent() === false) {
-			//Send status
-			if (strpos(PHP_SAPI, 'cgi') === 0) {
-				header(sprintf('Status: %s', \Slim\Http\Response::getMessageForCode($status)));
-			} else {
-				header(sprintf('HTTP/%s %s', $this->config('http.version'), \Slim\Http\Response::getMessageForCode($status)));
-			}
+        //Send headers
+        if (headers_sent() === false) {
+            //Send status
+            if (strpos(PHP_SAPI, 'cgi') === 0) {
+                header(sprintf('Status: %s', \Slim\Http\Response::getMessageForCode($status)));
+            } else {
+                header(sprintf('HTTP/%s %s', $this->config('http.version'), \Slim\Http\Response::getMessageForCode($status)));
+            }
 
-			//Send headers
-			foreach ($headers as $name => $value) {
-				$hValues = explode("\n", $value);
-				foreach ($hValues as $hVal) {
-					header("$name: $hVal", false);
-				}
-			}
-		}
+            //Send headers
+            foreach ($headers as $name => $value) {
+                $hValues = explode("\n", $value);
+                foreach ($hValues as $hVal) {
+                    header("$name: $hVal", false);
+                }
+            }
+        }
 
-		//Send body, but only if it isn't a HEAD request
-		if (!$this->request->isHead()) {
-			echo $body;
-		}
+        //Send body, but only if it isn't a HEAD request
+        if (!$this->request->isHead()) {
+            echo $body;
+        }
 
-		//restore_error_handler(); //Espo: no needs to use this handler
-	}
+        //restore_error_handler(); //Espo: no needs to use this handler
+    }
 
-	public function printError($error, $status)
-	{
-		echo static::generateTemplateMarkup($status, '<p>'.$error.'</p><a href="' . $this->request->getRootUri() . '/">Visit the Home Page</a>');
-	}
+    public function printError($error, $status)
+    {
+        echo static::generateTemplateMarkup($status, '<p>'.$error.'</p><a href="' . $this->request->getRootUri() . '/">Visit the Home Page</a>');
+    }
 
 
 }

application/Espo/Core/Utils/Auth.php

@@ -18,92 +18,96 @@
  *
  * 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;
-	
-	public function __construct(\Espo\Core\Container $container)
-	{
-		$this->container = $container;
-	}
-	
-	public function useNoAuth($isAdmin = false)
-	{
-		$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');			
-		}
+    protected $container;
 
-		$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');
-		
-		$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
-			),
-		));
-		
-		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('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')));
-	}
-	
-	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;			
-		}
-	}
+    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');
+
+        $user = $entityManager->getRepository('User')->get('system');
+        if (!$user) {
+            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');
+
+        $entityManager = $this->entityManager;
+
+        $authToken = $entityManager->getRepository('AuthToken')->where(array('token' => $password))->findOne();
+
+        $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('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('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;
+        }
+    }
 }
 

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

@@ -0,0 +1,71 @@
+<?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;
+
+    private $passwordHash;
+
+    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;
+    }
+
+    protected function getPasswordHash()
+    {
+        if (!isset($this->passwordHash)) {
+            $this->passwordHash = new \Espo\Core\Utils\PasswordHash($this->config);
+        }
+
+        return $this->passwordHash;
+    }
+
+}
+

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

@@ -0,0 +1,47 @@
+<?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 = $this->getPasswordHash()->hash($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 = $this->getPasswordHash()->hash($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;
+    }
+}