change version

fix moment
Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend
2015-01-16 17:04:31 +02:00 · 2015-01-16 13:21:18 +02:00 · 2015-01-16 11:06:31 +02:00 · 2015-01-16 11:06:16 +02:00 · 2015-01-15 15:36:20 +02:00 · 2015-01-15 12:22:47 +02:00
780 changed files with 5200 additions and 3367 deletions
@@ -13,12 +13,4 @@
 /tests/testData/cache/*
 composer.phar
 vendor/
-
-/custom/*
-!/custom/Espo/
-/custom/Espo/*
-!/custom/Espo/Custom/
-/custom/Espo/Custom/*
-!/custom/Espo/Custom/Core/
-/custom/Espo/Custom/Core/*
-!/custom/Espo/Custom/Core/Loaders/
+/custom/Espo/Custom/Resources/*
@@ -1,3 +1,23 @@
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
 module.exports = function (grunt) {

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

 require_once('../../bootstrap.php');

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -27,24 +27,27 @@ use \Espo\Core\Exceptions\BadRequest;
 class App extends \Espo\Core\Controllers\Record
 {
    public function actionUser()
-    {        
+    {
+        $preferences = $this->getPreferences()->toArray();
+        unset($preferences['smtpPassword']);
+
        return array(
            'user' => $this->getUser()->toArray(),
            'acl' => $this->getAcl()->toArray(),
-            'preferences' => $this->getPreferences()->toArray(),
+            'preferences' => $preferences,
            'token' => $this->getUser()->get('token')
-        );    
+        );
    }
-    
+
    public function actionDestroyAuthToken($params, $data)
-    {        
-        $token = $data['token'];        
+    {
+        $token = $data['token'];
        if (empty($token)) {
            throw new BadRequest();
        }

        $auth = new \Espo\Core\Utils\Auth($this->getContainer());
-        return $auth->destroyAuthToken($token);        
+        return $auth->destroyAuthToken($token);
    }
 }

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

+        if (isset($data['useCache']) && $data['useCache'] != $this->getConfig()->get('useCache')) {
+            $this->getContainer()->get('dataManager')->clearCache();
+        }
+
        $this->getConfig()->setData($data, $this->getUser()->isAdmin());
        $result = $this->getConfig()->save();
        if ($result === false) {
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -154,7 +154,11 @@ class Application
        $container = $this->getContainer();
        $slim = $this->getSlim();

-        $auth = $this->getAuth();
+        try {
+            $auth = $this->getAuth();
+        } catch (\Exception $e) {
+            $container->get('output')->processError($e->getMessage(), $e->getCode());
+        }

        $apiAuth = new \Espo\Core\Utils\Api\Auth($auth);
        $this->getSlim()->add($apiAuth);
@@ -244,7 +248,10 @@ class Application
    protected function initAutoloads()
    {
        $autoload = new \Espo\Core\Utils\Autoload($this->getContainer()->get('config'), $this->getMetadata(), $this->getContainer()->get('fileManager'));
-        $autoloadList = $autoload->getAll();
+
+        try {
+            $autoloadList = $autoload->getAll();
+        } catch (\Exception $e) {} //bad permissions

        if (empty($autoloadList)) {
            return;
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -51,9 +51,16 @@ class Container
            $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);
+
+            try {
+                $className = $this->get('metadata')->get('app.loaders.' . ucfirst($name));
+            } catch (\Exception $e) {}
+
+            if (!isset($className) || !class_exists($className)) {
+                $className = '\Espo\Custom\Core\Loaders\\'.ucfirst($name);
+                if (!class_exists($className)) {
+                    $className = '\Espo\Core\Loaders\\'.ucfirst($name);
+                }
            }

            if (class_exists($className)) {
@@ -64,7 +71,7 @@ class Container

        return null;
    }
-    
+
    protected function getServiceClassName($name, $default)
    {
        $metadata = $this->get('metadata');
@@ -204,7 +211,7 @@ class Container
            $this->get('preferences')
        );
    }
-    
+
    private function loadCrypt()
    {
        return new \Espo\Core\Utils\Crypt(
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -18,18 +18,16 @@
 *
 * 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\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);
@@ -37,11 +35,11 @@ class Person extends \Espo\Core\ORM\Entity
            $this->setValue('name', $firstName . ' ' . $value);
        }
    }
-    
+
    public function _setFirstName($value)
    {
        $this->setValue('firstName', $value);
-        
+
        $lastName = $this->get('lastName');
        if (empty($lastName)) {
            $this->setValue('name', $value);
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -83,10 +83,10 @@ class HookManager

        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_recursive($this->data, $this->getHookData($modulePath));
        }

-        $this->data = array_merge($this->data, $this->getHookData($this->paths['customPath']));
+        $this->data = array_merge_recursive($this->data, $this->getHookData($this->paths['customPath']));

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

 namespace Espo\Core\Mail;

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

 namespace Espo\Core\Mail\Storage;

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -290,7 +290,7 @@ class Base
                            $a = $this->getWherePart($i);
                            foreach ($a as $left => $right) {
                                if (!empty($right)) {
-                                    $arr[$left] = $right;
+                                    $arr[] = array($left => $right);
                                }
                            }
                        }
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -64,7 +64,12 @@ class Output

    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);
+        $currentRoute = $this->getSlim()->router()->getCurrentRoute();
+
+        if (isset($currentRoute)) {
+            $GLOBALS['log']->error('API ['.$this->getSlim()->request()->getMethod().']:'.$currentRoute->getPattern().', Params:'.print_r($currentRoute->getParams(), true).', InputData: '.$this->getSlim()->request()->getBody().' - '.$message);
+        }
+
        $this->displayError($message, $code, $isPrint);
    }

@@ -80,6 +85,8 @@ class Output
    {
        $GLOBALS['log']->error('Display Error: '.$text.', Code: '.$statusCode.' URL: '.$_SERVER['REQUEST_URI']);

+        ob_clean();
+
        if (!empty( $this->slim)) {
            $this->getSlim()->response()->status($statusCode);
            $this->getSlim()->response()->header('X-Status-Reason', $text);
@@ -91,8 +98,7 @@ class Output
            }

            $this->getSlim()->stop();
-        }
-        else {
+        } else {
            $GLOBALS['log']->info('Could not get Slim instance. It looks like a direct call (bypass API). URL: '.$_SERVER['REQUEST_URI']);
            die($text);
        }
@@ -112,8 +118,5 @@ class Output

        return null;
    }
-
-
-
 }

@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
@@ -3,7 +3,7 @@
 * This file is part of EspoCRM.
 *
 * EspoCRM - Open Source CRM application.
- * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
 * Website: http://www.espocrm.com
 *
 * EspoCRM is free software: you can redistribute it and/or modify
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
yuri	1049ec56eb	change version	2015-01-16 17:04:31 +02:00
yuri	734936b605	fix moment	2015-01-16 13:21:18 +02:00
yuri	67e1a088ff	Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend	2015-01-16 11:06:31 +02:00
yuri	af623631d1	change gitignore	2015-01-16 11:06:16 +02:00
Taras Machyshyn	8035bc424e	added 2015 to the license	2015-01-15 15:36:20 +02:00
Taras Machyshyn	7e99cd94b3	changed link title	2015-01-15 12:22:47 +02:00
Taras Machyshyn	a88218aceb	added 'desabled' option for popupNotifications	2015-01-15 12:04:28 +02:00
yuri	e5fd4dac4d	update fullcalendar and moment	2015-01-15 10:59:06 +02:00
yuri	26d407bd68	Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend	2015-01-15 10:31:25 +02:00
yuri	80ad96cce6	Merge branch 'hotfix/2.8.2'	2015-01-15 10:31:09 +02:00
yuri	1d85ac3428	fix customLabel	2015-01-14 15:34:37 +02:00
yuri	ca5dfd851d	customLabels for list	2015-01-14 15:12:37 +02:00
Taras Machyshyn	8c76b88b8d	improved notifications	2015-01-14 15:02:45 +02:00
yuri	ff5616c399	fix field manager	2015-01-14 14:36:09 +02:00
yuri	2027b5aca9	method name change in app.js	2015-01-14 10:58:04 +02:00
yuri	a43e401ce7	fix nl_NL	2015-01-14 09:42:04 +02:00
yuri	396e2c176c	fix lang	2015-01-14 09:41:18 +02:00
Taras Machyshyn	4ab40990f5	fixed a test	2015-01-13 16:23:40 +02:00
Taras Machyshyn	35e325d8d0	improving metadata caching	2015-01-13 16:17:59 +02:00
Taras Machyshyn	b947d667d6	added 'module.json' - options for modules	2015-01-13 13:48:01 +02:00
yuri	b4ab83d2d8	Merge branch 'hotfix/2.8.2' of ssh://172.20.0.1/var/git/espo/backend into hotfix/2.8.2	2015-01-13 10:43:19 +02:00
yuri	74adfb8b3e	update nl_NL	2015-01-13 10:43:01 +02:00
Taras Machyshyn	63bea467c3	Merge branch 'hotfix/2.8.2'	2015-01-12 16:53:19 +02:00
Taras Machyshyn	cf449bba31	Merge branch 'hotfix/2.8.2' of ssh://172.20.0.1/var/git/espo/backend into hotfix/2.8.2	2015-01-12 15:18:25 +02:00
Taras Machyshyn	d247557fa9	Improving pt_BR translation by Bruno Franca	2015-01-12 15:18:01 +02:00
Taras Machyshyn	bcd1c9618d	fixed error message with permission denied	2015-01-12 15:15:11 +02:00
yuri	cb1c87155f	Merge branch 'hotfix/2.8.2'	2015-01-12 12:13:32 +02:00
yuri	0b757b94a4	Merge branch 'hotfix/2.8.2' of ssh://172.20.0.1/var/git/espo/backend into hotfix/2.8.2	2015-01-12 12:13:07 +02:00
yuri	4ffcca7978	sanitize	2015-01-12 12:12:47 +02:00
Taras Machyshyn	aac68b9624	Fix error when 'data' directory is not writable	2015-01-12 11:21:44 +02:00
yuri	4b0aeea778	Merge branch 'hotfix/2.8.2'	2015-01-12 11:17:58 +02:00
yuri	1b9522f89c	Merge branch 'hotfix/2.8.2' of ssh://172.20.0.1/var/git/espo/backend into hotfix/2.8.2	2015-01-12 11:17:34 +02:00
yuri	391f77d6f8	navbar fix	2015-01-12 11:17:17 +02:00
Taras Machyshyn	feb8a300d9	remove test code	2015-01-09 17:43:28 +02:00
Taras Machyshyn	e2e77d59f9	Merge branch 'hotfix/2.8.2' of ssh://172.20.0.1/var/git/espo/backend into hotfix/2.8.2	2015-01-09 17:39:01 +02:00
Taras Machyshyn	2cb2d2cc2d	bug fixing in Util	2015-01-09 17:38:39 +02:00
Taras Machyshyn	d62c83d869	'Language' saving improvements	2015-01-09 17:25:43 +02:00
Taras Machyshyn	0639ab8424	Json helper improvements	2015-01-09 17:16:41 +02:00
yuri	9bdc19d3c2	fix mentions	2015-01-09 11:54:27 +02:00
yuri	6e26c093fa	remove trailing spaces	2015-01-09 11:42:35 +02:00
yuri	ca40c99ac2	improve relationship panels	2015-01-09 11:37:03 +02:00
yuri	6e1cef3d2f	Merge branch 'hotfix/2.8.2'	2015-01-09 11:12:48 +02:00
yuri	cc6f89366a	Import: utf8 message	2015-01-09 11:08:12 +02:00
yuri	d0e486a97c	Merge branch 'hotfix/2.8.2' of ssh://172.20.0.1/var/git/espo/backend into hotfix/2.8.2	2015-01-09 10:58:45 +02:00
yuri	9c3db209d8	fix export	2015-01-09 10:58:18 +02:00
yuri	3ff6b93ccb	Calendar: slotDuration changes	2015-01-08 15:09:12 +02:00
yuri	2bfc86323d	remove spaces	2015-01-08 14:57:50 +02:00
Taras Machyshyn	ed1a58cd1f	cache optimization	2015-01-08 13:10:41 +02:00
Yuri Kuznetsov	3f89bd23af	Merge pull request #32 from alasdaircr/ArrayFilters Allow filtering array field types. fixes #17	2015-01-08 12:18:36 +02:00
Taras Machyshyn	e2fa620a81	bug fixes for HookManager	2015-01-08 11:34:41 +02:00
Alasdair Campbell	05b3645321	Allow filtering array field types. fixes #17	2015-01-06 23:46:15 +00:00
yuri	0e71e145bd	Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend	2015-01-06 13:21:45 +02:00
yuri	f13baad163	fix integration data	2015-01-06 13:20:24 +02:00
Taras Machyshyn	2d60fa1edc	added custom loaders in metadata 'app'	2015-01-05 17:43:18 +02:00
Taras Machyshyn	2653873ff6	removed support custom loaders	2015-01-05 17:31:01 +02:00
Taras Machyshyn	d849cf1115	Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend	2015-01-05 17:23:07 +02:00
Taras Machyshyn	28fcdca977	added custom loaders in metadata 'app'	2015-01-05 17:22:56 +02:00
yuri	3f620ae742	fix navbar resize	2015-01-05 17:14:21 +02:00
yuri	0af8dde821	quick create small fix	2015-01-05 16:41:10 +02:00
yuri	522931c64d	meeting/call account field readOnly	2015-01-05 16:23:25 +02:00
yuri	265373bdcb	change version	2014-12-30 11:56:16 +02:00
yuri	0dbd649bff	Merge remote-tracking branch 'origin/hotfix/2.8.1' into hotfix/2.8.1	2014-12-30 11:55:21 +02:00
yuri	8fa4012267	merge origin	2014-12-30 11:54:37 +02:00
yuri	477a57571b	fix preferences smtp password	2014-12-30 11:53:35 +02:00
yuri	1de853ab95	fix test send	2014-12-30 11:48:37 +02:00
yuri	4567d0de78	fix smtp password	2014-12-30 11:29:11 +02:00
Taras Machyshyn	b2cc82d7e1	ru_RU translation correction	2014-12-30 11:28:39 +02:00
Taras Machyshyn	d3710cd8c0	fix translation	2014-12-29 17:24:19 +02:00
Taras Machyshyn	2a4a9cbaa7	Improved russian traslation	2014-12-29 17:23:58 +02:00
yuri	e27d02e782	fix email and phone fields	2014-12-29 16:18:23 +02:00
yuri	ea1b7502bb	remove $person static prop from Person entity	2014-12-25 16:54:43 +02:00
yuri	69c173bc6c	change avatar color	2014-12-25 11:55:42 +02:00
yuri	944fa45e76	change identicon colors	2014-12-25 11:39:45 +02:00
yuri	eb2413085c	cleanup	2014-12-25 11:32:15 +02:00
yuri	04ecebbfef	remove color from identicons	2014-12-24 12:24:57 +02:00
yuri	585ae2a58f	fix navbar issue	2014-12-24 12:03:52 +02:00
yuri	9aae12f9ae	dont display avatars in activities panels	2014-12-24 11:08:04 +02:00
yuri	73c6cabaa7	fix model:populateFromDefaults	2014-12-23 17:22:49 +02:00
yuri	247075e168	Merge remote-tracking branch 'origin/hotfix/2.8.1' into hotfix/2.8.1	2014-12-23 15:40:01 +02:00
yuri	6791733761	merge origin	2014-12-23 15:39:10 +02:00
yuri	f6003088d8	identicons colors	2014-12-23 15:38:19 +02:00
Taras Machyshyn	95f93351ea	Integration: fixed array type	2014-12-23 11:56:20 +02:00
yuri	b5bd7d043b	clearnup	2014-12-22 17:38:32 +02:00
yuri	8095665835	fix dashboard preferences patch	2014-12-22 17:37:48 +02:00
yuri	dd3f9d5ff8	fix calendar dashlet	2014-12-22 17:21:52 +02:00
yuri	7c39df74bc	fix calendar for mobile	2014-12-22 17:14:49 +02:00
Yuri Kuznetsov	0a1497e3e8	calendar resizr	2014-12-18 16:30:31 +02:00