Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer

Conflicts: bin/console bower.json composer.json composer.lock lib/Alchemy/Phrasea/Application.php lib/Alchemy/Phrasea/Border/Manager.php lib/Alchemy/Phrasea/Controller/Api/V1.php lib/Alchemy/Phrasea/Core/PhraseaEvents.php lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php lib/classes/caption/field.php lib/classes/record/Interface.php templates/web/prod/index.html.twig www/skins/prod/000000/prodcolor.css
2025-10-12 04:23:19 +00:00 · 2015-03-06 14:35:29 +01:00
parent bcff55962c 6b89c123e3
commit ed3ffb59a6
1078 changed files with 7964 additions and 16363 deletions
--- a/lib/classes/ACL.php
+++ b/lib/classes/ACL.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -886,7 +886,6 @@ class ACL implements cache_cacheableInterface

            return $this;
        } catch (\Exception $e) {
-
        }

        $sql = 'SELECT  u.* FROM basusr u, bas b, sbas s
@@ -1473,12 +1472,10 @@ class ACL implements cache_cacheableInterface
    public function delete_injected_rights_sbas(databox $databox)
    {
        $sql = 'DELETE FROM collusr WHERE usr_id = :usr_id AND site = :site';
-        $params = [
-            ':usr_id' => $this->user->getId()
-            , ':site'   => $this->app['conf']->get(['main', 'key'])
-        ];
        $stmt = $databox->get_connection()->prepare($sql);
-        $stmt->execute($params);
+        $stmt->execute([
+            ':usr_id' => $this->user->getId(), ':site'   => $this->app['conf']->get(['main', 'key'])
+        ]);
        $stmt->closeCursor();

        return $this;
--- a/lib/classes/API/OAuth2/Adapter.php
+++ b/lib/classes/API/OAuth2/Adapter.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Application/Navigator.php
+++ b/lib/classes/API/OAuth2/Application/Navigator.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Application/OfficePlugin.php
+++ b/lib/classes/API/OAuth2/Application/OfficePlugin.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/Exception.php
+++ b/lib/classes/API/OAuth2/Exception/Exception.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/Interface.php
+++ b/lib/classes/API/OAuth2/Exception/Interface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/Redirect.php
+++ b/lib/classes/API/OAuth2/Exception/Redirect.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/Redirect/AccessDenied.php
+++ b/lib/classes/API/OAuth2/Exception/Redirect/AccessDenied.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/Redirect/InvalidClient.php
+++ b/lib/classes/API/OAuth2/Exception/Redirect/InvalidClient.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/Redirect/InvalidRequest.php
+++ b/lib/classes/API/OAuth2/Exception/Redirect/InvalidRequest.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/Redirect/InvalidScope.php
+++ b/lib/classes/API/OAuth2/Exception/Redirect/InvalidScope.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/Redirect/ServerError.php
+++ b/lib/classes/API/OAuth2/Exception/Redirect/ServerError.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/Redirect/TemporaryUnavailable.php
+++ b/lib/classes/API/OAuth2/Exception/Redirect/TemporaryUnavailable.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/Redirect/UnauthorizedClient.php
+++ b/lib/classes/API/OAuth2/Exception/Redirect/UnauthorizedClient.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/Redirect/UnsupportedResponseType.php
+++ b/lib/classes/API/OAuth2/Exception/Redirect/UnsupportedResponseType.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/WWWAuthenticate.php
+++ b/lib/classes/API/OAuth2/Exception/WWWAuthenticate.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/ExpiredToken.php
+++ b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/ExpiredToken.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InsufficientScope.php
+++ b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InsufficientScope.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidClient.php
+++ b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidClient.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidRequest.php
+++ b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidRequest.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidToken.php
+++ b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidToken.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/BadRequest.php
+++ b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/BadRequest.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/Forbidden.php
+++ b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/Forbidden.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/Unauthorized.php
+++ b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/Unauthorized.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Form/DevAppDesktop.php
+++ b/lib/classes/API/OAuth2/Form/DevAppDesktop.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/OAuth2/Form/DevAppInternet.php
+++ b/lib/classes/API/OAuth2/Form/DevAppInternet.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/API/Webhook.php
+++ b/lib/classes/API/Webhook.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Account.php
+++ b/lib/classes/Bridge/Account.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/AccountSettings.php
+++ b/lib/classes/Bridge/AccountSettings.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api.php
+++ b/lib/classes/Bridge/Api.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/Abstract.php
+++ b/lib/classes/Bridge/Api/Abstract.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/AbstractCollection.php
+++ b/lib/classes/Bridge/Api/AbstractCollection.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/Auth/Abstract.php
+++ b/lib/classes/Bridge/Api/Auth/Abstract.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/Auth/Flickr.php
+++ b/lib/classes/Bridge/Api/Auth/Flickr.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/Auth/Interface.php
+++ b/lib/classes/Bridge/Api/Auth/Interface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/Auth/OAuth2.php
+++ b/lib/classes/Bridge/Api/Auth/OAuth2.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/Auth/Youtube.php
+++ b/lib/classes/Bridge/Api/Auth/Youtube.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/ContainerCollection.php
+++ b/lib/classes/Bridge/Api/ContainerCollection.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/ContainerInterface.php
+++ b/lib/classes/Bridge/Api/ContainerInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/Dailymotion.php
+++ b/lib/classes/Bridge/Api/Dailymotion.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/ElementCollection.php
+++ b/lib/classes/Bridge/Api/ElementCollection.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/ElementInterface.php
+++ b/lib/classes/Bridge/Api/ElementInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/Flickr.php
+++ b/lib/classes/Bridge/Api/Flickr.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/Flickr/Container.php
+++ b/lib/classes/Bridge/Api/Flickr/Container.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/Flickr/Element.php
+++ b/lib/classes/Bridge/Api/Flickr/Element.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/Interface.php
+++ b/lib/classes/Bridge/Api/Interface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/Youtube.php
+++ b/lib/classes/Bridge/Api/Youtube.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/Youtube/Container.php
+++ b/lib/classes/Bridge/Api/Youtube/Container.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Api/Youtube/Element.php
+++ b/lib/classes/Bridge/Api/Youtube/Element.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Element.php
+++ b/lib/classes/Bridge/Element.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception.php
+++ b/lib/classes/Bridge/Exception.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/AccountNotFound.php
+++ b/lib/classes/Bridge/Exception/AccountNotFound.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ActionAuthBadConnection.php
+++ b/lib/classes/Bridge/Exception/ActionAuthBadConnection.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ActionAuthNeedReconnect.php
+++ b/lib/classes/Bridge/Exception/ActionAuthNeedReconnect.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ActionForbidden.php
+++ b/lib/classes/Bridge/Exception/ActionForbidden.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ActionInvalidObjectId.php
+++ b/lib/classes/Bridge/Exception/ActionInvalidObjectId.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ActionMandatoryField.php
+++ b/lib/classes/Bridge/Exception/ActionMandatoryField.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ApiConnectorAccessTokenFailed.php
+++ b/lib/classes/Bridge/Exception/ApiConnectorAccessTokenFailed.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ApiConnectorNotConfigured.php
+++ b/lib/classes/Bridge/Exception/ApiConnectorNotConfigured.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ApiConnectorNotConnected.php
+++ b/lib/classes/Bridge/Exception/ApiConnectorNotConnected.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ApiConnectorNotFound.php
+++ b/lib/classes/Bridge/Exception/ApiConnectorNotFound.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ApiConnectorRequestFailed.php
+++ b/lib/classes/Bridge/Exception/ApiConnectorRequestFailed.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ApiDisabled.php
+++ b/lib/classes/Bridge/Exception/ApiDisabled.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ApiNotFound.php
+++ b/lib/classes/Bridge/Exception/ApiNotFound.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ContainerUnknown.php
+++ b/lib/classes/Bridge/Exception/ContainerUnknown.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ElementNotFound.php
+++ b/lib/classes/Bridge/Exception/ElementNotFound.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ElementUnknown.php
+++ b/lib/classes/Bridge/Exception/ElementUnknown.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/InvalidRecordType.php
+++ b/lib/classes/Bridge/Exception/InvalidRecordType.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/ObjectUnknown.php
+++ b/lib/classes/Bridge/Exception/ObjectUnknown.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Bridge/Exception/TokenNotFound.php
+++ b/lib/classes/Bridge/Exception/TokenNotFound.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/Abstract.php
+++ b/lib/classes/Exception/Abstract.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/Databox/CollectionNotFound.php
+++ b/lib/classes/Exception/Databox/CollectionNotFound.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/Databox/FieldNotFound.php
+++ b/lib/classes/Exception/Databox/FieldNotFound.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/Databox/SubdefNotFound.php
+++ b/lib/classes/Exception/Databox/SubdefNotFound.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/Databox/metadataDescriptionNotFound.php
+++ b/lib/classes/Exception/Databox/metadataDescriptionNotFound.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/InternalServerError.php
+++ b/lib/classes/Exception/InternalServerError.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/InvalidArgument.php
+++ b/lib/classes/Exception/InvalidArgument.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/Media/SubdefNotFound.php
+++ b/lib/classes/Exception/Media/SubdefNotFound.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/Record/AdapterNotFound.php
+++ b/lib/classes/Exception/Record/AdapterNotFound.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/Session/LoggerNotFound.php
+++ b/lib/classes/Exception/Session/LoggerNotFound.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/Setup/CannotWriteLockFile.php
+++ b/lib/classes/Exception/Setup/CannotWriteLockFile.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/Setup/FixBadEmailAddresses.php
+++ b/lib/classes/Exception/Setup/FixBadEmailAddresses.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/Setup/PhraseaAlreadyInstalled.php
+++ b/lib/classes/Exception/Setup/PhraseaAlreadyInstalled.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/Setup/UpgradeAlreadyStarted.php
+++ b/lib/classes/Exception/Setup/UpgradeAlreadyStarted.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/Upload/CannotWriteFile.php
+++ b/lib/classes/Exception/Upload/CannotWriteFile.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/Upload/Error.php
+++ b/lib/classes/Exception/Upload/Error.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Exception/Upload/FileTooBig.php
+++ b/lib/classes/Exception/Upload/FileTooBig.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/Session/Logger.php
+++ b/lib/classes/Session/Logger.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -199,10 +199,10 @@ class Session_Logger
            $module->setSession($session);
            $session->addModule($module);

-            $app['EM']->persist($module);
-            $app['EM']->persist($session);
+            $app['orm.em']->persist($module);
+            $app['orm.em']->persist($session);

-            $app['EM']->flush();
+            $app['orm.em']->flush();
        }

        $appName = [
--- a/lib/classes/Setup/Upgrade.php
+++ b/lib/classes/Setup/Upgrade.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/User/Query.php
+++ b/lib/classes/User/Query.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/User/QueryInterface.php
+++ b/lib/classes/User/QueryInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/appbox.php
+++ b/lib/classes/appbox.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -55,7 +55,8 @@ class appbox extends base
    {
        $this->app = $app;
        $connexion = $app['conf']->get(['main', 'database']);
-        $this->connection = $app['dbal.provider']->get($connexion);
+
+        $this->connection = $app['db.provider']($connexion);

        $this->host = $connexion['host'];
        $this->port = $connexion['port'];
@@ -317,6 +318,16 @@ class appbox extends base
            $app['filesystem']->mirror($this->app['root.path'] . '/' . $source, $this->app['root.path'] . '/' . $target, null, array('override' => true));
        }

+        // do not apply patches
+        // just update old database schema
+        // it is need before applying patches
+        $advices = $this->upgradeDB(false, $app);
+
+        foreach ($this->get_databoxes() as $s) {
+            $advices = array_merge($advices, $s->upgradeDB(false, $app));
+        }
+
+        // then apply patches
        $advices = $this->upgradeDB(true, $app);

        foreach ($this->get_databoxes() as $s) {
@@ -327,9 +338,9 @@ class appbox extends base

        $app['phraseanet.cache-service']->flushAll();

-        if ($app['EM']->getConnection()->getDatabasePlatform()->supportsAlterTable()) {
-            $tool = new SchemaTool($app['EM']);
-            $metas = $app['EM']->getMetadataFactory()->getAllMetadata();
+        if ($app['orm.em']->getConnection()->getDatabasePlatform()->supportsAlterTable()) {
+            $tool = new SchemaTool($app['orm.em']);
+            $metas = $app['orm.em']->getMetadataFactory()->getAllMetadata();
            $tool->updateSchema($metas, true);
        }

--- a/lib/classes/base.php
+++ b/lib/classes/base.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -810,6 +810,9 @@ abstract class base implements cache_cacheableInterface

        $success = true;

+        // disable mail
+        $app['swiftmailer.transport'] = null;
+
        foreach ($list_patches as $patch) {
            // Gets doctrine migrations required for current patch
            foreach ($patch->getDoctrineMigrations() as $doctrineVersion) {
@@ -822,7 +825,7 @@ abstract class base implements cache_cacheableInterface
                $migration = $version->getMigration();

                // Inject entity manager
-                $migration->setEntityManager($app['EM']);
+                $migration->setEntityManager($app['orm.em']);

                // Execute migration if not marked as migrated and not already applied by an older patch
                if (!$migration->isAlreadyApplied()) {
--- a/lib/classes/cache/cacheableInterface.php
+++ b/lib/classes/cache/cacheableInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/cache/databox.php
+++ b/lib/classes/cache/databox.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/caption/Field/ThesaurusValue.php
+++ b/lib/classes/caption/Field/ThesaurusValue.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/caption/Field/Value.php
+++ b/lib/classes/caption/Field/Value.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/caption/field.php
+++ b/lib/classes/caption/field.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -282,7 +282,7 @@ class caption_field implements cache_cacheableInterface
        return $values;
    }

-    public static function rename_all_metadatas(databox_field $databox_field)
+    public static function rename_all_metadatas(Application $app, databox_field $databox_field)
    {
        $sql = 'SELECT count(id) as count_id FROM metadatas
            WHERE meta_struct_id = :meta_struct_id';
--- a/lib/classes/caption/interface.php
+++ b/lib/classes/caption/interface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/classes/caption/record.php
+++ b/lib/classes/caption/record.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/Show More
+++ b/Show More