diff --git a/CHANGELOG.md b/CHANGELOG.md index b0f566100c..9472e35817 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # CHANGELOG + * 3.9.0 (xxxx-xx-xx) - Convert Orders custom adapter to Doctrine entity. @@ -9,6 +10,61 @@ - Convert Ftp Export custom adapter to Doctrine entity. - Session management is now part of Phraseanet configuration. +## 3.8.6 (2015-01-20) + + - BugFix : Fixes the stories editing. When opening an editing form, the style applied to the notice doesn't match its selection + - BugFix : Fixes the sending of a return receipt (attributed in the headers of the email) at the export + - BugFix : Fixes the SMTP field in the Administration panel which is pre filled with a wrong information + - BugFix : Fixes a bad mapping of the registration fields on the homepage and the displayed fields in the registration requests in the Administration + - BugFix : In the detailed view, fixes the list of the stories titles which is truncated. + - BugFix : Fixes Oauth 2.0, the authorization of the client applications is not systematically requested when logging in. + - BugFix : When uploading documents, the first status is not taken into account + - BugFix : Fixes the cache invalidation of the status bits icons when changed in Admin section + - BugFix : Fixes the reordering of the media in a basket + - BugFix : Fixes the control of field "name" when creating a push or a feedback + - BugFix : Fixes Oauth 2.0 message when the connection fails + - BugFix : Fixes the suppression of diffusion lists on IE9 + - BugFix : Fixes the anonymous download when a user is logged off + - BugFix : Fixes the setup of the default display mode of the collections (stamp/watermark) on a non authenticated mode + - BugFix : Fixes the printing of the thumbnails of documents for the videos or PDFs + - BugFix : Fixes the reordering of the basket when the documents come from n different collections + - BugFix : Fixes the application of the "status bits" when the status bit is defined by the task "RecordMover" + - BugFix : Fixes the detection of duplicates for PDF files + - BugFix : Fixes the rewriting of metadata of a document, when the name space is empty + - BugFix : Fixes the injection of the rights of a user for a connection via Oauth2 + - BugFix : Fixes the invalidation of the cache when disassembling a databox + - BugFix : Fixes the sorting criteria by date and by field, according to users rights + - BugFix : Fixes the right to download for the guest access + - BugFix : Fixes the report generation for the number of downloads and connections + - BugFix : Fixes the memory use of the task for the the sub-definitions creation + - BugFix : Fixes the generation of sub-definitions when editing the sub-definitions task + - BugFix : Fixes the display of multivalued fields in the editing window + - BugFix : Fixes the adding of a term in the candidates which was is not detected as present in the candidates + - BugFix : Fixes the users' rights when using the API + - BugFix : When being redirected, fixes the add of parameters after login. + - BugFix : Fixes the thumbnails' size of EPS files. + - BugFix : The "Delete" action of a task ("Record Mover" type) is now taken into consideration. + - BugFix : The edition dates of a record sent back by the API are now fixed + - BuxFix : Writing of IPTC fields is fixed, when setting up a stamp on a media (image type). + - Enhancement : Possibility to adapt a task "creation of subdefinition", by database and type of document + - Enhancement : Reporting modifications of Flickr & Dailymotion APIs (Bridge feature). + - Enhancement : Adding the possibility to overload the name space reserved for the cache + - Enhancement : Adding the possibility to deactivate the use of the TaskManager by instance + - Enhancement : Adding an extended format for the API replies. Get more information about Phraseanet records in one API request. + - Enhancement : Adding a block for the help text of Production when no result is displayed to authorize the modification of this text via a plugin + - Enhancement : Adding the possibility to deactivate the notifications to the users for a new publication + - Enhancement : Adding the possibility to modify the rotation of pictures representing the videos and PDF files + - Enhancement : Adding the possibility to serve the thumbnails of the application in a static way for improved performances + - Enhancement : Adding the possibility to deactivate the lazy load for the thumbnails + - Enhancement : The tasks can now reconnect automatically to MySQL + - Enhancement : The sorting on the fields "Number" is now possible + - Enhancement : The sub-definition creation task now displays the remaining number of sub-definitions to create + - Enhancement : Adding the date of edition of the media + - Enhancement : Use of http cache for the display of documents + - Enhancement : Adding the possibility to deactivate the CSRF for the authentication form + - NewFeature : Adding a Vagrant VM (for developers and testers). The setup is quicker: development environments made easy. + - NewFeature : Adding a command for the file generation crossdomain.xml depending on the configuration. + ## 3.8.5 (2014-07-08) - BugFix : Fix Flickr connexion throught Bridge Application diff --git a/bin/console b/bin/console index 35a6240fae..b537608c86 100755 --- a/bin/console +++ b/bin/console @@ -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. @@ -11,6 +11,8 @@ namespace KonsoleKommander; + +use Alchemy\Phrasea\Command\BuildSubdefs; use Alchemy\Phrasea\Command\Plugin\ListPlugin; use Alchemy\Phrasea\Command\Setup\H264ConfigurationDumper; use Alchemy\Phrasea\Command\Setup\H264MappingGenerator; @@ -107,6 +109,7 @@ $cli->command(new CreateCollection('collection:create')); $cli->command(new RecordAdd('records:add')); $cli->command(new RescanTechnicalDatas('records:rescan-technical-datas')); $cli->command(new BuildMissingSubdefs('records:build-missing-subdefs')); +$cli->command(new BuildSubdefs('records:build-subdefs')); $cli->command(new AddPlugin()); $cli->command(new ListPlugin()); diff --git a/bin/developer b/bin/developer index cb81b0b35b..6f42e3d2ea 100755 --- a/bin/developer +++ b/bin/developer @@ -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. diff --git a/bin/setup b/bin/setup index ea2a4ecc03..18cd6933d4 100755 --- a/bin/setup +++ b/bin/setup @@ -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. diff --git a/composer.json b/composer.json index 58663b68a6..59c74d4322 100644 --- a/composer.json +++ b/composer.json @@ -40,14 +40,13 @@ "alchemy/geonames-api-consumer" : "~0.1.0", "goodby/csv" : "~1.0", "guzzle/guzzle" : "~3.0", - "imagine/imagine" : "dev-0.6.1-flatten-layer as 0.6.1", - "igorw/get-in" : "~1.0", + "imagine/imagine" : "dev-alchemy-0.6.2 as 0.6.2","igorw/get-in" : "~1.0", "ircmaxell/random-lib" : "~1.0", - "jms/serializer" : "~0.10", + "jms/serializer" : "~0.10", "jms/translation-bundle" : "~1.1", "justinrainbow/json-schema" : "~1.3", "mediavorus/mediavorus" : "~0.4.0", - "media-alchemyst/media-alchemyst" : "dev-master", + "media-alchemyst/media-alchemyst" : "~0.4", "monolog/monolog" : "~1.3", "mrclay/minify" : "~2.1.6", "neutron/process-manager" : "2.0.x-dev@dev", diff --git a/composer.lock b/composer.lock index 6eab1646da..029faa2b28 100644 --- a/composer.lock +++ b/composer.lock @@ -11,15 +11,9 @@ "version": "6.0.039", "source": { "type": "git", - "url": "https://github.com/alchemy-fr/tcpdf-clone.git", + "url": "https://github.com/alchemy-fr/tcpdf-clone", "reference": "2ba0248a7187f1626df6c128750650416267f0e7" }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/tcpdf-clone/zipball/2ba0248a7187f1626df6c128750650416267f0e7", - "reference": "2ba0248a7187f1626df6c128750650416267f0e7", - "shasum": "" - }, "require": { "php": ">=5.3.0" }, @@ -66,10 +60,6 @@ "qrcode", "tcpdf" ], - "support": { - "source": "https://github.com/alchemy-fr/tcpdf-clone/tree/6.0.039", - "issues": "https://github.com/alchemy-fr/tcpdf-clone/issues" - }, "time": "2013-10-13 16:11:17" }, { @@ -113,7 +103,7 @@ "homepage": "http://www.lickmychip.com/" }, { - "name": "nlegoff", + "name": "Nicolas Le Goff", "email": "legoff.n@gmail.com" }, { @@ -940,8 +930,7 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" + "homepage": "http://www.jwage.com/" }, { "name": "Guilherme Blanco", @@ -959,7 +948,7 @@ { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -1013,7 +1002,7 @@ { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -1218,13 +1207,13 @@ "version": "v1.0.0", "source": { "type": "git", - "url": "https://github.com/igorw/evenement.git", - "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d" + "url": "https://github.com/igorw/evenement", + "reference": "v1.0.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/igorw/evenement/zipball/fa966683e7df3e5dd5929d984a44abfbd6bafe8d", - "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d", + "url": "https://github.com/igorw/evenement/zipball/v1.0.0", + "reference": "v1.0.0", "shasum": "" }, "require": { @@ -1251,7 +1240,7 @@ "keywords": [ "event-dispatcher" ], - "time": "2012-05-30 15:01:08" + "time": "2012-05-30 08:01:08" }, { "name": "facebook/php-sdk", @@ -1575,16 +1564,16 @@ }, { "name": "imagine/imagine", - "version": "dev-0.6.1-flatten-layer", + "version": "dev-alchemy-0.6.2", "source": { "type": "git", "url": "https://github.com/alchemy-fr/Imagine.git", - "reference": "372f36e2d76e4ca1fbdccda57c23b8483ed700b1" + "reference": "6605d13e3b24f335fe80099c193546671158c041" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/Imagine/zipball/372f36e2d76e4ca1fbdccda57c23b8483ed700b1", - "reference": "372f36e2d76e4ca1fbdccda57c23b8483ed700b1", + "url": "https://api.github.com/repos/alchemy-fr/Imagine/zipball/6605d13e3b24f335fe80099c193546671158c041", + "reference": "6605d13e3b24f335fe80099c193546671158c041", "shasum": "" }, "require": { @@ -1601,7 +1590,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-develop": "0.6-dev" + "dev-develop": "0.7-dev" } }, "autoload": { @@ -1628,9 +1617,9 @@ "image processing" ], "support": { - "source": "https://github.com/alchemy-fr/Imagine/tree/0.6.1-flatten-layer" + "source": "https://github.com/alchemy-fr/Imagine/tree/alchemy-0.6.2" }, - "time": "2014-11-19 14:31:17" + "time": "2015-01-13 18:12:26" }, { "name": "ircmaxell/random-lib", @@ -2025,16 +2014,16 @@ }, { "name": "media-alchemyst/media-alchemyst", - "version": "dev-master", + "version": "0.4.8", "source": { "type": "git", "url": "https://github.com/alchemy-fr/Media-Alchemyst.git", - "reference": "62fec183416ce6dfdf22e832f0de3c7442a23598" + "reference": "cf1fdacbaf0d54440fa7b61c750234d0befde0c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/62fec183416ce6dfdf22e832f0de3c7442a23598", - "reference": "62fec183416ce6dfdf22e832f0de3c7442a23598", + "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/cf1fdacbaf0d54440fa7b61c750234d0befde0c8", + "reference": "cf1fdacbaf0d54440fa7b61c750234d0befde0c8", "shasum": "" }, "require": { @@ -2094,7 +2083,7 @@ "video", "video processing" ], - "time": "2014-10-20 07:22:23" + "time": "2015-02-03 16:25:38" }, { "name": "mediavorus/mediavorus", @@ -2254,7 +2243,7 @@ ], "authors": [ { - "name": "Steve Clay", + "name": "Stephen Clay", "email": "steve@mrclay.org", "homepage": "http://www.mrclay.org/", "role": "Developer" @@ -2440,21 +2429,21 @@ "source": { "type": "git", "url": "https://github.com/romainneutron/Imagine-Silex-Service-Provider.git", - "reference": "a8a7862ae90419f2b23746cd8436c2310e4eb084" + "reference": "0.1.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/romainneutron/Imagine-Silex-Service-Provider/zipball/a8a7862ae90419f2b23746cd8436c2310e4eb084", - "reference": "a8a7862ae90419f2b23746cd8436c2310e4eb084", + "url": "https://api.github.com/repos/romainneutron/Imagine-Silex-Service-Provider/zipball/0.1.2", + "reference": "0.1.2", "shasum": "" }, "require": { "imagine/imagine": "*", "php": ">=5.3.3", - "silex/silex": "~1.0" + "silex/silex": ">=1.0,<2.0" }, "require-dev": { - "symfony/browser-kit": "~2.0" + "symfony/browser-kit": ">=2.0,<3.0" }, "type": "library", "autoload": { @@ -2968,7 +2957,7 @@ "metadata" ], "support": { - "source": "https://github.com/alchemy-fr/PHPExiftool/tree/dev" + "source": "https://github.com/alchemy-fr/PHPExiftool/tree/0.4.1-mwg-metadata-copy" }, "time": "2014-10-08 16:09:02" }, @@ -3026,12 +3015,12 @@ "version": "v1.1.1", "source": { "type": "git", - "url": "https://github.com/fabpot/Pimple.git", + "url": "https://github.com/silexphp/Pimple.git", "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d", "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d", "shasum": "" }, @@ -3056,9 +3045,7 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" } ], "description": "Pimple is a simple Dependency Injection Container for PHP 5.3", @@ -3563,7 +3550,7 @@ }, { "name": "Phraseanet Team", - "email": "info@alchemy.fr", + "email": "support@alchemy.fr", "homepage": "http://www.phraseanet.com/" } ], @@ -3610,9 +3597,7 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" }, { "name": "Chris Corbyn" @@ -3836,12 +3821,12 @@ "source": { "type": "git", "url": "https://github.com/twigphp/Twig-extensions.git", - "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd" + "reference": "c0ab818595338dd5569369bfce2552d02cec5d50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/8cf4b9fe04077bd54fc73f4fde83347040c3b8cd", - "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd", + "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/c0ab818595338dd5569369bfce2552d02cec5d50", + "reference": "c0ab818595338dd5569369bfce2552d02cec5d50", "shasum": "" }, "require": { @@ -3888,12 +3873,12 @@ "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc" + "reference": "8ce37115802e257a984a82d38254884085060024" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/42f758d9fe2146d1f0470604fc05ee43580873fc", - "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/8ce37115802e257a984a82d38254884085060024", + "reference": "8ce37115802e257a984a82d38254884085060024", "shasum": "" }, "require": { @@ -4207,13 +4192,13 @@ "version": "v1.6.0", "source": { "type": "git", - "url": "https://github.com/Behat/Mink.git", - "reference": "090900a0049c441f1e072bbd837db4079b2250c5" + "url": "https://github.com/minkphp/Mink.git", + "reference": "0769e6d9726c140a54dbf827a438c0f9912749fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Mink/zipball/090900a0049c441f1e072bbd837db4079b2250c5", - "reference": "090900a0049c441f1e072bbd837db4079b2250c5", + "url": "https://api.github.com/repos/minkphp/Mink/zipball/0769e6d9726c140a54dbf827a438c0f9912749fe", + "reference": "0769e6d9726c140a54dbf827a438c0f9912749fe", "shasum": "" }, "require": { @@ -4262,13 +4247,13 @@ "version": "v1.2.0", "source": { "type": "git", - "url": "https://github.com/Behat/MinkBrowserKitDriver.git", - "reference": "aed8f4a596b79014a75254c3e337511c33e38cbd" + "url": "https://github.com/minkphp/MinkBrowserKitDriver.git", + "reference": "63960c8fcad4529faad1ff33e950217980baa64c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/MinkBrowserKitDriver/zipball/aed8f4a596b79014a75254c3e337511c33e38cbd", - "reference": "aed8f4a596b79014a75254c3e337511c33e38cbd", + "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/63960c8fcad4529faad1ff33e950217980baa64c", + "reference": "63960c8fcad4529faad1ff33e950217980baa64c", "shasum": "" }, "require": { @@ -4368,13 +4353,13 @@ "version": "v1.1.0", "source": { "type": "git", - "url": "https://github.com/Behat/MinkGoutteDriver.git", - "reference": "2bf327b4166694ecaa8ae7f956cb6ae252ecf03e" + "url": "https://github.com/minkphp/MinkGoutteDriver.git", + "reference": "fa1b073b48761464feb0b05e6825da44b20118d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/MinkGoutteDriver/zipball/2bf327b4166694ecaa8ae7f956cb6ae252ecf03e", - "reference": "2bf327b4166694ecaa8ae7f956cb6ae252ecf03e", + "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/fa1b073b48761464feb0b05e6825da44b20118d8", + "reference": "fa1b073b48761464feb0b05e6825da44b20118d8", "shasum": "" }, "require": { @@ -4420,13 +4405,13 @@ "version": "v1.2.0", "source": { "type": "git", - "url": "https://github.com/Behat/MinkSelenium2Driver.git", - "reference": "8018fee80bf6573f909ece3e0dfc07d0eb352210" + "url": "https://github.com/minkphp/MinkSelenium2Driver.git", + "reference": "bcf1b537de37db6db0822d9e7bd97e600fd7a476" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/MinkSelenium2Driver/zipball/8018fee80bf6573f909ece3e0dfc07d0eb352210", - "reference": "8018fee80bf6573f909ece3e0dfc07d0eb352210", + "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/bcf1b537de37db6db0822d9e7bd97e600fd7a476", + "reference": "bcf1b537de37db6db0822d9e7bd97e600fd7a476", "shasum": "" }, "require": { @@ -4479,12 +4464,12 @@ "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/Goutte.git", - "reference": "794b196e76bdd37b5155cdecbad311f0a3b07625" + "reference": "06a5451288ffddd204b10fa6c6f9ab2b86dd515d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/794b196e76bdd37b5155cdecbad311f0a3b07625", - "reference": "794b196e76bdd37b5155cdecbad311f0a3b07625", + "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/06a5451288ffddd204b10fa6c6f9ab2b86dd515d", + "reference": "06a5451288ffddd204b10fa6c6f9ab2b86dd515d", "shasum": "" }, "require": { @@ -4956,9 +4941,9 @@ ], "aliases": [ { - "alias": "0.6.1", - "alias_normalized": "0.6.1.0", - "version": "dev-0.6.1-flatten-layer", + "alias": "0.6.2", + "alias_normalized": "0.6.2.0", + "version": "dev-alchemy-0.6.2", "package": "imagine/imagine" }, { @@ -4973,7 +4958,6 @@ "alchemy/task-manager": 20, "alchemy/zippy": 20, "imagine/imagine": 20, - "media-alchemyst/media-alchemyst": 20, "neutron/process-manager": 20, "phpexiftool/phpexiftool": 20, "silex/silex": 20, diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php index 61cc8b2d82..60086099c3 100644 --- a/lib/Alchemy/Phrasea/Application.php +++ b/lib/Alchemy/Phrasea/Application.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. diff --git a/lib/Alchemy/Phrasea/Application/Api.php b/lib/Alchemy/Phrasea/Application/Api.php index 6dbd945ef5..4d0102d82b 100644 --- a/lib/Alchemy/Phrasea/Application/Api.php +++ b/lib/Alchemy/Phrasea/Application/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. diff --git a/lib/Alchemy/Phrasea/Application/Root.php b/lib/Alchemy/Phrasea/Application/Root.php index 58ad41be88..a92bb7f88b 100644 --- a/lib/Alchemy/Phrasea/Application/Root.php +++ b/lib/Alchemy/Phrasea/Application/Root.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. diff --git a/lib/Alchemy/Phrasea/Authentication/AccountCreator.php b/lib/Alchemy/Phrasea/Authentication/AccountCreator.php index 3899f36400..0c72d4b82a 100644 --- a/lib/Alchemy/Phrasea/Authentication/AccountCreator.php +++ b/lib/Alchemy/Phrasea/Authentication/AccountCreator.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Authenticator.php b/lib/Alchemy/Phrasea/Authentication/Authenticator.php index 6c59f5a606..f25a28d666 100644 --- a/lib/Alchemy/Phrasea/Authentication/Authenticator.php +++ b/lib/Alchemy/Phrasea/Authentication/Authenticator.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Context.php b/lib/Alchemy/Phrasea/Authentication/Context.php index ee03083e77..4bba11ff27 100644 --- a/lib/Alchemy/Phrasea/Authentication/Context.php +++ b/lib/Alchemy/Phrasea/Authentication/Context.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Exception/AccountLockedException.php b/lib/Alchemy/Phrasea/Authentication/Exception/AccountLockedException.php index aac52236ab..894e8998e3 100644 --- a/lib/Alchemy/Phrasea/Authentication/Exception/AccountLockedException.php +++ b/lib/Alchemy/Phrasea/Authentication/Exception/AccountLockedException.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Exception/AuthenticationException.php b/lib/Alchemy/Phrasea/Authentication/Exception/AuthenticationException.php index 34ae67da48..37a1514705 100644 --- a/lib/Alchemy/Phrasea/Authentication/Exception/AuthenticationException.php +++ b/lib/Alchemy/Phrasea/Authentication/Exception/AuthenticationException.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Exception/NotAuthenticatedException.php b/lib/Alchemy/Phrasea/Authentication/Exception/NotAuthenticatedException.php index b8e1f76044..6dfe729bc7 100644 --- a/lib/Alchemy/Phrasea/Authentication/Exception/NotAuthenticatedException.php +++ b/lib/Alchemy/Phrasea/Authentication/Exception/NotAuthenticatedException.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Exception/RequireCaptchaException.php b/lib/Alchemy/Phrasea/Authentication/Exception/RequireCaptchaException.php index a4e01061c6..d84eb71d9b 100644 --- a/lib/Alchemy/Phrasea/Authentication/Exception/RequireCaptchaException.php +++ b/lib/Alchemy/Phrasea/Authentication/Exception/RequireCaptchaException.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Manager.php b/lib/Alchemy/Phrasea/Authentication/Manager.php index 707fab805a..c9c8e57ec1 100644 --- a/lib/Alchemy/Phrasea/Authentication/Manager.php +++ b/lib/Alchemy/Phrasea/Authentication/Manager.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. diff --git a/lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.php b/lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.php index 1ef0dc8472..986a27c62f 100644 --- a/lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.php +++ b/lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.php b/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.php index d39272f516..d0340f3f03 100644 --- a/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.php +++ b/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.php b/lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.php index aab144f653..bf6601fed4 100644 --- a/lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.php +++ b/lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Phrasea/OldPasswordEncoder.php b/lib/Alchemy/Phrasea/Authentication/Phrasea/OldPasswordEncoder.php index de098e413d..454e8914dd 100644 --- a/lib/Alchemy/Phrasea/Authentication/Phrasea/OldPasswordEncoder.php +++ b/lib/Alchemy/Phrasea/Authentication/Phrasea/OldPasswordEncoder.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Phrasea/PasswordEncoder.php b/lib/Alchemy/Phrasea/Authentication/Phrasea/PasswordEncoder.php index cda23a5b07..e37cc41d45 100644 --- a/lib/Alchemy/Phrasea/Authentication/Phrasea/PasswordEncoder.php +++ b/lib/Alchemy/Phrasea/Authentication/Phrasea/PasswordEncoder.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Provider/AbstractProvider.php b/lib/Alchemy/Phrasea/Authentication/Provider/AbstractProvider.php index 4c2f15777c..f2c2028cc1 100644 --- a/lib/Alchemy/Phrasea/Authentication/Provider/AbstractProvider.php +++ b/lib/Alchemy/Phrasea/Authentication/Provider/AbstractProvider.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Provider/Facebook.php b/lib/Alchemy/Phrasea/Authentication/Provider/Facebook.php index 409263eb3b..3cce15fcd4 100644 --- a/lib/Alchemy/Phrasea/Authentication/Provider/Facebook.php +++ b/lib/Alchemy/Phrasea/Authentication/Provider/Facebook.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Provider/Factory.php b/lib/Alchemy/Phrasea/Authentication/Provider/Factory.php index b5be6801a9..c5149b3102 100644 --- a/lib/Alchemy/Phrasea/Authentication/Provider/Factory.php +++ b/lib/Alchemy/Phrasea/Authentication/Provider/Factory.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Provider/Github.php b/lib/Alchemy/Phrasea/Authentication/Provider/Github.php index 3e1f6b868a..e1c35b1eca 100644 --- a/lib/Alchemy/Phrasea/Authentication/Provider/Github.php +++ b/lib/Alchemy/Phrasea/Authentication/Provider/Github.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Provider/GooglePlus.php b/lib/Alchemy/Phrasea/Authentication/Provider/GooglePlus.php index aa5e7212ab..09ddc0e527 100644 --- a/lib/Alchemy/Phrasea/Authentication/Provider/GooglePlus.php +++ b/lib/Alchemy/Phrasea/Authentication/Provider/GooglePlus.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Provider/Linkedin.php b/lib/Alchemy/Phrasea/Authentication/Provider/Linkedin.php index 004955b119..1b23fa2c6c 100644 --- a/lib/Alchemy/Phrasea/Authentication/Provider/Linkedin.php +++ b/lib/Alchemy/Phrasea/Authentication/Provider/Linkedin.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Provider/ProviderInterface.php b/lib/Alchemy/Phrasea/Authentication/Provider/ProviderInterface.php index 287d6331ee..d1d91d4248 100644 --- a/lib/Alchemy/Phrasea/Authentication/Provider/ProviderInterface.php +++ b/lib/Alchemy/Phrasea/Authentication/Provider/ProviderInterface.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Provider/Token/Identity.php b/lib/Alchemy/Phrasea/Authentication/Provider/Token/Identity.php index 43d34ccaf0..f9e87dc0fe 100644 --- a/lib/Alchemy/Phrasea/Authentication/Provider/Token/Identity.php +++ b/lib/Alchemy/Phrasea/Authentication/Provider/Token/Identity.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Provider/Token/Token.php b/lib/Alchemy/Phrasea/Authentication/Provider/Token/Token.php index 3eef168354..6b964aa354 100644 --- a/lib/Alchemy/Phrasea/Authentication/Provider/Token/Token.php +++ b/lib/Alchemy/Phrasea/Authentication/Provider/Token/Token.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Provider/Twitter.php b/lib/Alchemy/Phrasea/Authentication/Provider/Twitter.php index 908b906022..95b6287f4d 100644 --- a/lib/Alchemy/Phrasea/Authentication/Provider/Twitter.php +++ b/lib/Alchemy/Phrasea/Authentication/Provider/Twitter.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. diff --git a/lib/Alchemy/Phrasea/Authentication/Provider/Viadeo.php b/lib/Alchemy/Phrasea/Authentication/Provider/Viadeo.php index db9b84ec54..0a5bfd873f 100644 --- a/lib/Alchemy/Phrasea/Authentication/Provider/Viadeo.php +++ b/lib/Alchemy/Phrasea/Authentication/Provider/Viadeo.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. diff --git a/lib/Alchemy/Phrasea/Authentication/ProvidersCollection.php b/lib/Alchemy/Phrasea/Authentication/ProvidersCollection.php index 82625c09b6..da93d53533 100644 --- a/lib/Alchemy/Phrasea/Authentication/ProvidersCollection.php +++ b/lib/Alchemy/Phrasea/Authentication/ProvidersCollection.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. diff --git a/lib/Alchemy/Phrasea/Authentication/SuggestionFinder.php b/lib/Alchemy/Phrasea/Authentication/SuggestionFinder.php index 48cd43e687..b842e200ca 100644 --- a/lib/Alchemy/Phrasea/Authentication/SuggestionFinder.php +++ b/lib/Alchemy/Phrasea/Authentication/SuggestionFinder.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. diff --git a/lib/Alchemy/Phrasea/Border/Attribute/AttributeInterface.php b/lib/Alchemy/Phrasea/Border/Attribute/AttributeInterface.php index 44298f2055..12b7d8c861 100644 --- a/lib/Alchemy/Phrasea/Border/Attribute/AttributeInterface.php +++ b/lib/Alchemy/Phrasea/Border/Attribute/AttributeInterface.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. diff --git a/lib/Alchemy/Phrasea/Border/Attribute/Factory.php b/lib/Alchemy/Phrasea/Border/Attribute/Factory.php index 8ff5853e30..6f5f1cde1f 100644 --- a/lib/Alchemy/Phrasea/Border/Attribute/Factory.php +++ b/lib/Alchemy/Phrasea/Border/Attribute/Factory.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. diff --git a/lib/Alchemy/Phrasea/Border/Attribute/MetaField.php b/lib/Alchemy/Phrasea/Border/Attribute/MetaField.php index b1132faa7e..e3a2465d86 100644 --- a/lib/Alchemy/Phrasea/Border/Attribute/MetaField.php +++ b/lib/Alchemy/Phrasea/Border/Attribute/MetaField.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. diff --git a/lib/Alchemy/Phrasea/Border/Attribute/Metadata.php b/lib/Alchemy/Phrasea/Border/Attribute/Metadata.php index ef1d600b9d..314acb6d78 100644 --- a/lib/Alchemy/Phrasea/Border/Attribute/Metadata.php +++ b/lib/Alchemy/Phrasea/Border/Attribute/Metadata.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. diff --git a/lib/Alchemy/Phrasea/Border/Attribute/Status.php b/lib/Alchemy/Phrasea/Border/Attribute/Status.php index 46d910fc70..1a78b7a58e 100644 --- a/lib/Alchemy/Phrasea/Border/Attribute/Status.php +++ b/lib/Alchemy/Phrasea/Border/Attribute/Status.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. diff --git a/lib/Alchemy/Phrasea/Border/Attribute/Story.php b/lib/Alchemy/Phrasea/Border/Attribute/Story.php index 718ec5a1a1..9c24bd0a8d 100644 --- a/lib/Alchemy/Phrasea/Border/Attribute/Story.php +++ b/lib/Alchemy/Phrasea/Border/Attribute/Story.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. diff --git a/lib/Alchemy/Phrasea/Border/Checker/AbstractChecker.php b/lib/Alchemy/Phrasea/Border/Checker/AbstractChecker.php index a91a51d50f..fee62d05c3 100644 --- a/lib/Alchemy/Phrasea/Border/Checker/AbstractChecker.php +++ b/lib/Alchemy/Phrasea/Border/Checker/AbstractChecker.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. diff --git a/lib/Alchemy/Phrasea/Border/Checker/CheckerInterface.php b/lib/Alchemy/Phrasea/Border/Checker/CheckerInterface.php index aa50bfa2bd..014298557e 100644 --- a/lib/Alchemy/Phrasea/Border/Checker/CheckerInterface.php +++ b/lib/Alchemy/Phrasea/Border/Checker/CheckerInterface.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. diff --git a/lib/Alchemy/Phrasea/Border/Checker/Colorspace.php b/lib/Alchemy/Phrasea/Border/Checker/Colorspace.php index 83b1a9574d..4562c6056f 100644 --- a/lib/Alchemy/Phrasea/Border/Checker/Colorspace.php +++ b/lib/Alchemy/Phrasea/Border/Checker/Colorspace.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. diff --git a/lib/Alchemy/Phrasea/Border/Checker/Dimension.php b/lib/Alchemy/Phrasea/Border/Checker/Dimension.php index 2b023b54cf..a3e7ff480d 100644 --- a/lib/Alchemy/Phrasea/Border/Checker/Dimension.php +++ b/lib/Alchemy/Phrasea/Border/Checker/Dimension.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. diff --git a/lib/Alchemy/Phrasea/Border/Checker/Extension.php b/lib/Alchemy/Phrasea/Border/Checker/Extension.php index aa228422fb..0e45c0e56a 100644 --- a/lib/Alchemy/Phrasea/Border/Checker/Extension.php +++ b/lib/Alchemy/Phrasea/Border/Checker/Extension.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. diff --git a/lib/Alchemy/Phrasea/Border/Checker/Filename.php b/lib/Alchemy/Phrasea/Border/Checker/Filename.php index b7dad16ee7..04032deeee 100644 --- a/lib/Alchemy/Phrasea/Border/Checker/Filename.php +++ b/lib/Alchemy/Phrasea/Border/Checker/Filename.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. diff --git a/lib/Alchemy/Phrasea/Border/Checker/MediaType.php b/lib/Alchemy/Phrasea/Border/Checker/MediaType.php index 48e9f8b9eb..2d154de227 100644 --- a/lib/Alchemy/Phrasea/Border/Checker/MediaType.php +++ b/lib/Alchemy/Phrasea/Border/Checker/MediaType.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. diff --git a/lib/Alchemy/Phrasea/Border/Checker/Response.php b/lib/Alchemy/Phrasea/Border/Checker/Response.php index 1bc0a11fd5..2383c98b17 100644 --- a/lib/Alchemy/Phrasea/Border/Checker/Response.php +++ b/lib/Alchemy/Phrasea/Border/Checker/Response.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. diff --git a/lib/Alchemy/Phrasea/Border/Checker/Sha256.php b/lib/Alchemy/Phrasea/Border/Checker/Sha256.php index a51f31da58..1f66475929 100644 --- a/lib/Alchemy/Phrasea/Border/Checker/Sha256.php +++ b/lib/Alchemy/Phrasea/Border/Checker/Sha256.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. diff --git a/lib/Alchemy/Phrasea/Border/Checker/UUID.php b/lib/Alchemy/Phrasea/Border/Checker/UUID.php index 28815c1ab0..6c195bf38b 100644 --- a/lib/Alchemy/Phrasea/Border/Checker/UUID.php +++ b/lib/Alchemy/Phrasea/Border/Checker/UUID.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. diff --git a/lib/Alchemy/Phrasea/Border/CustomExtensionGuesser.php b/lib/Alchemy/Phrasea/Border/CustomExtensionGuesser.php index 551e2cacf7..d8cf369228 100644 --- a/lib/Alchemy/Phrasea/Border/CustomExtensionGuesser.php +++ b/lib/Alchemy/Phrasea/Border/CustomExtensionGuesser.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. diff --git a/lib/Alchemy/Phrasea/Border/File.php b/lib/Alchemy/Phrasea/Border/File.php index 532299fe02..2a9e5de76f 100644 --- a/lib/Alchemy/Phrasea/Border/File.php +++ b/lib/Alchemy/Phrasea/Border/File.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. diff --git a/lib/Alchemy/Phrasea/Border/Manager.php b/lib/Alchemy/Phrasea/Border/Manager.php index aa99917690..87a603a184 100644 --- a/lib/Alchemy/Phrasea/Border/Manager.php +++ b/lib/Alchemy/Phrasea/Border/Manager.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. @@ -13,6 +13,7 @@ namespace Alchemy\Phrasea\Border; use Alchemy\Phrasea\Border\Checker\CheckerInterface; use Alchemy\Phrasea\Border\Attribute\AttributeInterface; +use Alchemy\Phrasea\Media\Subdef\OptionType\Boolean; use Alchemy\Phrasea\Metadata\Tag\TfArchivedate; use Alchemy\Phrasea\Metadata\Tag\TfQuarantine; use Alchemy\Phrasea\Metadata\Tag\TfBasename; @@ -80,7 +81,7 @@ class Manager * @param type $forceBehavior Force a behavior, one of the self::FORCE_* constant * @return int One of the self::RECORD_CREATED or self::LAZARET_CREATED constants */ - public function process(LazaretSession $session, File $file, $callable = null, $forceBehavior = null) + public function process(LazaretSession $session, File $file, $callable = null, $forceBehavior = null, $nosubdef = false) { $visa = $this->getVisa($file); @@ -93,7 +94,7 @@ class Manager $this->addMediaAttributes($file); - $element = $this->createRecord($file); + $element = $this->createRecord($file, $nosubdef); $code = self::RECORD_CREATED; } else { @@ -229,10 +230,9 @@ class Manager * @param File $file The package file * @return \record_adater */ - protected function createRecord(File $file) + protected function createRecord(File $file, $nosubdef=false) { $element = \record_adapter::createFromFile($file, $this->app); - $date = new \DateTime(); $file->addAttribute( @@ -303,7 +303,9 @@ class Manager $this->app['phraseanet.metadata-setter']->replaceMetadata($newMetadata, $element); - $element->rebuild_subdefs(); + if(!$nosubdef) { + $element->rebuild_subdefs(); + } $element->reindex(); return $element; diff --git a/lib/Alchemy/Phrasea/Border/MetaBagInterface.php b/lib/Alchemy/Phrasea/Border/MetaBagInterface.php index 24a05a77e6..c719686995 100644 --- a/lib/Alchemy/Phrasea/Border/MetaBagInterface.php +++ b/lib/Alchemy/Phrasea/Border/MetaBagInterface.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. diff --git a/lib/Alchemy/Phrasea/Border/MetaFieldsBag.php b/lib/Alchemy/Phrasea/Border/MetaFieldsBag.php index ccd6a8637e..5f8f790a4a 100644 --- a/lib/Alchemy/Phrasea/Border/MetaFieldsBag.php +++ b/lib/Alchemy/Phrasea/Border/MetaFieldsBag.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. diff --git a/lib/Alchemy/Phrasea/Border/MetadataBag.php b/lib/Alchemy/Phrasea/Border/MetadataBag.php index fa0dada52d..2c8187a6c4 100644 --- a/lib/Alchemy/Phrasea/Border/MetadataBag.php +++ b/lib/Alchemy/Phrasea/Border/MetadataBag.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. diff --git a/lib/Alchemy/Phrasea/Border/MimeGuesserConfiguration.php b/lib/Alchemy/Phrasea/Border/MimeGuesserConfiguration.php index cfda50f3e9..f7504e6a47 100644 --- a/lib/Alchemy/Phrasea/Border/MimeGuesserConfiguration.php +++ b/lib/Alchemy/Phrasea/Border/MimeGuesserConfiguration.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. diff --git a/lib/Alchemy/Phrasea/Border/Visa.php b/lib/Alchemy/Phrasea/Border/Visa.php index f9d708a417..edcf3bdc30 100644 --- a/lib/Alchemy/Phrasea/Border/Visa.php +++ b/lib/Alchemy/Phrasea/Border/Visa.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. diff --git a/lib/Alchemy/Phrasea/CLI.php b/lib/Alchemy/Phrasea/CLI.php index 8ec5d3c6bb..f5d79ca830 100644 --- a/lib/Alchemy/Phrasea/CLI.php +++ b/lib/Alchemy/Phrasea/CLI.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. diff --git a/lib/Alchemy/Phrasea/Cache/ApcCache.php b/lib/Alchemy/Phrasea/Cache/ApcCache.php index a61407380b..24b6b87484 100644 --- a/lib/Alchemy/Phrasea/Cache/ApcCache.php +++ b/lib/Alchemy/Phrasea/Cache/ApcCache.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. diff --git a/lib/Alchemy/Phrasea/Cache/ArrayCache.php b/lib/Alchemy/Phrasea/Cache/ArrayCache.php index bd3c763883..d492a70424 100644 --- a/lib/Alchemy/Phrasea/Cache/ArrayCache.php +++ b/lib/Alchemy/Phrasea/Cache/ArrayCache.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. diff --git a/lib/Alchemy/Phrasea/Cache/Cache.php b/lib/Alchemy/Phrasea/Cache/Cache.php index e97ce9f22e..04fe604b60 100644 --- a/lib/Alchemy/Phrasea/Cache/Cache.php +++ b/lib/Alchemy/Phrasea/Cache/Cache.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. diff --git a/lib/Alchemy/Phrasea/Cache/Exception.php b/lib/Alchemy/Phrasea/Cache/Exception.php index b990c32279..fc34bb5d84 100644 --- a/lib/Alchemy/Phrasea/Cache/Exception.php +++ b/lib/Alchemy/Phrasea/Cache/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. diff --git a/lib/Alchemy/Phrasea/Cache/Factory.php b/lib/Alchemy/Phrasea/Cache/Factory.php index ccbf471d59..e2bc409daa 100644 --- a/lib/Alchemy/Phrasea/Cache/Factory.php +++ b/lib/Alchemy/Phrasea/Cache/Factory.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. @@ -46,7 +46,7 @@ class Factory $cache = $this->createMemcache($options); break; case 'memcached': - case 'memcachecached': + case 'memcachedcache': $cache = $this->createMemcached($options); break; case 'redis': diff --git a/lib/Alchemy/Phrasea/Cache/Manager.php b/lib/Alchemy/Phrasea/Cache/Manager.php index fa01631d16..59022be7f4 100644 --- a/lib/Alchemy/Phrasea/Cache/Manager.php +++ b/lib/Alchemy/Phrasea/Cache/Manager.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. diff --git a/lib/Alchemy/Phrasea/Cache/MemcacheCache.php b/lib/Alchemy/Phrasea/Cache/MemcacheCache.php index 918c90804f..6612a1bd82 100644 --- a/lib/Alchemy/Phrasea/Cache/MemcacheCache.php +++ b/lib/Alchemy/Phrasea/Cache/MemcacheCache.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. diff --git a/lib/Alchemy/Phrasea/Cache/MemcachedCache.php b/lib/Alchemy/Phrasea/Cache/MemcachedCache.php index 82ee182aab..85927af33f 100644 --- a/lib/Alchemy/Phrasea/Cache/MemcachedCache.php +++ b/lib/Alchemy/Phrasea/Cache/MemcachedCache.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. diff --git a/lib/Alchemy/Phrasea/Cache/RedisCache.php b/lib/Alchemy/Phrasea/Cache/RedisCache.php index 54ada036e4..64bbbf8317 100644 --- a/lib/Alchemy/Phrasea/Cache/RedisCache.php +++ b/lib/Alchemy/Phrasea/Cache/RedisCache.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. diff --git a/lib/Alchemy/Phrasea/Cache/WinCacheCache.php b/lib/Alchemy/Phrasea/Cache/WinCacheCache.php index 88f9b59239..f6e1dc765b 100644 --- a/lib/Alchemy/Phrasea/Cache/WinCacheCache.php +++ b/lib/Alchemy/Phrasea/Cache/WinCacheCache.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. diff --git a/lib/Alchemy/Phrasea/Cache/XcacheCache.php b/lib/Alchemy/Phrasea/Cache/XcacheCache.php index 191dca10b3..8ca17fa423 100644 --- a/lib/Alchemy/Phrasea/Cache/XcacheCache.php +++ b/lib/Alchemy/Phrasea/Cache/XcacheCache.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. diff --git a/lib/Alchemy/Phrasea/Command/AbstractCheckCommand.php b/lib/Alchemy/Phrasea/Command/AbstractCheckCommand.php index 7054b86fec..2b2ae0ecf4 100644 --- a/lib/Alchemy/Phrasea/Command/AbstractCheckCommand.php +++ b/lib/Alchemy/Phrasea/Command/AbstractCheckCommand.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. diff --git a/lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php b/lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php index 72ebfab158..ba6c6936c2 100644 --- a/lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php +++ b/lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.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. @@ -38,9 +38,6 @@ class BuildMissingSubdefs extends Command $n = 0; foreach ($this->container['phraseanet.appbox']->get_databoxes() as $databox) { - - $subdefStructure = $databox->get_subdef_structure(); - $sql = 'SELECT record_id FROM record WHERE parent_record_id = 0'; $stmt = $databox->get_connection()->prepare($sql); $stmt->execute(); @@ -50,38 +47,14 @@ class BuildMissingSubdefs extends Command foreach ($rs as $row) { $record = $databox->get_record($row['record_id']); - try { - $record->get_hd_file(); - } catch (FileNotFoundException $e) { - continue; - } + $wanted_subdefs = $record->get_missing_subdefs(); - $group = $subdefStructure->getSubdefGroup($record->get_type()); + if (count($wanted_subdefs) > 0) { + $record->generate_subdefs($databox, $this->container, $wanted_subdefs); - if ($group) { - foreach ($group as $subdef) { - - $todo = false; - - if ( ! $record->has_subdef($subdef->get_name())) { - $todo = true; - } - if (in_array($subdef->get_name(), ['preview', 'thumbnail', 'thumbnailgif'])) { - try { - $sub = $record->get_subdef($subdef->get_name()); - if ( ! $sub->is_physically_present()) { - $todo = true; - } - } catch (\Exception_Media_SubdefNotFound $e) { - $todo = true; - } - } - - if ($todo) { - $this->container['subdef.generator']->generateSubdefs($record, [$subdef->get_name()]); - $this->container['monolog']->addInfo("generate " . $subdef->get_name() . " for record " . $record->get_record_id()); - $n ++; - } + foreach ($wanted_subdefs as $subdef) { + $this->container['monolog']->addInfo("generate " .$subdef . " for record " . $record->get_record_id()); + $n ++; } } diff --git a/lib/Alchemy/Phrasea/Command/BuildSubdefs.php b/lib/Alchemy/Phrasea/Command/BuildSubdefs.php new file mode 100644 index 0000000000..bcf1abdb82 --- /dev/null +++ b/lib/Alchemy/Phrasea/Command/BuildSubdefs.php @@ -0,0 +1,171 @@ +setDescription('Build subviews for given subview names and record types'); + $this->addArgument('databox', InputArgument::REQUIRED, 'The databox id'); + $this->addArgument('type', InputArgument::REQUIRED, 'Types of the document to rebuild'); + $this->addArgument('subdefs', InputArgument::REQUIRED, 'Names of sub-definition to re-build'); + $this->addOption('max_record', 'max', InputOption::VALUE_OPTIONAL, 'Max record id'); + $this->addOption('min_record', 'min', InputOption::VALUE_OPTIONAL, 'Min record id'); + + return $this; + } + + /** + * {@inheritdoc} + */ + protected function doExecute(InputInterface $input, OutputInterface $output) + { + $availableTypes = array('document', 'audio', 'video', 'image', 'flash', 'map'); + + $typesOption = $input->getArgument('type'); + + $recordsType = explode(',', $typesOption); + $recordsType = array_filter($recordsType, function($type) use($availableTypes) { + return in_array($type, $availableTypes); + }); + + if (count($recordsType) === 0) { + $output->write(sprintf('Invalid records type provided %s', implode(', ', $availableTypes))); + return; + } + + $subdefsOption = $input->getArgument('subdefs'); + $subdefsName = explode(',', $subdefsOption); + + if (count($subdefsOption) === 0) { + $output->write('No subdef options provided'); + return; + } + + $sqlCount = " + SELECT COUNT(DISTINCT(r.record_id)) AS nb_records + FROM record r + INNER JOIN subdef s + ON (r.record_id = s.record_id) + WHERE s.name IN (?) + AND r.type IN (?) + "; + + $types = array(Connection::PARAM_STR_ARRAY, Connection::PARAM_STR_ARRAY); + $params = array($subdefsName, $recordsType); + + if (null !== $min = $input->getOption('min_record')) { + $sqlCount .= " AND (r.record_id >= ?)"; + + $params[] = (int) $min; + $types[] = \PDO::PARAM_INT; + } + if (null !== $max = $input->getOption('max_record')) { + $sqlCount .= " AND (r.record_id <= ?)"; + + $params[] = (int) $max; + $types[] = \PDO::PARAM_INT; + } + + list($sqlCount, $stmtParams) = SQLParserUtils::expandListParameters($sqlCount, $params, $types); + + $totalRecords = 0; + foreach ($this->container['phraseanet.appbox']->get_databoxes() as $databox) { + $connection = $databox->get_connection(); + $stmt = $connection->prepare($sqlCount); + $stmt->execute($stmtParams); + $row = $stmt->fetch(); + $totalRecords += $row['nb_records']; + } + + if ($totalRecords === 0) { + return; + } + + $progress = $this->getHelperSet()->get('progress'); + + $progress->start($output, $totalRecords); + + $progress->display(); + + $databox = $this->container['phraseanet.appbox']->get_databox($input->getArgument('databox')); + + $sql = " + SELECT DISTINCT(r.record_id) + FROM record r + INNER JOIN subdef s + ON (r.record_id = s.record_id) + WHERE s.name IN (?) + AND r.type IN (?) + "; + + $types = array(Connection::PARAM_STR_ARRAY, Connection::PARAM_STR_ARRAY); + $params = array($subdefsName, $recordsType); + + if ($min) { + $sql .= " AND (r.record_id >= ?)"; + + $params[] = (int) $min; + $types[] = \PDO::PARAM_INT; + } + if ($max) { + $sql .= " AND (r.record_id <= ?)"; + + $params[] = (int) $max; + $types[] = \PDO::PARAM_INT; + } + + list($sql, $stmtParams) = SQLParserUtils::expandListParameters($sql, $params, $types); + + $connection = $databox->get_connection(); + $stmt = $connection->prepare($sql); + $stmt->execute($stmtParams); + $rows = $stmt->fetchAll(\PDO::FETCH_ASSOC); + + foreach ($rows as $row) { + $output->write(sprintf(' (#%s)', $row['record_id'])); + + $record = new \record_adapter($this->container, $databox->get_sbas_id(), $row['record_id']); + + $subdefs = array_filter($record->get_subdefs(), function($subdef) use ($subdefsName) { + return in_array($subdef->get_name(), $subdefsName); + }); + + foreach ($subdefs as $subdef) { + $subdef->remove_file(); + } + + $record->generate_subdefs($databox, $this->container, $subdefsName); + + $stmt->closeCursor(); + + $progress->advance(); + } + + unset($rows, $record, $stmt, $connection); + + $progress->finish(); + } +} diff --git a/lib/Alchemy/Phrasea/Command/CheckConfig.php b/lib/Alchemy/Phrasea/Command/CheckConfig.php index 71248eaa3d..28fddd376a 100644 --- a/lib/Alchemy/Phrasea/Command/CheckConfig.php +++ b/lib/Alchemy/Phrasea/Command/CheckConfig.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. diff --git a/lib/Alchemy/Phrasea/Command/Command.php b/lib/Alchemy/Phrasea/Command/Command.php index dfb11235b1..2033ee3487 100644 --- a/lib/Alchemy/Phrasea/Command/Command.php +++ b/lib/Alchemy/Phrasea/Command/Command.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. diff --git a/lib/Alchemy/Phrasea/Command/CommandInterface.php b/lib/Alchemy/Phrasea/Command/CommandInterface.php index a531d85267..ef26a78852 100644 --- a/lib/Alchemy/Phrasea/Command/CommandInterface.php +++ b/lib/Alchemy/Phrasea/Command/CommandInterface.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. diff --git a/lib/Alchemy/Phrasea/Command/Compile/Configuration.php b/lib/Alchemy/Phrasea/Command/Compile/Configuration.php index fc60d5fb09..649e16a5e4 100644 --- a/lib/Alchemy/Phrasea/Command/Compile/Configuration.php +++ b/lib/Alchemy/Phrasea/Command/Compile/Configuration.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. diff --git a/lib/Alchemy/Phrasea/Command/CreateCollection.php b/lib/Alchemy/Phrasea/Command/CreateCollection.php index d1319d9dbb..ae09507ab5 100644 --- a/lib/Alchemy/Phrasea/Command/CreateCollection.php +++ b/lib/Alchemy/Phrasea/Command/CreateCollection.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. @@ -39,8 +39,7 @@ class CreateCollection extends Command protected function doExecute(InputInterface $input, OutputInterface $output) { - $databox = $this->container['phraseanet.appbox'] - ->get_databox((int) $input->getArgument('databox_id')); + $databox = $this->container['phraseanet.appbox']->get_databox((int) $input->getArgument('databox_id')); $new_collection = \collection::create($this->container, $databox, $this->container['phraseanet.appbox'], $input->getArgument('collname')); diff --git a/lib/Alchemy/Phrasea/Command/Developer/APIRoutesDumper.php b/lib/Alchemy/Phrasea/Command/Developer/APIRoutesDumper.php index a92ed60ca7..6c1872be73 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/APIRoutesDumper.php +++ b/lib/Alchemy/Phrasea/Command/Developer/APIRoutesDumper.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. diff --git a/lib/Alchemy/Phrasea/Command/Developer/AbstractRoutesDumper.php b/lib/Alchemy/Phrasea/Command/Developer/AbstractRoutesDumper.php index 8bc224ed83..b4ab3fad17 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/AbstractRoutesDumper.php +++ b/lib/Alchemy/Phrasea/Command/Developer/AbstractRoutesDumper.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. diff --git a/lib/Alchemy/Phrasea/Command/Developer/Behat.php b/lib/Alchemy/Phrasea/Command/Developer/Behat.php index 21673083e0..bc666e762d 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/Behat.php +++ b/lib/Alchemy/Phrasea/Command/Developer/Behat.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. diff --git a/lib/Alchemy/Phrasea/Command/Developer/BowerInstall.php b/lib/Alchemy/Phrasea/Command/Developer/BowerInstall.php index f2442d4f0d..c679ad0dec 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/BowerInstall.php +++ b/lib/Alchemy/Phrasea/Command/Developer/BowerInstall.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. diff --git a/lib/Alchemy/Phrasea/Command/Developer/ComposerInstall.php b/lib/Alchemy/Phrasea/Command/Developer/ComposerInstall.php index d29fc728f2..421425e561 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/ComposerInstall.php +++ b/lib/Alchemy/Phrasea/Command/Developer/ComposerInstall.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. diff --git a/lib/Alchemy/Phrasea/Command/Developer/IniReset.php b/lib/Alchemy/Phrasea/Command/Developer/IniReset.php index 8ba98005bd..281939e600 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/IniReset.php +++ b/lib/Alchemy/Phrasea/Command/Developer/IniReset.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. diff --git a/lib/Alchemy/Phrasea/Command/Developer/InstallAll.php b/lib/Alchemy/Phrasea/Command/Developer/InstallAll.php index 1bae667c18..8fc6c3c5b1 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/InstallAll.php +++ b/lib/Alchemy/Phrasea/Command/Developer/InstallAll.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. diff --git a/lib/Alchemy/Phrasea/Command/Developer/LessCompiler.php b/lib/Alchemy/Phrasea/Command/Developer/LessCompiler.php index c2e880bd1d..07391cb9c7 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/LessCompiler.php +++ b/lib/Alchemy/Phrasea/Command/Developer/LessCompiler.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. diff --git a/lib/Alchemy/Phrasea/Command/Developer/RoutesDumper.php b/lib/Alchemy/Phrasea/Command/Developer/RoutesDumper.php index 2c26cb0d20..1523d7af60 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/RoutesDumper.php +++ b/lib/Alchemy/Phrasea/Command/Developer/RoutesDumper.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. diff --git a/lib/Alchemy/Phrasea/Command/Developer/SetupTestsDbs.php b/lib/Alchemy/Phrasea/Command/Developer/SetupTestsDbs.php index eeef2e86d5..bb0d8004ae 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/SetupTestsDbs.php +++ b/lib/Alchemy/Phrasea/Command/Developer/SetupTestsDbs.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. diff --git a/lib/Alchemy/Phrasea/Command/Developer/Uninstaller.php b/lib/Alchemy/Phrasea/Command/Developer/Uninstaller.php index 822a55908d..8f4098c4ec 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/Uninstaller.php +++ b/lib/Alchemy/Phrasea/Command/Developer/Uninstaller.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. diff --git a/lib/Alchemy/Phrasea/Command/Developer/Utils/BowerDriver.php b/lib/Alchemy/Phrasea/Command/Developer/Utils/BowerDriver.php index 6625ceb8bc..48628daee3 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/Utils/BowerDriver.php +++ b/lib/Alchemy/Phrasea/Command/Developer/Utils/BowerDriver.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. diff --git a/lib/Alchemy/Phrasea/Command/Developer/Utils/ComposerDriver.php b/lib/Alchemy/Phrasea/Command/Developer/Utils/ComposerDriver.php index 2d7a4bd5f2..572cd9f42e 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/Utils/ComposerDriver.php +++ b/lib/Alchemy/Phrasea/Command/Developer/Utils/ComposerDriver.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. diff --git a/lib/Alchemy/Phrasea/Command/Developer/Utils/RecessDriver.php b/lib/Alchemy/Phrasea/Command/Developer/Utils/RecessDriver.php index f49899f988..f4e5db4abd 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/Utils/RecessDriver.php +++ b/lib/Alchemy/Phrasea/Command/Developer/Utils/RecessDriver.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. diff --git a/lib/Alchemy/Phrasea/Command/Developer/Utils/UglifyJsDriver.php b/lib/Alchemy/Phrasea/Command/Developer/Utils/UglifyJsDriver.php index 73c93bff02..cf6a0f5b88 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/Utils/UglifyJsDriver.php +++ b/lib/Alchemy/Phrasea/Command/Developer/Utils/UglifyJsDriver.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. diff --git a/lib/Alchemy/Phrasea/Command/MailTest.php b/lib/Alchemy/Phrasea/Command/MailTest.php index ee94a4de5a..3a27989ff8 100644 --- a/lib/Alchemy/Phrasea/Command/MailTest.php +++ b/lib/Alchemy/Phrasea/Command/MailTest.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. diff --git a/lib/Alchemy/Phrasea/Command/Plugin/AbstractPluginCommand.php b/lib/Alchemy/Phrasea/Command/Plugin/AbstractPluginCommand.php index 9d3ae8e735..c12bc83ca6 100644 --- a/lib/Alchemy/Phrasea/Command/Plugin/AbstractPluginCommand.php +++ b/lib/Alchemy/Phrasea/Command/Plugin/AbstractPluginCommand.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. diff --git a/lib/Alchemy/Phrasea/Command/Plugin/AddPlugin.php b/lib/Alchemy/Phrasea/Command/Plugin/AddPlugin.php index b3da2e4604..b00dc21cf7 100644 --- a/lib/Alchemy/Phrasea/Command/Plugin/AddPlugin.php +++ b/lib/Alchemy/Phrasea/Command/Plugin/AddPlugin.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. diff --git a/lib/Alchemy/Phrasea/Command/Plugin/ListPlugin.php b/lib/Alchemy/Phrasea/Command/Plugin/ListPlugin.php index 3da4c15332..0209d76350 100644 --- a/lib/Alchemy/Phrasea/Command/Plugin/ListPlugin.php +++ b/lib/Alchemy/Phrasea/Command/Plugin/ListPlugin.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. diff --git a/lib/Alchemy/Phrasea/Command/Plugin/RemovePlugin.php b/lib/Alchemy/Phrasea/Command/Plugin/RemovePlugin.php index a40b64e27f..2c4c082c7c 100644 --- a/lib/Alchemy/Phrasea/Command/Plugin/RemovePlugin.php +++ b/lib/Alchemy/Phrasea/Command/Plugin/RemovePlugin.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. diff --git a/lib/Alchemy/Phrasea/Command/RecordAdd.php b/lib/Alchemy/Phrasea/Command/RecordAdd.php index baaa01dabb..8568e867f0 100644 --- a/lib/Alchemy/Phrasea/Command/RecordAdd.php +++ b/lib/Alchemy/Phrasea/Command/RecordAdd.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. diff --git a/lib/Alchemy/Phrasea/Command/RescanTechnicalDatas.php b/lib/Alchemy/Phrasea/Command/RescanTechnicalDatas.php index 6cfff7d3f1..d5358c314a 100644 --- a/lib/Alchemy/Phrasea/Command/RescanTechnicalDatas.php +++ b/lib/Alchemy/Phrasea/Command/RescanTechnicalDatas.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. diff --git a/lib/Alchemy/Phrasea/Command/Setup/CheckEnvironment.php b/lib/Alchemy/Phrasea/Command/Setup/CheckEnvironment.php index 70f6e10cbb..b3f58f1c96 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/CheckEnvironment.php +++ b/lib/Alchemy/Phrasea/Command/Setup/CheckEnvironment.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. diff --git a/lib/Alchemy/Phrasea/Command/Setup/CrossDomainGenerator.php b/lib/Alchemy/Phrasea/Command/Setup/CrossDomainGenerator.php index 636824f1a9..e0517f3db8 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/CrossDomainGenerator.php +++ b/lib/Alchemy/Phrasea/Command/Setup/CrossDomainGenerator.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. diff --git a/lib/Alchemy/Phrasea/Command/Setup/H264ConfigurationDumper.php b/lib/Alchemy/Phrasea/Command/Setup/H264ConfigurationDumper.php index 103efb04f4..f056ed386d 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/H264ConfigurationDumper.php +++ b/lib/Alchemy/Phrasea/Command/Setup/H264ConfigurationDumper.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. diff --git a/lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php b/lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php index 72eaf25eee..1ea4208acf 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php +++ b/lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.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. diff --git a/lib/Alchemy/Phrasea/Command/Setup/Install.php b/lib/Alchemy/Phrasea/Command/Setup/Install.php index bd637738ca..c0d2cb86a1 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/Install.php +++ b/lib/Alchemy/Phrasea/Command/Setup/Install.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. @@ -93,6 +93,11 @@ class Install extends Command } $abConn = $this->getABConn($input, $output, $dialog); + + if (false === $abConn->supportInnoDB()){ + throw new \Exception('Database server does not support InnoDB storage engine'); + } + list($dbConn, $template) = $this->getDBConn($input, $output, $abConn, $dialog); list($email, $password) = $this->getCredentials($input, $output, $dialog); $dataPath = $this->getDataPath($input, $output, $dialog); diff --git a/lib/Alchemy/Phrasea/Command/Setup/PluginsReset.php b/lib/Alchemy/Phrasea/Command/Setup/PluginsReset.php index ee9aa660f8..eea940fba9 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/PluginsReset.php +++ b/lib/Alchemy/Phrasea/Command/Setup/PluginsReset.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. diff --git a/lib/Alchemy/Phrasea/Command/Setup/StaticConfigurationDumper.php b/lib/Alchemy/Phrasea/Command/Setup/StaticConfigurationDumper.php index 7b600a4836..de5b0bffca 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/StaticConfigurationDumper.php +++ b/lib/Alchemy/Phrasea/Command/Setup/StaticConfigurationDumper.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. diff --git a/lib/Alchemy/Phrasea/Command/Setup/StaticMappingGenerator.php b/lib/Alchemy/Phrasea/Command/Setup/StaticMappingGenerator.php index 1ecaff8592..c09b1a3e33 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/StaticMappingGenerator.php +++ b/lib/Alchemy/Phrasea/Command/Setup/StaticMappingGenerator.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. diff --git a/lib/Alchemy/Phrasea/Command/Setup/XSendFileConfigurationDumper.php b/lib/Alchemy/Phrasea/Command/Setup/XSendFileConfigurationDumper.php index ec20cfe039..ffa248c863 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/XSendFileConfigurationDumper.php +++ b/lib/Alchemy/Phrasea/Command/Setup/XSendFileConfigurationDumper.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. diff --git a/lib/Alchemy/Phrasea/Command/Setup/XSendFileMappingGenerator.php b/lib/Alchemy/Phrasea/Command/Setup/XSendFileMappingGenerator.php index ad34b56844..ff853e8093 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/XSendFileMappingGenerator.php +++ b/lib/Alchemy/Phrasea/Command/Setup/XSendFileMappingGenerator.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. diff --git a/lib/Alchemy/Phrasea/Command/Upgrade/DatasUpgraderInterface.php b/lib/Alchemy/Phrasea/Command/Upgrade/DatasUpgraderInterface.php index a35c511866..87f4714676 100644 --- a/lib/Alchemy/Phrasea/Command/Upgrade/DatasUpgraderInterface.php +++ b/lib/Alchemy/Phrasea/Command/Upgrade/DatasUpgraderInterface.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. diff --git a/lib/Alchemy/Phrasea/Command/Upgrade/Step31.php b/lib/Alchemy/Phrasea/Command/Upgrade/Step31.php index 4d0768e978..1b0132908b 100644 --- a/lib/Alchemy/Phrasea/Command/Upgrade/Step31.php +++ b/lib/Alchemy/Phrasea/Command/Upgrade/Step31.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. diff --git a/lib/Alchemy/Phrasea/Command/Upgrade/Step35.php b/lib/Alchemy/Phrasea/Command/Upgrade/Step35.php index 2c59a141ff..177c6861dc 100644 --- a/lib/Alchemy/Phrasea/Command/Upgrade/Step35.php +++ b/lib/Alchemy/Phrasea/Command/Upgrade/Step35.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. diff --git a/lib/Alchemy/Phrasea/Command/UpgradeDBDatas.php b/lib/Alchemy/Phrasea/Command/UpgradeDBDatas.php index 8944acbb5a..1d82c8f7cb 100644 --- a/lib/Alchemy/Phrasea/Command/UpgradeDBDatas.php +++ b/lib/Alchemy/Phrasea/Command/UpgradeDBDatas.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. diff --git a/lib/Alchemy/Phrasea/Controller/AbstractDelivery.php b/lib/Alchemy/Phrasea/Controller/AbstractDelivery.php index 0aca13a724..b2dcf1ea25 100644 --- a/lib/Alchemy/Phrasea/Controller/AbstractDelivery.php +++ b/lib/Alchemy/Phrasea/Controller/AbstractDelivery.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. diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Collection.php b/lib/Alchemy/Phrasea/Controller/Admin/Collection.php index 1e937d8c7e..bf146ef46b 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Collection.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Collection.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. @@ -105,15 +105,6 @@ class Collection implements ControllerProviderInterface $controllers->post('/{bas_id}/picture/stamp-logo/delete/', 'controller.admin.collection:deleteStamp') ->assert('bas_id', '\d+') ->bind('admin_collection_delete_stamp'); - - $controllers->post('/{bas_id}/picture/banner/', 'controller.admin.collection:setBanner') - ->assert('bas_id', '\d+') - ->bind('admin_collection_submit_banner'); - - $controllers->post('/{bas_id}/picture/banner/delete/', 'controller.admin.collection:deleteBanner') - ->assert('bas_id', '\d+') - ->bind('admin_collection_delete_banner'); - $controllers->get('/{bas_id}/informations/details/', 'controller.admin.collection:getDetails') ->assert('bas_id', '\d+') ->bind('admin_collection_display_document_details'); @@ -267,41 +258,6 @@ class Collection implements ControllerProviderInterface ]); } - /** - * Delete the collection banner - * - * @param Application $app The silex application - * @param Request $request The current request - * @param integer $bas_id The collection base_id - * @return JsonResponse|RedirectResponse - */ - public function deleteBanner(Application $app, Request $request, $bas_id) - { - $success = false; - - $collection = \collection::get_from_base_id($app, $bas_id); - - try { - $app['phraseanet.appbox']->write_collection_pic($app['media-alchemyst'], $app['filesystem'], $collection, null, \collection::PIC_PRESENTATION); - $success = true; - } catch (\Exception $e) { - - } - - if ('json' === $app['request']->getRequestFormat()) { - return $app->json([ - 'success' => $success, - 'msg' => $success ? $app->trans('Successful removal') : $app->trans('An error occured'), - 'bas_id' => $collection->get_base_id() - ]); - } - - return $app->redirectPath('admin_display_collection', [ - 'bas_id' => $collection->get_base_id(), - 'success' => (int) $success, - ]); - } - /** * Delete the collection stamp * @@ -408,56 +364,6 @@ class Collection implements ControllerProviderInterface ]); } - /** - * Set a collection banner - * - * @param Application $app The silex application - * @param Request $request The current request - * @param integer $bas_id The collection base_id - * @return RedirectResponse - */ - public function setBanner(Application $app, Request $request, $bas_id) - { - if (null === $file = $request->files->get('newBanner')) { - $app->abort(400); - } - - if ($file->getClientSize() > 1024 * 1024) { - return $app->redirectPath('admin_display_collection', [ - 'bas_id' => $bas_id, - 'success' => 0, - 'error' => 'file-too-big', - ]); - } - - if (!$file->isValid()) { - return $app->redirectPath('admin_display_collection', [ - 'bas_id' => $bas_id, - 'success' => 0, - 'error' => 'file-invalid', - ]); - } - - $collection = \collection::get_from_base_id($app, $bas_id); - - try { - $app['phraseanet.appbox']->write_collection_pic($app['media-alchemyst'], $app['filesystem'], $collection, $file, \collection::PIC_PRESENTATION); - - $app['filesystem']->remove($file->getPathname()); - } catch (\Exception $e) { - return $app->redirectPath('admin_display_collection', [ - 'bas_id' => $bas_id, - 'success' => 0, - 'error' => 'file-error', - ]); - } - - return $app->redirectPath('admin_display_collection', [ - 'bas_id' => $bas_id, - 'success' => 1, - ]); - } - /** * Set a collection stamp * diff --git a/lib/Alchemy/Phrasea/Controller/Admin/ConnectedUsers.php b/lib/Alchemy/Phrasea/Controller/Admin/ConnectedUsers.php index 172acc8978..26895f20ec 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/ConnectedUsers.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/ConnectedUsers.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. diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Dashboard.php b/lib/Alchemy/Phrasea/Controller/Admin/Dashboard.php index cb604fa485..4f21177602 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Dashboard.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Dashboard.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. diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Databox.php b/lib/Alchemy/Phrasea/Controller/Admin/Databox.php index ba023ed57c..ba22d5ed23 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Databox.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/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. diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php b/lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php index 004ef96117..272af4cbb0 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Databoxes.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. @@ -115,6 +115,9 @@ class Databoxes implements ControllerProviderInterface case 'mount-failed' : $errorMsg = $app->trans('Database could not be mounted'); break; + case 'innodb-support' : + $errorMsg = _('Database server does not support InnoDB storage engine'); + break; } return $app['twig']->render('admin/databases.html.twig', [ @@ -167,6 +170,10 @@ class Databoxes implements ControllerProviderInterface return $app->redirectPath('admin_databases', ['success' => 0, 'error' => 'database-failed']); } + if (false === $connbas->supportInnoDB()){ + return $app->redirectPath('admin_databases', array('success' => 0, 'error' => 'innodb-support')); + } + try { $base = \databox::create($app, $connbas, $dataTemplate); $base->registerAdmin($app['authentication']->getUser()); diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Fields.php b/lib/Alchemy/Phrasea/Controller/Admin/Fields.php index 015dd54d8d..bbbbf967fb 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Fields.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Fields.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. diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php index 5cbe535ccd..0dfd9fdb69 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.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. diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Root.php b/lib/Alchemy/Phrasea/Controller/Admin/Root.php index 8379fca5cd..3fafa26859 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Root.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. diff --git a/lib/Alchemy/Phrasea/Controller/Admin/SearchEngine.php b/lib/Alchemy/Phrasea/Controller/Admin/SearchEngine.php index 92fc1bee12..45530d43fd 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/SearchEngine.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/SearchEngine.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. diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Setup.php b/lib/Alchemy/Phrasea/Controller/Admin/Setup.php index 15fdbf51df..42196b81f9 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Setup.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Setup.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. diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Subdefs.php b/lib/Alchemy/Phrasea/Controller/Admin/Subdefs.php index 587cf3dcb0..1476378348 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Subdefs.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Subdefs.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. diff --git a/lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php b/lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php index 0ed3fe795a..110a8058b7 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/TaskManager.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. diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Users.php b/lib/Alchemy/Phrasea/Controller/Admin/Users.php index fd5fc8a565..d4ae6cf05d 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Users.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Users.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. diff --git a/lib/Alchemy/Phrasea/Controller/Api/Oauth2.php b/lib/Alchemy/Phrasea/Controller/Api/Oauth2.php index f2bb6494a3..f212ea76b5 100644 --- a/lib/Alchemy/Phrasea/Controller/Api/Oauth2.php +++ b/lib/Alchemy/Phrasea/Controller/Api/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. diff --git a/lib/Alchemy/Phrasea/Controller/Api/V1.php b/lib/Alchemy/Phrasea/Controller/Api/V1.php index 407751f0a4..6478ac8d1b 100644 --- a/lib/Alchemy/Phrasea/Controller/Api/V1.php +++ b/lib/Alchemy/Phrasea/Controller/Api/V1.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. @@ -116,6 +116,8 @@ class V1 implements ControllerProviderInterface $controllers->post('/records/add/', 'controller.api.v1:add_record'); + $controllers->post('/embed/substitute/', 'controller.api.v1:substitute'); + $controllers->match('/search/', 'controller.api.v1:search'); $controllers->match('/records/search/', 'controller.api.v1:search_records'); @@ -198,6 +200,7 @@ class V1 implements ControllerProviderInterface $controllers->get('/me/', 'controller.api.v1:get_current_user'); + return $controllers; } @@ -570,6 +573,49 @@ class V1 implements ControllerProviderInterface return Result::create($request, $ret)->createResponse(); } + + public function substitute(Application $app, Request $request) + { + $ret = array(); + + if (count($request->files->get('file')) == 0) { + throw new API_V1_exception_badrequest('Missing file parameter'); + } + if (!$request->files->get('file') instanceof Symfony\Component\HttpFoundation\File\UploadedFile) { + throw new API_V1_exception_badrequest('You can upload one file at time'); + } + $file = $request->files->get('file'); + // @var $file Symfony\Component\HttpFoundation\File\UploadedFile + if (!$file->isValid()) { + throw new API_V1_exception_badrequest('Datas corrupted, please try again'); + } + if (!$request->get('databox_id')) { + throw new API_V1_exception_badrequest('Missing databox_id parameter'); + } + if (!$request->get('record_id')) { + throw new API_V1_exception_badrequest('Missing record_id parameter'); + } + if (!$request->get('name')) { + throw new API_V1_exception_badrequest('Missing name parameter'); + } + $media = $app['mediavorus']->guess($file->getPathname()); + // @var $record \record_adapter + $record = $this->app['phraseanet.appbox']->get_databox($request->get('databox_id'))->get_record($request->get('record_id')); + $base_id = $record->get_base_id(); + $collection = \collection::get_from_base_id($this->app, $base_id); + if (!$app['authentication']->getUser()->ACL()->has_right_on_base($base_id, 'canaddrecord')) { + throw new API_V1_exception_forbidden(sprintf('You do not have access to collection %s', $collection->get_label($this->app['locale.I18n']))); + } + $record->substitute_subdef($request->get('name'), $media, $app); + foreach ($record->get_embedable_medias() as $name => $media) { + if ($name == $request->get('name') && + null !== ($subdef = $this->list_embedable_media($record, $media, $this->app['phraseanet.registry']))) { + $ret[] = $subdef; + } + } + + return Result::create($request, $ret)->createResponse(); + } public function list_quarantine(Application $app, Request $request) { diff --git a/lib/Alchemy/Phrasea/Controller/Client/Baskets.php b/lib/Alchemy/Phrasea/Controller/Client/Baskets.php index 811f1b7af3..b27e7beca3 100644 --- a/lib/Alchemy/Phrasea/Controller/Client/Baskets.php +++ b/lib/Alchemy/Phrasea/Controller/Client/Baskets.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. diff --git a/lib/Alchemy/Phrasea/Controller/Client/Root.php b/lib/Alchemy/Phrasea/Controller/Client/Root.php index 5e9372b813..039da3711b 100644 --- a/lib/Alchemy/Phrasea/Controller/Client/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Client/Root.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. @@ -30,6 +30,17 @@ class Root implements ControllerProviderInterface $controllers = $app['controllers_factory']; $controllers->before(function (Request $request) use ($app) { + /** + * /!\/!\/!\/!\/!\/!\/!\/!\/!\ + * + * Client is not longer used + * + * Redirect to production with a nice message + */ + $app['session']->getFlashBag()->add('client_deprecated', ''); + + return $app->redirectPath('prod'); + if (!$app['authentication']->isAuthenticated() && null !== $request->query->get('nolog')) { return $app->redirectPath('login_authenticate_as_guest', ['redirect' => 'client']); } diff --git a/lib/Alchemy/Phrasea/Controller/Datafiles.php b/lib/Alchemy/Phrasea/Controller/Datafiles.php index 52e6722296..a7a03906a7 100644 --- a/lib/Alchemy/Phrasea/Controller/Datafiles.php +++ b/lib/Alchemy/Phrasea/Controller/Datafiles.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. diff --git a/lib/Alchemy/Phrasea/Controller/Exception.php b/lib/Alchemy/Phrasea/Controller/Exception.php index 3d9e32b13d..e2f75e8660 100644 --- a/lib/Alchemy/Phrasea/Controller/Exception.php +++ b/lib/Alchemy/Phrasea/Controller/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. diff --git a/lib/Alchemy/Phrasea/Controller/Lightbox.php b/lib/Alchemy/Phrasea/Controller/Lightbox.php index fff5578a9b..46ec938777 100644 --- a/lib/Alchemy/Phrasea/Controller/Lightbox.php +++ b/lib/Alchemy/Phrasea/Controller/Lightbox.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. diff --git a/lib/Alchemy/Phrasea/Controller/Minifier.php b/lib/Alchemy/Phrasea/Controller/Minifier.php index ba17e24f45..fe471634c1 100644 --- a/lib/Alchemy/Phrasea/Controller/Minifier.php +++ b/lib/Alchemy/Phrasea/Controller/Minifier.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. diff --git a/lib/Alchemy/Phrasea/Controller/Permalink.php b/lib/Alchemy/Phrasea/Controller/Permalink.php index 3fff663b2b..f86a45196b 100644 --- a/lib/Alchemy/Phrasea/Controller/Permalink.php +++ b/lib/Alchemy/Phrasea/Controller/Permalink.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php b/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php index d57f902db3..8cd68f601c 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Bridge.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php b/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php index 6f9cc96a29..0a27c7df78 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Download.php b/lib/Alchemy/Phrasea/Controller/Prod/Download.php index a8c0fff73b..65a03e26ce 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Download.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Download.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Edit.php b/lib/Alchemy/Phrasea/Controller/Prod/Edit.php index 0abdc3f525..230f067e66 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Edit.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Edit.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Export.php b/lib/Alchemy/Phrasea/Controller/Prod/Export.php index f2b41ab2a5..67a8b7150d 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Export.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Export.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. @@ -91,6 +91,8 @@ class Export implements ControllerProviderInterface } $success = false; + $msg = _('Error while connecting to FTP'); + try { $ftpClient = $app['phraseanet.ftp.client']($request->request->get('address', ''), 21, 90, !!$request->request->get('ssl')); $ftpClient->login($request->request->get('login', 'anonymous'), $request->request->get('password', 'anonymous')); @@ -98,7 +100,6 @@ class Export implements ControllerProviderInterface $msg = $app->trans('Connection to FTP succeed'); $success = true; } catch (\Exception $e) { - $msg = $app->trans('Error while connecting to FTP'); } return $app->json([ diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index 9b1025c125..024bfeb4e9 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Language.php b/lib/Alchemy/Phrasea/Controller/Prod/Language.php index 0700729108..ae9572e469 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Language.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Language.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php b/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php index 65470ca0a3..6bd8bc09de 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/MoveCollection.php b/lib/Alchemy/Phrasea/Controller/Prod/MoveCollection.php index 69eea98c43..feded8b21c 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/MoveCollection.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/MoveCollection.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Order.php b/lib/Alchemy/Phrasea/Controller/Prod/Order.php index 27dafc0a25..7b72e1ba1c 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Order.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Order.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Printer.php b/lib/Alchemy/Phrasea/Controller/Prod/Printer.php index 2806ecfa64..4fcecaab27 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Printer.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Printer.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Property.php b/lib/Alchemy/Phrasea/Controller/Prod/Property.php index fde68a2d82..0e7ac9d082 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Property.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Property.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. @@ -194,16 +194,23 @@ class Property implements ControllerProviderInterface { $typeLst = $request->request->get('types', []); $records = RecordsRequest::fromRequest($app, $request, false, ['canmodifrecord']); + $mimeLst = $request->request->get('mimes', []); $forceType = $request->request->get('force_types', ''); $updated = []; foreach ($records as $record) { try { $recordType = !empty($forceType) ? $forceType : (isset($typeLst[$record->get_serialize_key()]) ? $typeLst[$record->get_serialize_key()] : null); + $mimeType = isset($mimeLst[$record->get_serialize_key()]) ? $mimeLst[$record->get_serialize_key()] : null; if ($recordType) { $record->set_type($recordType); - $updated[$record->get_serialize_key()] = $recordType; + $updated[$record->get_serialize_key()]['record_type'] = $recordType; + } + + if ($mimeType) { + $record->set_mime($mimeType); + $updated[$record->get_serialize_key()]['mime_type'] = $mimeType; } } catch (\Exception $e) { diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Push.php b/lib/Alchemy/Phrasea/Controller/Prod/Push.php index d27add32cb..cadfeff628 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Push.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Push.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Query.php b/lib/Alchemy/Phrasea/Controller/Prod/Query.php index b973b411db..09ad33fb7e 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Query.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Records.php b/lib/Alchemy/Phrasea/Controller/Prod/Records.php index 40b02a4ecb..5ae809ebff 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Records.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Records.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. @@ -135,7 +135,9 @@ class Records implements ControllerProviderInterface 'record' => $record ]), "pos" => $record->get_number(), - "title" => str_replace(['[[em]]', '[[/em]]'], ['', ''], $record->get_title($query, $searchEngine)) + "title" => str_replace(array('[[em]]', '[[/em]]'), array('', ''), $record->get_title($query, $searchEngine)), + "collection_name" => $record->get_collection()->get_name(), + "collection_logo" => $record->get_collection()->getLogo($record->get_base_id(), $app) ]); } diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Root.php b/lib/Alchemy/Phrasea/Controller/Prod/Root.php index d91ba571dc..2475ed1d48 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Root.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Share.php b/lib/Alchemy/Phrasea/Controller/Prod/Share.php index 01dc12cd2f..d28213aab2 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Share.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Share.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Story.php b/lib/Alchemy/Phrasea/Controller/Prod/Story.php index 8070806b23..ae05ae729c 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Story.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Story.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/TOU.php b/lib/Alchemy/Phrasea/Controller/Prod/TOU.php index 35e3c6081c..b784ab0006 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/TOU.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/TOU.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Tools.php b/lib/Alchemy/Phrasea/Controller/Prod/Tools.php index 3252a9f382..1fc478e435 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Tools.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Tools.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. @@ -87,10 +87,11 @@ class Tools implements ControllerProviderInterface $controllers->post('/image/', function (Application $app, Request $request) { $return = ['success' => true]; - $selection = RecordsRequest::fromRequest($app, $request, false, ['canmodifrecord']); + $force = $request->request->get('force_substitution') == '1'; + + $selection = RecordsRequest::fromRequest($app, $request, false, array('canmodifrecord')); foreach ($selection as $record) { - $substituted = false; foreach ($record->get_subdefs() as $subdef) { if ($subdef->is_substituted()) { @@ -99,11 +100,12 @@ class Tools implements ControllerProviderInterface } } - if (!$substituted || $request->request->get('ForceThumbSubstit') == '1') { + if (!$substituted || $force) { $record->rebuild_subdefs(); } } + return $app->json($return); })->bind('prod_tools_image'); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php b/lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php index f4e983d132..45f98c337f 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Tooltip.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Upload.php b/lib/Alchemy/Phrasea/Controller/Prod/Upload.php index 641eb47e55..222da5c3d9 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Upload.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Upload.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. @@ -51,6 +51,8 @@ class Upload implements ControllerProviderInterface $controllers->get('/flash-version/', 'controller.prod.upload:getFlashUploadForm') ->bind('upload_flash_form'); + $controllers->get('/html5-version/', $this->call('getHtml5UploadForm')) + ->bind('upload_html5_form'); $controllers->post('/', 'controller.prod.upload:upload') ->bind('upload'); @@ -71,12 +73,25 @@ class Upload implements ControllerProviderInterface $maxFileSize = $this->getUploadMaxFileSize(); return $app['twig']->render( - 'prod/upload/upload-flash.html.twig', [ - 'sessionId' => session_id(), - 'collections' => $this->getGrantedCollections($app['acl']->get($app['authentication']->getUser())), - 'maxFileSize' => $maxFileSize, - 'maxFileSizeReadable' => \p4string::format_octets($maxFileSize) - ]); + 'prod/upload/upload-flash.html.twig', array( + 'sessionId' => session_id(), + 'collections' => $this->getGrantedCollections($app['authentication']->getUser()), + 'maxFileSize' => $maxFileSize, + 'maxFileSizeReadable' => \p4string::format_octets($maxFileSize) + )); + } + + public function getHtml5UploadForm(Application $app, Request $request) + { + $maxFileSize = $this->getUploadMaxFileSize(); + + return $app['twig']->render( + 'prod/upload/upload.html.twig', array( + 'sessionId' => session_id(), + 'collections' => $this->getGrantedCollections($app['authentication']->getUser()), + 'maxFileSize' => $maxFileSize, + 'maxFileSizeReadable' => \p4string::format_octets($maxFileSize) + )); } /** diff --git a/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php b/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php index a82626d46a..30a88815ab 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.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. diff --git a/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php b/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php index 2b2f404089..ac6b7881fd 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.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. diff --git a/lib/Alchemy/Phrasea/Controller/RecordsRequest.php b/lib/Alchemy/Phrasea/Controller/RecordsRequest.php index 347a6e73f9..1386fd437c 100644 --- a/lib/Alchemy/Phrasea/Controller/RecordsRequest.php +++ b/lib/Alchemy/Phrasea/Controller/RecordsRequest.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. diff --git a/lib/Alchemy/Phrasea/Controller/Report/Activity.php b/lib/Alchemy/Phrasea/Controller/Report/Activity.php index 961db4fd71..4f4866b071 100644 --- a/lib/Alchemy/Phrasea/Controller/Report/Activity.php +++ b/lib/Alchemy/Phrasea/Controller/Report/Activity.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. diff --git a/lib/Alchemy/Phrasea/Controller/Report/Informations.php b/lib/Alchemy/Phrasea/Controller/Report/Informations.php index 9dd99d5596..3028f4b632 100644 --- a/lib/Alchemy/Phrasea/Controller/Report/Informations.php +++ b/lib/Alchemy/Phrasea/Controller/Report/Informations.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. diff --git a/lib/Alchemy/Phrasea/Controller/Report/Root.php b/lib/Alchemy/Phrasea/Controller/Report/Root.php index c45b83b501..c78740f400 100644 --- a/lib/Alchemy/Phrasea/Controller/Report/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Report/Root.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. diff --git a/lib/Alchemy/Phrasea/Controller/Root/Account.php b/lib/Alchemy/Phrasea/Controller/Root/Account.php index 09e40d5ab1..253ef8639a 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Account.php +++ b/lib/Alchemy/Phrasea/Controller/Root/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. diff --git a/lib/Alchemy/Phrasea/Controller/Root/Developers.php b/lib/Alchemy/Phrasea/Controller/Root/Developers.php index 2ef31ce6ce..802161cc9d 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Developers.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Developers.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. diff --git a/lib/Alchemy/Phrasea/Controller/Root/Login.php b/lib/Alchemy/Phrasea/Controller/Root/Login.php index 739cebfeeb..abad60a997 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Login.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Login.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. @@ -623,6 +623,7 @@ class Login implements ControllerProviderInterface $mail = MailRequestPasswordUpdate::create($app, $receiver); $mail->setLogin($user->getLogin()); $mail->setButtonUrl($url); + $mail->setExpiration($expirationDate); $app['notification.deliverer']->deliver($mail); $app->addFlash('info', $app->trans('phraseanet:: Un email vient de vous etre envoye')); diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php index 9465b4f45d..2e8ff489c2 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php +++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.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. diff --git a/lib/Alchemy/Phrasea/Controller/Root/Root.php b/lib/Alchemy/Phrasea/Controller/Root/Root.php index a20a297c7e..15966e7b11 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Root.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. diff --git a/lib/Alchemy/Phrasea/Controller/Root/Session.php b/lib/Alchemy/Phrasea/Controller/Root/Session.php index 7819216fa2..12984b169d 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Session.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Session.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. diff --git a/lib/Alchemy/Phrasea/Controller/Setup.php b/lib/Alchemy/Phrasea/Controller/Setup.php index d795316cdf..faa4fe177d 100644 --- a/lib/Alchemy/Phrasea/Controller/Setup.php +++ b/lib/Alchemy/Phrasea/Controller/Setup.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. diff --git a/lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php b/lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php index 9d4d6cdceb..0c57ad4898 100644 --- a/lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php +++ b/lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.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. @@ -43,10 +43,8 @@ class Thesaurus implements ControllerProviderInterface $controllers->match('linkfield2.php', 'controller.thesaurus:linkFieldStep2'); $controllers->match('linkfield3.php', 'controller.thesaurus:linkFieldStep3'); $controllers->match('loadth.php', 'controller.thesaurus:loadThesaurus')->bind('thesaurus_loadth'); - $controllers->match('newsy_dlg.php', 'controller.thesaurus:newSynonymDialog'); $controllers->match('newterm.php', 'controller.thesaurus:newTerm'); $controllers->match('properties.php', 'controller.thesaurus:properties'); - $controllers->match('search.php', 'controller.thesaurus:search'); $controllers->match('thesaurus.php', 'controller.thesaurus:thesaurus')->bind('thesaurus_thesaurus'); $controllers->match('xmlhttp/accept.x.php', 'controller.thesaurus:acceptXml'); @@ -1117,23 +1115,6 @@ class Thesaurus implements ControllerProviderInterface ]); } - public function newSynonymDialog(Application $app, Request $request) - { - $languages = []; - - foreach ($app['locales.available'] as $lng_code => $lng) { - $lng_code = explode('_', $lng_code); - $languages[$lng_code[0]] = $lng; - } - - return $app['twig']->render('thesaurus/new-synonym-dialog.html.twig', [ - 'piv' => $request->get('piv'), - 'typ' => $request->get('typ'), - 'languages' => $languages, - ]); - } - - public function newTerm(Application $app, Request $request) { list($term, $context) = $this->splitTermAndContext($request->get("t")); @@ -1216,11 +1197,6 @@ class Thesaurus implements ControllerProviderInterface ]); } - public function search(Application $app, Request $request) - { - return $app['twig']->render('thesaurus/search.html.twig'); - } - public function thesaurus(Application $app, Request $request) { $flags = $jsFlags = []; diff --git a/lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php b/lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php index a732ccdd6a..1b5055b716 100644 --- a/lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php +++ b/lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.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. diff --git a/lib/Alchemy/Phrasea/Controller/User/Notifications.php b/lib/Alchemy/Phrasea/Controller/User/Notifications.php index 88a56334a0..d13c0b52da 100644 --- a/lib/Alchemy/Phrasea/Controller/User/Notifications.php +++ b/lib/Alchemy/Phrasea/Controller/User/Notifications.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. diff --git a/lib/Alchemy/Phrasea/Controller/User/Preferences.php b/lib/Alchemy/Phrasea/Controller/User/Preferences.php index e0280822f8..a642cc8376 100644 --- a/lib/Alchemy/Phrasea/Controller/User/Preferences.php +++ b/lib/Alchemy/Phrasea/Controller/User/Preferences.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. diff --git a/lib/Alchemy/Phrasea/Core/CLIProvider/CLIDriversServiceProvider.php b/lib/Alchemy/Phrasea/Core/CLIProvider/CLIDriversServiceProvider.php index a1c149c31c..9f9c4a331c 100644 --- a/lib/Alchemy/Phrasea/Core/CLIProvider/CLIDriversServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/CLIProvider/CLIDriversServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/CLIProvider/ComposerSetupServiceProvider.php b/lib/Alchemy/Phrasea/Core/CLIProvider/ComposerSetupServiceProvider.php index 3072ec1310..86e75f983e 100644 --- a/lib/Alchemy/Phrasea/Core/CLIProvider/ComposerSetupServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/CLIProvider/ComposerSetupServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php b/lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php index 50dfb22149..88696f0ccf 100644 --- a/lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/CLIProvider/PluginServiceProvider.php b/lib/Alchemy/Phrasea/Core/CLIProvider/PluginServiceProvider.php index 7d505c4c3d..6ef2d6c997 100644 --- a/lib/Alchemy/Phrasea/Core/CLIProvider/PluginServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/CLIProvider/PluginServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Configuration/Compiler.php b/lib/Alchemy/Phrasea/Core/Configuration/Compiler.php index 7987efcf2b..dafb988f1c 100644 --- a/lib/Alchemy/Phrasea/Core/Configuration/Compiler.php +++ b/lib/Alchemy/Phrasea/Core/Configuration/Compiler.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. diff --git a/lib/Alchemy/Phrasea/Core/Configuration/Configuration.php b/lib/Alchemy/Phrasea/Core/Configuration/Configuration.php index 48c59b0551..d426695e82 100644 --- a/lib/Alchemy/Phrasea/Core/Configuration/Configuration.php +++ b/lib/Alchemy/Phrasea/Core/Configuration/Configuration.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. diff --git a/lib/Alchemy/Phrasea/Core/Configuration/ConfigurationInterface.php b/lib/Alchemy/Phrasea/Core/Configuration/ConfigurationInterface.php index fa769fdc9c..15a709b5ae 100644 --- a/lib/Alchemy/Phrasea/Core/Configuration/ConfigurationInterface.php +++ b/lib/Alchemy/Phrasea/Core/Configuration/ConfigurationInterface.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/ApiOAuth2EndEvent.php b/lib/Alchemy/Phrasea/Core/Event/ApiOAuth2EndEvent.php index 6e353d228c..40f2bd6146 100644 --- a/lib/Alchemy/Phrasea/Core/Event/ApiOAuth2EndEvent.php +++ b/lib/Alchemy/Phrasea/Core/Event/ApiOAuth2EndEvent.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/ApiOAuth2StartEvent.php b/lib/Alchemy/Phrasea/Core/Event/ApiOAuth2StartEvent.php index 421547c386..db5c80a3e1 100644 --- a/lib/Alchemy/Phrasea/Core/Event/ApiOAuth2StartEvent.php +++ b/lib/Alchemy/Phrasea/Core/Event/ApiOAuth2StartEvent.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/ApiResultEvent.php b/lib/Alchemy/Phrasea/Core/Event/ApiResultEvent.php index ac712ea0f3..f253ac1b06 100644 --- a/lib/Alchemy/Phrasea/Core/Event/ApiResultEvent.php +++ b/lib/Alchemy/Phrasea/Core/Event/ApiResultEvent.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/CollectionCreateEvent.php b/lib/Alchemy/Phrasea/Core/Event/CollectionCreateEvent.php index 1f81b848ca..53c9bf2f04 100644 --- a/lib/Alchemy/Phrasea/Core/Event/CollectionCreateEvent.php +++ b/lib/Alchemy/Phrasea/Core/Event/CollectionCreateEvent.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/LogoutEvent.php b/lib/Alchemy/Phrasea/Core/Event/LogoutEvent.php index 16c0d2d920..1ecef92341 100644 --- a/lib/Alchemy/Phrasea/Core/Event/LogoutEvent.php +++ b/lib/Alchemy/Phrasea/Core/Event/LogoutEvent.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/PostAuthenticate.php b/lib/Alchemy/Phrasea/Core/Event/PostAuthenticate.php index 589cc62025..46fc84fd14 100644 --- a/lib/Alchemy/Phrasea/Core/Event/PostAuthenticate.php +++ b/lib/Alchemy/Phrasea/Core/Event/PostAuthenticate.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/PreAuthenticate.php b/lib/Alchemy/Phrasea/Core/Event/PreAuthenticate.php index e85187394f..8ee97eec7d 100644 --- a/lib/Alchemy/Phrasea/Core/Event/PreAuthenticate.php +++ b/lib/Alchemy/Phrasea/Core/Event/PreAuthenticate.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/RecordEdit.php b/lib/Alchemy/Phrasea/Core/Event/RecordEdit.php index f26254c99e..ddc63c905c 100644 --- a/lib/Alchemy/Phrasea/Core/Event/RecordEdit.php +++ b/lib/Alchemy/Phrasea/Core/Event/RecordEdit.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiCorsSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiCorsSubscriber.php index c172607f69..92d0567d73 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiCorsSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiCorsSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiExceptionHandlerSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiExceptionHandlerSubscriber.php index fc7bf099f6..a146edee82 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiExceptionHandlerSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiExceptionHandlerSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiOauth2ErrorsSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiOauth2ErrorsSubscriber.php index 4d3b23553a..bff0cad60f 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiOauth2ErrorsSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiOauth2ErrorsSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/BridgeExceptionSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/BridgeExceptionSubscriber.php index 7adea8158f..8ac3c62b1d 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/BridgeExceptionSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/BridgeExceptionSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/ContentNegotiationSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/ContentNegotiationSubscriber.php index 9769e71571..305fe27ddb 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/ContentNegotiationSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/ContentNegotiationSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/CookiesDisablerSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/CookiesDisablerSubscriber.php index 65709b032f..6245e53085 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/CookiesDisablerSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/CookiesDisablerSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/DebuggerSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/DebuggerSubscriber.php index 256479bfb3..b1425c2484 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/DebuggerSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/DebuggerSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/FirewallSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/FirewallSubscriber.php index a3dd0b7586..11ef14a195 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/FirewallSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/FirewallSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/JsonRequestSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/JsonRequestSubscriber.php index 540c53e957..ad8f58c540 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/JsonRequestSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/JsonRequestSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/LogoutSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/LogoutSubscriber.php index 4724020b25..ae3e63062c 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/LogoutSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/LogoutSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/MaintenanceSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/MaintenanceSubscriber.php index f2034c84a3..daabc5620a 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/MaintenanceSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/MaintenanceSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/PersistentCookieSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/PersistentCookieSubscriber.php index df37817ec8..83bd1070e3 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/PersistentCookieSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/PersistentCookieSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/PhraseaExceptionHandlerSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/PhraseaExceptionHandlerSubscriber.php index 8a69018b99..dbf2fe2782 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/PhraseaExceptionHandlerSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/PhraseaExceptionHandlerSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/PhraseaLocaleSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/PhraseaLocaleSubscriber.php index efadff7a38..0382763be2 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/PhraseaLocaleSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/PhraseaLocaleSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/RecordEditSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/RecordEditSubscriber.php index 70614f8f54..be89f0349e 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/RecordEditSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/RecordEditSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/SessionManagerSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/SessionManagerSubscriber.php index a101810ce8..f9ef82e092 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/SessionManagerSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/SessionManagerSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/TrustedProxySubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/TrustedProxySubscriber.php index b705268c65..079c884016 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/TrustedProxySubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/TrustedProxySubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/XSendFileSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/XSendFileSubscriber.php index e16e5d2819..f41403c5b3 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/XSendFileSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/XSendFileSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Core/PhraseaEvents.php b/lib/Alchemy/Phrasea/Core/PhraseaEvents.php index 2cd170b37e..035d1b20fa 100644 --- a/lib/Alchemy/Phrasea/Core/PhraseaEvents.php +++ b/lib/Alchemy/Phrasea/Core/PhraseaEvents.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. diff --git a/lib/Alchemy/Phrasea/Core/PhraseaExceptionHandler.php b/lib/Alchemy/Phrasea/Core/PhraseaExceptionHandler.php index ab597e6079..ce7d392c90 100644 --- a/lib/Alchemy/Phrasea/Core/PhraseaExceptionHandler.php +++ b/lib/Alchemy/Phrasea/Core/PhraseaExceptionHandler.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/AuthenticationManagerServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/AuthenticationManagerServiceProvider.php index b344edbc71..1454c5d811 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/AuthenticationManagerServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/AuthenticationManagerServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/BorderManagerServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/BorderManagerServiceProvider.php index 36c4a028e2..b33a4973a3 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/BorderManagerServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/BorderManagerServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/BrowserServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/BrowserServiceProvider.php index 368126fd36..cdd7ff26e4 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/BrowserServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/BrowserServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/CSVServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/CSVServiceProvider.php index 6f92ded40d..c37cb15a34 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/CSVServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/CSVServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/CacheServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/CacheServiceProvider.php index 7eaecc3298..e820128174 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/CacheServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/CacheServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/ConfigurationServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/ConfigurationServiceProvider.php index d16756cba5..2d299c1fea 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/ConfigurationServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/ConfigurationServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/ConfigurationTesterServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/ConfigurationTesterServiceProvider.php index 9be12c08f9..3bc90dd90a 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/ConfigurationTesterServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/ConfigurationTesterServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/ContentNegotiationServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/ContentNegotiationServiceProvider.php index afcb36ee25..c702f2d190 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/ContentNegotiationServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/ContentNegotiationServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/FileServeServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/FileServeServiceProvider.php index 8ed200e297..82c9983af7 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/FileServeServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/FileServeServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/FtpServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/FtpServiceProvider.php index 904ba32cd1..42e9acf169 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/FtpServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/FtpServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/InstallerServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/InstallerServiceProvider.php index 3fc83218f8..db822fb636 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/InstallerServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/InstallerServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/JMSSerializerServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/JMSSerializerServiceProvider.php index 46d9b8c8c2..c847461e81 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/JMSSerializerServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/JMSSerializerServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php index 521ef71b63..834b21d127 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php index 395eff6142..d46cd49c8a 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/PhraseaEventServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/PhraseaEventServiceProvider.php index 6a8711d3ca..ba556228e9 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/PhraseaEventServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/PhraseaEventServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/PhraseaVersionServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/PhraseaVersionServiceProvider.php index 98a9adce1b..debec3bdc4 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/PhraseaVersionServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/PhraseaVersionServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php index e718cc0854..6785b06e6e 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/PluginServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/PluginServiceProvider.php index 1a9d2e7693..78813c4f7a 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/PluginServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/PluginServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php index 5b6af0898d..83db767a2f 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php index d31b51316f..c1ad05667c 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/TemporaryFilesystemServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/TemporaryFilesystemServiceProvider.php index 4ea2ab506d..814bf311f3 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/TemporaryFilesystemServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/TemporaryFilesystemServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/TokensServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/TokensServiceProvider.php index d2597efa72..e71b159736 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/TokensServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/TokensServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Provider/UnicodeServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/UnicodeServiceProvider.php index 454e4905b3..3c40f13828 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/UnicodeServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/UnicodeServiceProvider.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. diff --git a/lib/Alchemy/Phrasea/Core/Response/CSVFileResponse.php b/lib/Alchemy/Phrasea/Core/Response/CSVFileResponse.php index 03610411b6..4c404bfd48 100644 --- a/lib/Alchemy/Phrasea/Core/Response/CSVFileResponse.php +++ b/lib/Alchemy/Phrasea/Core/Response/CSVFileResponse.php @@ -2,7 +2,7 @@ /* * This file is part of Phraseanet * - * (c) 2005-2013 Alchemy + * (c) 2005-2015 Alchemy * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index 4551f73806..e3c38e719a 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.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. @@ -14,7 +14,7 @@ namespace Alchemy\Phrasea\Core; class Version { protected static $number = '3.9.0-alpha.20'; - protected static $name = 'Epanterias'; + protected static $name = 'Herrerasaurus'; public static function getNumber() { diff --git a/lib/Alchemy/Phrasea/Exception/Exception.php b/lib/Alchemy/Phrasea/Exception/Exception.php index d5cc8b47f3..10db8e9ecb 100644 --- a/lib/Alchemy/Phrasea/Exception/Exception.php +++ b/lib/Alchemy/Phrasea/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. diff --git a/lib/Alchemy/Phrasea/Exception/FormProcessingException.php b/lib/Alchemy/Phrasea/Exception/FormProcessingException.php index 6d4f353802..6e04c76f62 100644 --- a/lib/Alchemy/Phrasea/Exception/FormProcessingException.php +++ b/lib/Alchemy/Phrasea/Exception/FormProcessingException.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. diff --git a/lib/Alchemy/Phrasea/Exception/InvalidArgumentException.php b/lib/Alchemy/Phrasea/Exception/InvalidArgumentException.php index aa08d4ff22..b640e83c7a 100644 --- a/lib/Alchemy/Phrasea/Exception/InvalidArgumentException.php +++ b/lib/Alchemy/Phrasea/Exception/InvalidArgumentException.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. diff --git a/lib/Alchemy/Phrasea/Exception/LogicException.php b/lib/Alchemy/Phrasea/Exception/LogicException.php index 95cffc4488..10a0604ac6 100644 --- a/lib/Alchemy/Phrasea/Exception/LogicException.php +++ b/lib/Alchemy/Phrasea/Exception/LogicException.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. diff --git a/lib/Alchemy/Phrasea/Exception/RuntimeException.php b/lib/Alchemy/Phrasea/Exception/RuntimeException.php index f5cec9145f..0de758bbce 100644 --- a/lib/Alchemy/Phrasea/Exception/RuntimeException.php +++ b/lib/Alchemy/Phrasea/Exception/RuntimeException.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. diff --git a/lib/Alchemy/Phrasea/Exception/SessionNotFound.php b/lib/Alchemy/Phrasea/Exception/SessionNotFound.php index 95c81afd8f..45269e707e 100644 --- a/lib/Alchemy/Phrasea/Exception/SessionNotFound.php +++ b/lib/Alchemy/Phrasea/Exception/SessionNotFound.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. diff --git a/lib/Alchemy/Phrasea/Form/Constraint/Geoname.php b/lib/Alchemy/Phrasea/Form/Constraint/Geoname.php index f51949262f..0ee37c4f87 100644 --- a/lib/Alchemy/Phrasea/Form/Constraint/Geoname.php +++ b/lib/Alchemy/Phrasea/Form/Constraint/Geoname.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. diff --git a/lib/Alchemy/Phrasea/Form/Constraint/GeonameValidator.php b/lib/Alchemy/Phrasea/Form/Constraint/GeonameValidator.php index 3fad29fe8c..c6ea16f915 100644 --- a/lib/Alchemy/Phrasea/Form/Constraint/GeonameValidator.php +++ b/lib/Alchemy/Phrasea/Form/Constraint/GeonameValidator.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. diff --git a/lib/Alchemy/Phrasea/Form/Constraint/NewEmail.php b/lib/Alchemy/Phrasea/Form/Constraint/NewEmail.php index a6cfc01318..00c34c7448 100644 --- a/lib/Alchemy/Phrasea/Form/Constraint/NewEmail.php +++ b/lib/Alchemy/Phrasea/Form/Constraint/NewEmail.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. diff --git a/lib/Alchemy/Phrasea/Form/Constraint/NewEmailValidator.php b/lib/Alchemy/Phrasea/Form/Constraint/NewEmailValidator.php index 936b9fabc2..ee74336291 100644 --- a/lib/Alchemy/Phrasea/Form/Constraint/NewEmailValidator.php +++ b/lib/Alchemy/Phrasea/Form/Constraint/NewEmailValidator.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. diff --git a/lib/Alchemy/Phrasea/Form/Constraint/NewLogin.php b/lib/Alchemy/Phrasea/Form/Constraint/NewLogin.php index 781cb90235..c47d8183fc 100644 --- a/lib/Alchemy/Phrasea/Form/Constraint/NewLogin.php +++ b/lib/Alchemy/Phrasea/Form/Constraint/NewLogin.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. diff --git a/lib/Alchemy/Phrasea/Form/Constraint/NewLoginValidator.php b/lib/Alchemy/Phrasea/Form/Constraint/NewLoginValidator.php index 88b244d939..e4590891de 100644 --- a/lib/Alchemy/Phrasea/Form/Constraint/NewLoginValidator.php +++ b/lib/Alchemy/Phrasea/Form/Constraint/NewLoginValidator.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. diff --git a/lib/Alchemy/Phrasea/Form/Constraint/PasswordToken.php b/lib/Alchemy/Phrasea/Form/Constraint/PasswordToken.php index f1cc83eb08..21a41fe059 100644 --- a/lib/Alchemy/Phrasea/Form/Constraint/PasswordToken.php +++ b/lib/Alchemy/Phrasea/Form/Constraint/PasswordToken.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. diff --git a/lib/Alchemy/Phrasea/Form/Constraint/PasswordTokenValidator.php b/lib/Alchemy/Phrasea/Form/Constraint/PasswordTokenValidator.php index 874319d6b9..be095376ed 100644 --- a/lib/Alchemy/Phrasea/Form/Constraint/PasswordTokenValidator.php +++ b/lib/Alchemy/Phrasea/Form/Constraint/PasswordTokenValidator.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. diff --git a/lib/Alchemy/Phrasea/Form/Login/PhraseaAuthenticationForm.php b/lib/Alchemy/Phrasea/Form/Login/PhraseaAuthenticationForm.php index 984416ba8c..7b41e73938 100644 --- a/lib/Alchemy/Phrasea/Form/Login/PhraseaAuthenticationForm.php +++ b/lib/Alchemy/Phrasea/Form/Login/PhraseaAuthenticationForm.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. diff --git a/lib/Alchemy/Phrasea/Form/Login/PhraseaForgotPasswordForm.php b/lib/Alchemy/Phrasea/Form/Login/PhraseaForgotPasswordForm.php index bb51348a3f..40c46aa4e2 100644 --- a/lib/Alchemy/Phrasea/Form/Login/PhraseaForgotPasswordForm.php +++ b/lib/Alchemy/Phrasea/Form/Login/PhraseaForgotPasswordForm.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. diff --git a/lib/Alchemy/Phrasea/Form/Login/PhraseaRecoverPasswordForm.php b/lib/Alchemy/Phrasea/Form/Login/PhraseaRecoverPasswordForm.php index 7669a42ed7..7c6c59560b 100644 --- a/lib/Alchemy/Phrasea/Form/Login/PhraseaRecoverPasswordForm.php +++ b/lib/Alchemy/Phrasea/Form/Login/PhraseaRecoverPasswordForm.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. diff --git a/lib/Alchemy/Phrasea/Form/Login/PhraseaRegisterForm.php b/lib/Alchemy/Phrasea/Form/Login/PhraseaRegisterForm.php index 837ad767a8..924b5b6292 100644 --- a/lib/Alchemy/Phrasea/Form/Login/PhraseaRegisterForm.php +++ b/lib/Alchemy/Phrasea/Form/Login/PhraseaRegisterForm.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. diff --git a/lib/Alchemy/Phrasea/Form/Login/PhraseaRenewPasswordForm.php b/lib/Alchemy/Phrasea/Form/Login/PhraseaRenewPasswordForm.php index 82d9496a81..3c4cc20a83 100644 --- a/lib/Alchemy/Phrasea/Form/Login/PhraseaRenewPasswordForm.php +++ b/lib/Alchemy/Phrasea/Form/Login/PhraseaRenewPasswordForm.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. diff --git a/lib/Alchemy/Phrasea/Form/Type/GeonameType.php b/lib/Alchemy/Phrasea/Form/Type/GeonameType.php index cfa0075d81..68b530f521 100644 --- a/lib/Alchemy/Phrasea/Form/Type/GeonameType.php +++ b/lib/Alchemy/Phrasea/Form/Type/GeonameType.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. diff --git a/lib/Alchemy/Phrasea/Helper/DatabaseHelper.php b/lib/Alchemy/Phrasea/Helper/DatabaseHelper.php index 3c4268ea66..5610169444 100644 --- a/lib/Alchemy/Phrasea/Helper/DatabaseHelper.php +++ b/lib/Alchemy/Phrasea/Helper/DatabaseHelper.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. @@ -21,7 +21,7 @@ class DatabaseHelper extends Helper $password = $this->request->query->get('password'); $db_name = $this->request->query->get('db_name'); - $connection_ok = $db_ok = $is_databox = $is_appbox = $empty = false; + $connection_ok = $innodb = $db_ok = $is_databox = $is_appbox = $empty = false; try { $conn = $this->app['dbal.provider']->get([ @@ -74,6 +74,7 @@ class DatabaseHelper extends Helper return [ 'connection' => $connection_ok, + 'innodb' => $innodb, 'database' => $db_ok, 'is_empty' => $empty, 'is_appbox' => $is_appbox, diff --git a/lib/Alchemy/Phrasea/Helper/Helper.php b/lib/Alchemy/Phrasea/Helper/Helper.php index 2e0ea2f546..db38bb432a 100644 --- a/lib/Alchemy/Phrasea/Helper/Helper.php +++ b/lib/Alchemy/Phrasea/Helper/Helper.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. diff --git a/lib/Alchemy/Phrasea/Helper/PathHelper.php b/lib/Alchemy/Phrasea/Helper/PathHelper.php index 42de7e1d8e..64800d47d6 100644 --- a/lib/Alchemy/Phrasea/Helper/PathHelper.php +++ b/lib/Alchemy/Phrasea/Helper/PathHelper.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. diff --git a/lib/Alchemy/Phrasea/Helper/Prod.php b/lib/Alchemy/Phrasea/Helper/Prod.php index d867b5e295..07905201e5 100644 --- a/lib/Alchemy/Phrasea/Helper/Prod.php +++ b/lib/Alchemy/Phrasea/Helper/Prod.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. @@ -99,4 +99,4 @@ class Prod extends Helper { return md5(time() . mt_rand(100000, 999999)); } -} \ No newline at end of file +} diff --git a/lib/Alchemy/Phrasea/Helper/Record/Bridge.php b/lib/Alchemy/Phrasea/Helper/Record/Bridge.php index 90c177ae86..8bfcbd62c6 100644 --- a/lib/Alchemy/Phrasea/Helper/Record/Bridge.php +++ b/lib/Alchemy/Phrasea/Helper/Record/Bridge.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. diff --git a/lib/Alchemy/Phrasea/Helper/Record/Helper.php b/lib/Alchemy/Phrasea/Helper/Record/Helper.php index af36132b8b..d522ef0616 100644 --- a/lib/Alchemy/Phrasea/Helper/Record/Helper.php +++ b/lib/Alchemy/Phrasea/Helper/Record/Helper.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. diff --git a/lib/Alchemy/Phrasea/Helper/Record/Printer.php b/lib/Alchemy/Phrasea/Helper/Record/Printer.php index 261e28d921..b8e1bbc305 100644 --- a/lib/Alchemy/Phrasea/Helper/Record/Printer.php +++ b/lib/Alchemy/Phrasea/Helper/Record/Printer.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. diff --git a/lib/Alchemy/Phrasea/Helper/Record/Push.php b/lib/Alchemy/Phrasea/Helper/Record/Push.php index 9b2b01c708..74fcfe6c76 100644 --- a/lib/Alchemy/Phrasea/Helper/Record/Push.php +++ b/lib/Alchemy/Phrasea/Helper/Record/Push.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. diff --git a/lib/Alchemy/Phrasea/Helper/User/Edit.php b/lib/Alchemy/Phrasea/Helper/User/Edit.php index d7732d5790..0029fcd46a 100644 --- a/lib/Alchemy/Phrasea/Helper/User/Edit.php +++ b/lib/Alchemy/Phrasea/Helper/User/Edit.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. @@ -652,11 +652,7 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper foreach ($this->users as $usr_id) { $user = $this->app['repo.users']->find($usr_id); - - if ($user->isTemplate()) { - continue; - } - + $this->app['acl']->get($user)->apply_model($template, $base_ids); } diff --git a/lib/Alchemy/Phrasea/Helper/User/Manage.php b/lib/Alchemy/Phrasea/Helper/User/Manage.php index b4ed5729c5..26bd94a098 100644 --- a/lib/Alchemy/Phrasea/Helper/User/Manage.php +++ b/lib/Alchemy/Phrasea/Helper/User/Manage.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. diff --git a/lib/Alchemy/Phrasea/Helper/WorkZone.php b/lib/Alchemy/Phrasea/Helper/WorkZone.php index 45e2d4b35f..7cfa236e72 100644 --- a/lib/Alchemy/Phrasea/Helper/WorkZone.php +++ b/lib/Alchemy/Phrasea/Helper/WorkZone.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. diff --git a/lib/Alchemy/Phrasea/Http/AbstractServerMode.php b/lib/Alchemy/Phrasea/Http/AbstractServerMode.php index 1e5a7ae381..728d7b5c0a 100644 --- a/lib/Alchemy/Phrasea/Http/AbstractServerMode.php +++ b/lib/Alchemy/Phrasea/Http/AbstractServerMode.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. diff --git a/lib/Alchemy/Phrasea/Http/DeliverDataInterface.php b/lib/Alchemy/Phrasea/Http/DeliverDataInterface.php index a0857067a9..f28d950772 100644 --- a/lib/Alchemy/Phrasea/Http/DeliverDataInterface.php +++ b/lib/Alchemy/Phrasea/Http/DeliverDataInterface.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. diff --git a/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/Apache.php b/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/Apache.php index 9c8d45be50..b5fbdc53c6 100644 --- a/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/Apache.php +++ b/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/Apache.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. diff --git a/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/H264Factory.php b/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/H264Factory.php index 68664f33b6..3e1223d086 100644 --- a/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/H264Factory.php +++ b/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/H264Factory.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. diff --git a/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/H264Interface.php b/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/H264Interface.php index a9f9ab793f..85b965dedd 100644 --- a/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/H264Interface.php +++ b/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/H264Interface.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. diff --git a/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/Nginx.php b/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/Nginx.php index 2dcc4b3bc2..3d47148db0 100644 --- a/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/Nginx.php +++ b/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/Nginx.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. diff --git a/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/NullMode.php b/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/NullMode.php index 32addaa8dd..23ba92f036 100644 --- a/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/NullMode.php +++ b/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/NullMode.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. diff --git a/lib/Alchemy/Phrasea/Http/ServeFileResponseFactory.php b/lib/Alchemy/Phrasea/Http/ServeFileResponseFactory.php index 621ef42d1f..4a79907ec3 100644 --- a/lib/Alchemy/Phrasea/Http/ServeFileResponseFactory.php +++ b/lib/Alchemy/Phrasea/Http/ServeFileResponseFactory.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. diff --git a/lib/Alchemy/Phrasea/Http/ServerModeInterface.php b/lib/Alchemy/Phrasea/Http/ServerModeInterface.php index f4d3985282..2ad08cb242 100644 --- a/lib/Alchemy/Phrasea/Http/ServerModeInterface.php +++ b/lib/Alchemy/Phrasea/Http/ServerModeInterface.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. diff --git a/lib/Alchemy/Phrasea/Http/StaticFile/AbstractStaticMode.php b/lib/Alchemy/Phrasea/Http/StaticFile/AbstractStaticMode.php index a87237450c..b5101af011 100644 --- a/lib/Alchemy/Phrasea/Http/StaticFile/AbstractStaticMode.php +++ b/lib/Alchemy/Phrasea/Http/StaticFile/AbstractStaticMode.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. diff --git a/lib/Alchemy/Phrasea/Http/StaticFile/Apache.php b/lib/Alchemy/Phrasea/Http/StaticFile/Apache.php index f200550987..10b97d41bb 100644 --- a/lib/Alchemy/Phrasea/Http/StaticFile/Apache.php +++ b/lib/Alchemy/Phrasea/Http/StaticFile/Apache.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. diff --git a/lib/Alchemy/Phrasea/Http/StaticFile/Nginx.php b/lib/Alchemy/Phrasea/Http/StaticFile/Nginx.php index f9f55b644e..31960dbfbe 100644 --- a/lib/Alchemy/Phrasea/Http/StaticFile/Nginx.php +++ b/lib/Alchemy/Phrasea/Http/StaticFile/Nginx.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. diff --git a/lib/Alchemy/Phrasea/Http/StaticFile/NullMode.php b/lib/Alchemy/Phrasea/Http/StaticFile/NullMode.php index 9a9f40608c..fc021e75fe 100644 --- a/lib/Alchemy/Phrasea/Http/StaticFile/NullMode.php +++ b/lib/Alchemy/Phrasea/Http/StaticFile/NullMode.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. diff --git a/lib/Alchemy/Phrasea/Http/StaticFile/StaticFileFactory.php b/lib/Alchemy/Phrasea/Http/StaticFile/StaticFileFactory.php index 0af3339f11..9e4b06416c 100644 --- a/lib/Alchemy/Phrasea/Http/StaticFile/StaticFileFactory.php +++ b/lib/Alchemy/Phrasea/Http/StaticFile/StaticFileFactory.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. diff --git a/lib/Alchemy/Phrasea/Http/StaticFile/StaticFileModeInterface.php b/lib/Alchemy/Phrasea/Http/StaticFile/StaticFileModeInterface.php index 33a9ad31ee..96f5773475 100644 --- a/lib/Alchemy/Phrasea/Http/StaticFile/StaticFileModeInterface.php +++ b/lib/Alchemy/Phrasea/Http/StaticFile/StaticFileModeInterface.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. diff --git a/lib/Alchemy/Phrasea/Http/StaticFile/Symlink/SymLinker.php b/lib/Alchemy/Phrasea/Http/StaticFile/Symlink/SymLinker.php index ab151ad722..99f8ad9a34 100644 --- a/lib/Alchemy/Phrasea/Http/StaticFile/Symlink/SymLinker.php +++ b/lib/Alchemy/Phrasea/Http/StaticFile/Symlink/SymLinker.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. diff --git a/lib/Alchemy/Phrasea/Http/StaticFile/Symlink/SymLinkerEncoder.php b/lib/Alchemy/Phrasea/Http/StaticFile/Symlink/SymLinkerEncoder.php index b659d4e912..9ffaa5a22b 100644 --- a/lib/Alchemy/Phrasea/Http/StaticFile/Symlink/SymLinkerEncoder.php +++ b/lib/Alchemy/Phrasea/Http/StaticFile/Symlink/SymLinkerEncoder.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. diff --git a/lib/Alchemy/Phrasea/Http/XSendFile/ApacheMode.php b/lib/Alchemy/Phrasea/Http/XSendFile/ApacheMode.php index eac5ed9b22..6ba010a68a 100644 --- a/lib/Alchemy/Phrasea/Http/XSendFile/ApacheMode.php +++ b/lib/Alchemy/Phrasea/Http/XSendFile/ApacheMode.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. diff --git a/lib/Alchemy/Phrasea/Http/XSendFile/ModeInterface.php b/lib/Alchemy/Phrasea/Http/XSendFile/ModeInterface.php index a685fe6a0e..afb22eb3cb 100644 --- a/lib/Alchemy/Phrasea/Http/XSendFile/ModeInterface.php +++ b/lib/Alchemy/Phrasea/Http/XSendFile/ModeInterface.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. diff --git a/lib/Alchemy/Phrasea/Http/XSendFile/NginxMode.php b/lib/Alchemy/Phrasea/Http/XSendFile/NginxMode.php index a82e961a04..da8411678c 100644 --- a/lib/Alchemy/Phrasea/Http/XSendFile/NginxMode.php +++ b/lib/Alchemy/Phrasea/Http/XSendFile/NginxMode.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. diff --git a/lib/Alchemy/Phrasea/Http/XSendFile/NullMode.php b/lib/Alchemy/Phrasea/Http/XSendFile/NullMode.php index 916b976656..0c50108c0e 100644 --- a/lib/Alchemy/Phrasea/Http/XSendFile/NullMode.php +++ b/lib/Alchemy/Phrasea/Http/XSendFile/NullMode.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. diff --git a/lib/Alchemy/Phrasea/Http/XSendFile/XSendFileFactory.php b/lib/Alchemy/Phrasea/Http/XSendFile/XSendFileFactory.php index b10fed85e1..990458afe8 100644 --- a/lib/Alchemy/Phrasea/Http/XSendFile/XSendFileFactory.php +++ b/lib/Alchemy/Phrasea/Http/XSendFile/XSendFileFactory.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. diff --git a/lib/Alchemy/Phrasea/Media/Subdef/Audio.php b/lib/Alchemy/Phrasea/Media/Subdef/Audio.php index b29286fbc0..9bfc3b86c5 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/Audio.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/Audio.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. diff --git a/lib/Alchemy/Phrasea/Media/Subdef/FlexPaper.php b/lib/Alchemy/Phrasea/Media/Subdef/FlexPaper.php index 34eb4c8bb2..30ec0f3e87 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/FlexPaper.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/FlexPaper.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. diff --git a/lib/Alchemy/Phrasea/Media/Subdef/Gif.php b/lib/Alchemy/Phrasea/Media/Subdef/Gif.php index 4fc6d181ba..c36c261a57 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/Gif.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/Gif.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. diff --git a/lib/Alchemy/Phrasea/Media/Subdef/Image.php b/lib/Alchemy/Phrasea/Media/Subdef/Image.php index dd1c2e0bb3..47610df7f1 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/Image.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/Image.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. diff --git a/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Boolean.php b/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Boolean.php index 2a06c5a134..350a6c78ac 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Boolean.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Boolean.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. diff --git a/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Enum.php b/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Enum.php index 5c0a1bcaf9..5dc486ca89 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Enum.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Enum.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. diff --git a/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Multi.php b/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Multi.php index f869b71135..cdab5d34b2 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Multi.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Multi.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. diff --git a/lib/Alchemy/Phrasea/Media/Subdef/OptionType/OptionType.php b/lib/Alchemy/Phrasea/Media/Subdef/OptionType/OptionType.php index f001985749..bad9f48781 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/OptionType/OptionType.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/OptionType/OptionType.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. diff --git a/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Range.php b/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Range.php index 4ea031ee15..12acd8ebaa 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Range.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/OptionType/Range.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. diff --git a/lib/Alchemy/Phrasea/Media/Subdef/Provider.php b/lib/Alchemy/Phrasea/Media/Subdef/Provider.php index d8b57bd005..906daaab7d 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/Provider.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/Provider.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. diff --git a/lib/Alchemy/Phrasea/Media/Subdef/Subdef.php b/lib/Alchemy/Phrasea/Media/Subdef/Subdef.php index 321c5b4678..71882f47b7 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/Subdef.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/Subdef.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. diff --git a/lib/Alchemy/Phrasea/Media/Subdef/Video.php b/lib/Alchemy/Phrasea/Media/Subdef/Video.php index 50ef3af8b8..62df1b3996 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/Video.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/Video.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. diff --git a/lib/Alchemy/Phrasea/Media/Type/Audio.php b/lib/Alchemy/Phrasea/Media/Type/Audio.php index 50b355dd38..688c42ce4c 100644 --- a/lib/Alchemy/Phrasea/Media/Type/Audio.php +++ b/lib/Alchemy/Phrasea/Media/Type/Audio.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. diff --git a/lib/Alchemy/Phrasea/Media/Type/Document.php b/lib/Alchemy/Phrasea/Media/Type/Document.php index f6fbbaa972..a27826de92 100644 --- a/lib/Alchemy/Phrasea/Media/Type/Document.php +++ b/lib/Alchemy/Phrasea/Media/Type/Document.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. diff --git a/lib/Alchemy/Phrasea/Media/Type/Flash.php b/lib/Alchemy/Phrasea/Media/Type/Flash.php index 630cc31bb2..2d17938345 100644 --- a/lib/Alchemy/Phrasea/Media/Type/Flash.php +++ b/lib/Alchemy/Phrasea/Media/Type/Flash.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. diff --git a/lib/Alchemy/Phrasea/Media/Type/Image.php b/lib/Alchemy/Phrasea/Media/Type/Image.php index 7719da6215..a536524868 100644 --- a/lib/Alchemy/Phrasea/Media/Type/Image.php +++ b/lib/Alchemy/Phrasea/Media/Type/Image.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. diff --git a/lib/Alchemy/Phrasea/Media/Type/Type.php b/lib/Alchemy/Phrasea/Media/Type/Type.php index 1fbaec82f5..b0b15a727e 100644 --- a/lib/Alchemy/Phrasea/Media/Type/Type.php +++ b/lib/Alchemy/Phrasea/Media/Type/Type.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. diff --git a/lib/Alchemy/Phrasea/Media/Type/Video.php b/lib/Alchemy/Phrasea/Media/Type/Video.php index 5db0337f2c..a0e7e00481 100644 --- a/lib/Alchemy/Phrasea/Media/Type/Video.php +++ b/lib/Alchemy/Phrasea/Media/Type/Video.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. diff --git a/lib/Alchemy/Phrasea/Metadata/PhraseanetMetadataReader.php b/lib/Alchemy/Phrasea/Metadata/PhraseanetMetadataReader.php index 36c252e7e9..dcb0bbcb48 100644 --- a/lib/Alchemy/Phrasea/Metadata/PhraseanetMetadataReader.php +++ b/lib/Alchemy/Phrasea/Metadata/PhraseanetMetadataReader.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. diff --git a/lib/Alchemy/Phrasea/Metadata/PhraseanetMetadataSetter.php b/lib/Alchemy/Phrasea/Metadata/PhraseanetMetadataSetter.php index 153d87bcf5..ae7d491f49 100644 --- a/lib/Alchemy/Phrasea/Metadata/PhraseanetMetadataSetter.php +++ b/lib/Alchemy/Phrasea/Metadata/PhraseanetMetadataSetter.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. diff --git a/lib/Alchemy/Phrasea/Metadata/TagProvider.php b/lib/Alchemy/Phrasea/Metadata/TagProvider.php index 9d1f38ffc4..5be1c1b28c 100644 --- a/lib/Alchemy/Phrasea/Metadata/TagProvider.php +++ b/lib/Alchemy/Phrasea/Metadata/TagProvider.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. diff --git a/lib/Alchemy/Phrasea/Notification/Attachment.php b/lib/Alchemy/Phrasea/Notification/Attachment.php index 237c7f3ed1..a11ffda2aa 100644 --- a/lib/Alchemy/Phrasea/Notification/Attachment.php +++ b/lib/Alchemy/Phrasea/Notification/Attachment.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. diff --git a/lib/Alchemy/Phrasea/Notification/Deliverer.php b/lib/Alchemy/Phrasea/Notification/Deliverer.php index c11527d9e0..6c7ef99b21 100644 --- a/lib/Alchemy/Phrasea/Notification/Deliverer.php +++ b/lib/Alchemy/Phrasea/Notification/Deliverer.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. diff --git a/lib/Alchemy/Phrasea/Notification/Emitter.php b/lib/Alchemy/Phrasea/Notification/Emitter.php index 868182a734..afa30161ea 100644 --- a/lib/Alchemy/Phrasea/Notification/Emitter.php +++ b/lib/Alchemy/Phrasea/Notification/Emitter.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. diff --git a/lib/Alchemy/Phrasea/Notification/EmitterInterface.php b/lib/Alchemy/Phrasea/Notification/EmitterInterface.php index 25d5c6036c..ae8a642669 100644 --- a/lib/Alchemy/Phrasea/Notification/EmitterInterface.php +++ b/lib/Alchemy/Phrasea/Notification/EmitterInterface.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/AbstractMail.php b/lib/Alchemy/Phrasea/Notification/Mail/AbstractMail.php index c57a00c875..051522162f 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/AbstractMail.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/AbstractMail.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/AbstractMailWithLink.php b/lib/Alchemy/Phrasea/Notification/Mail/AbstractMailWithLink.php index 98b2d8ce95..9d430b4815 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/AbstractMailWithLink.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/AbstractMailWithLink.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoBridgeUploadFailed.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoBridgeUploadFailed.php index 00641a4076..cae332ab3b 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoBridgeUploadFailed.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoBridgeUploadFailed.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoNewOrder.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoNewOrder.php index c56b901d14..8135ad90a4 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoNewOrder.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoNewOrder.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoNewPublication.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoNewPublication.php index d544777442..7816d40bb2 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoNewPublication.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoNewPublication.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderCancelled.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderCancelled.php index a8da22facb..90ef58dce7 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderCancelled.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderCancelled.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderDelivered.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderDelivered.php index a976be10a2..c9eeab07bf 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderDelivered.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoOrderDelivered.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoPushReceived.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoPushReceived.php index e658c3833d..23204a8c43 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoPushReceived.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoPushReceived.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoRecordQuarantined.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoRecordQuarantined.php index 564fc1557b..72ca797f67 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoRecordQuarantined.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoRecordQuarantined.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoSomebodyAutoregistered.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoSomebodyAutoregistered.php index 973985f597..7a2209f1d9 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoSomebodyAutoregistered.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoSomebodyAutoregistered.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoUserRegistered.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoUserRegistered.php index 8e195d2d46..a9fac3949e 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoUserRegistered.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoUserRegistered.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationDone.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationDone.php index 057de54c78..b667fd0b6d 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationDone.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationDone.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationReminder.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationReminder.php index 8ad444c23c..3fa4644260 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationReminder.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationReminder.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationRequest.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationRequest.php index 2aa87739c8..4838ab7630 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationRequest.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationRequest.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInterface.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInterface.php index add19be4ad..7e923c1346 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInterface.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInterface.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailRecordsExport.php b/lib/Alchemy/Phrasea/Notification/Mail/MailRecordsExport.php index ddbfd57a41..4eb33e280e 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailRecordsExport.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailRecordsExport.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailRequestEmailConfirmation.php b/lib/Alchemy/Phrasea/Notification/Mail/MailRequestEmailConfirmation.php index 42df9ef8e4..16193c3c9a 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailRequestEmailConfirmation.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailRequestEmailConfirmation.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailRequestEmailUpdate.php b/lib/Alchemy/Phrasea/Notification/Mail/MailRequestEmailUpdate.php index c7caa69122..e44636ab86 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailRequestEmailUpdate.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailRequestEmailUpdate.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailRequestPasswordSetup.php b/lib/Alchemy/Phrasea/Notification/Mail/MailRequestPasswordSetup.php index 0a1f596f7f..bd895ea92f 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailRequestPasswordSetup.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailRequestPasswordSetup.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailRequestPasswordUpdate.php b/lib/Alchemy/Phrasea/Notification/Mail/MailRequestPasswordUpdate.php index 5bb1c3dc48..51ca25304d 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailRequestPasswordUpdate.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailRequestPasswordUpdate.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessAccessRequest.php b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessAccessRequest.php index 2685faa88b..9cbb8b7c6e 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessAccessRequest.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessAccessRequest.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailConfirmationRegistered.php b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailConfirmationRegistered.php index 785a9cc6ff..154681de77 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailConfirmationRegistered.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailConfirmationRegistered.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailConfirmationUnregistered.php b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailConfirmationUnregistered.php index f936269420..0d4b018e65 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailConfirmationUnregistered.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailConfirmationUnregistered.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailUpdate.php b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailUpdate.php index c8f30d9615..f3da1907c6 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailUpdate.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessEmailUpdate.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessFTPReceiver.php b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessFTPReceiver.php index 7accb17fff..ed2da4b52a 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessFTPReceiver.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessFTPReceiver.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessFTPSender.php b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessFTPSender.php index df1d86aebf..601da922c0 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessFTPSender.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailSuccessFTPSender.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailTest.php b/lib/Alchemy/Phrasea/Notification/Mail/MailTest.php index b8a591544e..e5bf996d1c 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailTest.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailTest.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. diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailWithLinkInterface.php b/lib/Alchemy/Phrasea/Notification/Mail/MailWithLinkInterface.php index 6c86cbcf2a..15b1f50992 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailWithLinkInterface.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailWithLinkInterface.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. diff --git a/lib/Alchemy/Phrasea/Notification/Receiver.php b/lib/Alchemy/Phrasea/Notification/Receiver.php index e3671c882c..a867139aa9 100644 --- a/lib/Alchemy/Phrasea/Notification/Receiver.php +++ b/lib/Alchemy/Phrasea/Notification/Receiver.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. diff --git a/lib/Alchemy/Phrasea/Notification/ReceiverInterface.php b/lib/Alchemy/Phrasea/Notification/ReceiverInterface.php index e544e73bb6..f697b99a20 100644 --- a/lib/Alchemy/Phrasea/Notification/ReceiverInterface.php +++ b/lib/Alchemy/Phrasea/Notification/ReceiverInterface.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. diff --git a/lib/Alchemy/Phrasea/Out/Module/PDF.php b/lib/Alchemy/Phrasea/Out/Module/PDF.php index f51a2449d2..cd98a10810 100644 --- a/lib/Alchemy/Phrasea/Out/Module/PDF.php +++ b/lib/Alchemy/Phrasea/Out/Module/PDF.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. @@ -234,19 +234,24 @@ class PDF $wimg = $himg = 50; // 1px = 3.77952 mm $finalWidth = round($subdef->get_width() / 3.779528, 2); - $finalheight = round($subdef->get_height() / 3.779528, 2); - if ($finalWidth > 0 && $finalheight > 0) { - if ($finalWidth > $finalheight && ($wimg < $finalWidth)) - $finalheight = $wimg * $finalheight / $finalWidth; - else if ($finalheight > $finalWidth && $himg < $finalheight) - $finalWidth = $himg * $finalWidth / $finalheight; - else if ($finalheight == $finalWidth && $himg < $finalheight) { - $finalheight = $wimg * $finalheight / $finalWidth; - $finalWidth = $himg * $finalWidth / $finalheight; + $finalHeight = round($subdef->get_height() / 3.779528, 2); + $aspectH = $finalWidth/$finalHeight; + $aspectW = $finalHeight/$finalWidth; + + if ($finalWidth > 0 && $finalHeight > 0) { + if ($finalWidth > $finalHeight && $finalWidth > $wimg) { + $finalWidth = $wimg; + $finalHeight = $wimg * $aspectW; + } else if ($finalHeight > $finalWidth && $finalHeight > $himg) { + $finalHeight = $himg; + $finalWidth = $himg * $aspectH; + } else if ($finalHeight == $finalWidth & $finalWidth > $wimg) { + $finalHeight = $wimg; + $finalWidth = $himg; } } - if ($this->pdf->GetY() > $this->pdf->getPageHeight() - (6 + $finalheight + 20)) + if ($this->pdf->GetY() > $this->pdf->getPageHeight() - (6 + $finalHeight + 20)) $this->pdf->AddPage(); $title = "record : " . $rec->get_title(); @@ -283,7 +288,7 @@ class PDF if ($fimg) { $y = $this->pdf->GetY(); - $this->pdf->Image($fimg, $lmargin, $y, $finalWidth, $finalheight); + $this->pdf->Image($fimg, $lmargin, $y, $finalWidth, $finalHeight); $this->pdf->SetY($y + 3); } @@ -303,8 +308,8 @@ class PDF $this->pdf->Write(6, "\n"); $nf++; } - if ($this->pdf->PageNo() == $p0 && ($this->pdf->GetY() - $y0) < $finalheight) - $this->pdf->SetY($y0 + $finalheight); + if ($this->pdf->PageNo() == $p0 && ($this->pdf->GetY() - $y0) < $finalHeight) + $this->pdf->SetY($y0 + $finalHeight); $ndoc++; } $this->pdf->SetLeftMargin($lmargin); @@ -437,28 +442,34 @@ class PDF && $subdef->get_type() == \media_subdef::TYPE_IMAGE) $f = \recordutils_image::watermark($this->app, $subdef); + // original height / original width x new width = new height $wimg = $himg = 150; // preview dans un carre de 150 mm // 1px = 3.77952 mm $finalWidth = round($subdef->get_width() / 3.779528, 2); - $finalheight = round($subdef->get_height() / 3.779528, 2); - if ($finalWidth > 0 && $finalheight > 0) { - if ($finalWidth > $finalheight && ($wimg < $finalWidth)) - $finalheight = $wimg * $finalheight / $finalWidth; - else if ($finalheight > $finalWidth && $himg < $finalheight) - $finalWidth = $himg * $finalWidth / $finalheight; - else if ($finalheight == $finalWidth && $himg < $finalheight) { - $finalheight = $wimg * $finalheight / $finalWidth; - $finalWidth = $himg * $finalWidth / $finalheight; + $finalHeight = round($subdef->get_height() / 3.779528, 2); + $aspectH = $finalWidth/$finalHeight; + $aspectW = $finalHeight/$finalWidth; + + if ($finalWidth > 0 && $finalHeight > 0) { + if ($finalWidth > $finalHeight && $finalWidth > $wimg) { + $finalWidth = $wimg; + $finalHeight = $wimg * $aspectW; + } else if ($finalHeight > $finalWidth && $finalHeight > $himg) { + $finalHeight = $himg; + $finalWidth = $himg * $aspectH; + } else if ($finalHeight == $finalWidth & $finalWidth > $wimg) { + $finalHeight = $wimg; + $finalWidth = $himg; } } - $this->pdf->Image($f, (210 - $finalWidth) / 2, $y, $finalWidth, $finalheight); + $this->pdf->Image($f, (210 - $finalWidth) / 2, $y, $finalWidth, $finalHeight); if ($miniConv != NULL) { foreach ($miniConv as $oneF) unlink($oneF); } - $this->pdf->SetXY($lmargin, $y += ( $finalheight + 5)); + $this->pdf->SetXY($lmargin, $y += ( $finalHeight + 5)); $nf = 0; if ($write_caption) { diff --git a/lib/Alchemy/Phrasea/Out/Tool/PhraseaPDF.php b/lib/Alchemy/Phrasea/Out/Tool/PhraseaPDF.php index 848b7c2c4a..31fa1051c6 100644 --- a/lib/Alchemy/Phrasea/Out/Tool/PhraseaPDF.php +++ b/lib/Alchemy/Phrasea/Out/Tool/PhraseaPDF.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Exception/ComposerInstallException.php b/lib/Alchemy/Phrasea/Plugin/Exception/ComposerInstallException.php index 2111ae9fa2..7f9ca606e0 100644 --- a/lib/Alchemy/Phrasea/Plugin/Exception/ComposerInstallException.php +++ b/lib/Alchemy/Phrasea/Plugin/Exception/ComposerInstallException.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Exception/ImportFailureException.php b/lib/Alchemy/Phrasea/Plugin/Exception/ImportFailureException.php index 3c537fa880..9edb3f437c 100644 --- a/lib/Alchemy/Phrasea/Plugin/Exception/ImportFailureException.php +++ b/lib/Alchemy/Phrasea/Plugin/Exception/ImportFailureException.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Exception/JsonValidationException.php b/lib/Alchemy/Phrasea/Plugin/Exception/JsonValidationException.php index cff4adf620..dc27b4385c 100644 --- a/lib/Alchemy/Phrasea/Plugin/Exception/JsonValidationException.php +++ b/lib/Alchemy/Phrasea/Plugin/Exception/JsonValidationException.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Exception/PluginValidationException.php b/lib/Alchemy/Phrasea/Plugin/Exception/PluginValidationException.php index 977bee010f..2826ac2fee 100644 --- a/lib/Alchemy/Phrasea/Plugin/Exception/PluginValidationException.php +++ b/lib/Alchemy/Phrasea/Plugin/Exception/PluginValidationException.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Exception/RegistrationFailureException.php b/lib/Alchemy/Phrasea/Plugin/Exception/RegistrationFailureException.php index c92da03d31..491a8e7cf9 100644 --- a/lib/Alchemy/Phrasea/Plugin/Exception/RegistrationFailureException.php +++ b/lib/Alchemy/Phrasea/Plugin/Exception/RegistrationFailureException.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Importer/FolderImporter.php b/lib/Alchemy/Phrasea/Plugin/Importer/FolderImporter.php index 082b0bd17f..0872f2d94c 100644 --- a/lib/Alchemy/Phrasea/Plugin/Importer/FolderImporter.php +++ b/lib/Alchemy/Phrasea/Plugin/Importer/FolderImporter.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Importer/ImportStrategy.php b/lib/Alchemy/Phrasea/Plugin/Importer/ImportStrategy.php index 16fb71b408..5159dae6fd 100644 --- a/lib/Alchemy/Phrasea/Plugin/Importer/ImportStrategy.php +++ b/lib/Alchemy/Phrasea/Plugin/Importer/ImportStrategy.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Importer/Importer.php b/lib/Alchemy/Phrasea/Plugin/Importer/Importer.php index 3b52c55046..1fe753ef09 100644 --- a/lib/Alchemy/Phrasea/Plugin/Importer/Importer.php +++ b/lib/Alchemy/Phrasea/Plugin/Importer/Importer.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Importer/ImporterInterface.php b/lib/Alchemy/Phrasea/Plugin/Importer/ImporterInterface.php index d5592d5534..2ff8a99928 100644 --- a/lib/Alchemy/Phrasea/Plugin/Importer/ImporterInterface.php +++ b/lib/Alchemy/Phrasea/Plugin/Importer/ImporterInterface.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Management/AutoloaderGenerator.php b/lib/Alchemy/Phrasea/Plugin/Management/AutoloaderGenerator.php index c670dfb50e..1aa6505621 100644 --- a/lib/Alchemy/Phrasea/Plugin/Management/AutoloaderGenerator.php +++ b/lib/Alchemy/Phrasea/Plugin/Management/AutoloaderGenerator.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Management/ComposerInstaller.php b/lib/Alchemy/Phrasea/Plugin/Management/ComposerInstaller.php index 9419b07778..60d7bdb742 100644 --- a/lib/Alchemy/Phrasea/Plugin/Management/ComposerInstaller.php +++ b/lib/Alchemy/Phrasea/Plugin/Management/ComposerInstaller.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Management/PluginsExplorer.php b/lib/Alchemy/Phrasea/Plugin/Management/PluginsExplorer.php index 2728919f1a..eccc45b0e8 100644 --- a/lib/Alchemy/Phrasea/Plugin/Management/PluginsExplorer.php +++ b/lib/Alchemy/Phrasea/Plugin/Management/PluginsExplorer.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Plugin.php b/lib/Alchemy/Phrasea/Plugin/Plugin.php index fceed2e45d..9abd1e6b89 100644 --- a/lib/Alchemy/Phrasea/Plugin/Plugin.php +++ b/lib/Alchemy/Phrasea/Plugin/Plugin.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. diff --git a/lib/Alchemy/Phrasea/Plugin/PluginManager.php b/lib/Alchemy/Phrasea/Plugin/PluginManager.php index b6cc4f253e..c3cfae8b2b 100644 --- a/lib/Alchemy/Phrasea/Plugin/PluginManager.php +++ b/lib/Alchemy/Phrasea/Plugin/PluginManager.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. diff --git a/lib/Alchemy/Phrasea/Plugin/PluginProviderInterface.php b/lib/Alchemy/Phrasea/Plugin/PluginProviderInterface.php index 953c7447cb..2bb60a19c0 100644 --- a/lib/Alchemy/Phrasea/Plugin/PluginProviderInterface.php +++ b/lib/Alchemy/Phrasea/Plugin/PluginProviderInterface.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Schema/Manifest.php b/lib/Alchemy/Phrasea/Plugin/Schema/Manifest.php index 9be3293542..5edd9c9e49 100644 --- a/lib/Alchemy/Phrasea/Plugin/Schema/Manifest.php +++ b/lib/Alchemy/Phrasea/Plugin/Schema/Manifest.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Schema/ManifestValidator.php b/lib/Alchemy/Phrasea/Plugin/Schema/ManifestValidator.php index abb9a71019..c2d91e92de 100644 --- a/lib/Alchemy/Phrasea/Plugin/Schema/ManifestValidator.php +++ b/lib/Alchemy/Phrasea/Plugin/Schema/ManifestValidator.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. diff --git a/lib/Alchemy/Phrasea/Plugin/Schema/PluginValidator.php b/lib/Alchemy/Phrasea/Plugin/Schema/PluginValidator.php index 369d383e61..8e6abd06ae 100644 --- a/lib/Alchemy/Phrasea/Plugin/Schema/PluginValidator.php +++ b/lib/Alchemy/Phrasea/Plugin/Schema/PluginValidator.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. diff --git a/lib/Alchemy/Phrasea/SearchEngine/AbstractConfigurationPanel.php b/lib/Alchemy/Phrasea/SearchEngine/AbstractConfigurationPanel.php index f6c8918f7c..0c5eae134e 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/AbstractConfigurationPanel.php +++ b/lib/Alchemy/Phrasea/SearchEngine/AbstractConfigurationPanel.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. diff --git a/lib/Alchemy/Phrasea/SearchEngine/ConfigurationPanelInterface.php b/lib/Alchemy/Phrasea/SearchEngine/ConfigurationPanelInterface.php index f11d606d90..6160ddcaab 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/ConfigurationPanelInterface.php +++ b/lib/Alchemy/Phrasea/SearchEngine/ConfigurationPanelInterface.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. diff --git a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/ConfigurationPanel.php b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/ConfigurationPanel.php index d9e97f60d4..df1431e0fd 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/ConfigurationPanel.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/ConfigurationPanel.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. diff --git a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php index 6b0ddb7bfe..bc558a1452 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.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. @@ -367,10 +367,6 @@ class PhraseaEngine implements SearchEngineInterface $query = "all"; } - if ($options->getRecordType()) { - $query .= ' AND recordtype=' . $options->getRecordType(); - } - $sql = 'SELECT query, query_time, duration, total FROM cache WHERE session_id = :ses_id'; $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); $stmt->execute([':ses_id' => $this->app['session']->get('phrasea_session_id')]); @@ -667,6 +663,18 @@ class PhraseaEngine implements SearchEngineInterface */ private function addQuery($query, SearchEngineOptions $options) { + if ($options->getFields()) { + $fields = array_map(function (\databox_field $field) { + return $field->get_name(); + }, $options->getFields()); + if(count($fields) == 1) { + $query .= ' IN ' . $fields[0]; + } + else if(count($fields) > 1) { + $query .= ' IN (' . implode(' OR ', $fields) . ')'; + } + } + foreach ($options->getDataboxes() as $databox) { $this->queries[$databox->get_sbas_id()] = $query; } @@ -674,44 +682,54 @@ class PhraseaEngine implements SearchEngineInterface $status = $options->getStatus(); foreach ($this->queries as $sbas => $qs) { - if ($status) { - $requestStat = 'xxxx'; + $clauses = array(); - for ($i = 4; ($i <= 32); $i++) { - if (!isset($status[$i])) { - $requestStat = 'x' . $requestStat; - continue; - } + // the main query + $clauses[] = $query; + + // status + if ($status) { + $requestStat = ''; + for ($i = 31; $i >= 4; $i--) { $val = 'x'; - if (isset($status[$i][$sbas])) { + if (isset($status[$i]) && isset($status[$i][$sbas])) { if ($status[$i][$sbas] == '0') { $val = '0'; } elseif ($status[$i][$sbas] == '1') { $val = '1'; } } - $requestStat = $val . $requestStat; + $requestStat .= $val; } - - $requestStat = ltrim($requestStat, 'x'); + $requestStat = ltrim($requestStat.'xxxx', 'x'); if ($requestStat !== '') { - $this->queries[$sbas] .= ' AND (recordstatus=' . $requestStat . ')'; + $clauses[] = 'recordstatus=' . $requestStat . ''; } } - if ($options->getFields()) { - $this->queries[$sbas] .= ' IN (' . implode(' OR ', array_map(function (\databox_field $field) { - return $field->get_name(); - }, $options->getFields())) . ')'; - } - if (($options->getMinDate() || $options->getMaxDate()) && $options->getDateFields()) { + + // date + if (($options->getMinDate() || $this->options->getMaxDate()) && $this->options->getDateFields()) { if ($options->getMinDate()) { - $this->queries[$sbas] .= ' AND ( ' . implode(' >= ' . $options->getMinDate()->format('Y-m-d') . ' OR ', array_map(function (\databox_field $field) { return $field->get_name(); }, $options->getDateFields())) . ' >= ' . $options->getMinDate()->format('Y-m-d') . ' ) '; + $clauses[] = implode(' >= ' . $this->options->getMinDate()->format('Y-m-d') . ' OR ', array_map(function (\databox_field $field) { return $field->get_name(); }, $this->options->getDateFields())) . ' >= ' . $this->options->getMinDate()->format('Y-m-d'); } if ($options->getMaxDate()) { - $this->queries[$sbas] .= ' AND ( ' . implode(' <= ' . $options->getMaxDate()->format('Y-m-d') . ' OR ', array_map(function (\databox_field $field) { return $field->get_name(); }, $options->getDateFields())) . ' <= ' . $options->getMaxDate()->format('Y-m-d') . ' ) '; + $clauses[] = implode(' <= ' . $this->options->getMaxDate()->format('Y-m-d') . ' OR ', array_map(function (\databox_field $field) { return $field->get_name(); }, $this->options->getDateFields())) . ' <= ' . $this->options->getMaxDate()->format('Y-m-d'); } } + + // record type + if ($options->getRecordType()) { + $clauses[] = 'recordtype=' . $this->options->getRecordType(); + } + + // join clauses to build a query + if(count($clauses) == 1) { + $this->queries[$sbas] = $clauses[0]; + } + else{ + $this->queries[$sbas] = '(' . join(') AND (', $clauses) . ')'; + } } $this->singleParse('main', $query, $options); diff --git a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineQueryParser.php b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineQueryParser.php index f5c999ebd5..832622b505 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineQueryParser.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineQueryParser.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. diff --git a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineSubscriber.php b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineSubscriber.php index 1b627be423..468f998dbd 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineSubscriber.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineSubscriber.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. diff --git a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php index df9ed8c8cc..e3871dd043 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.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. diff --git a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineLogger.php b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineLogger.php index 489c819d75..46076b18f0 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineLogger.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineLogger.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. diff --git a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php index f6d5636b0c..97604b7b5c 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.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. @@ -323,21 +323,35 @@ class SearchEngineOptions { $tmp = []; foreach ($status as $n => $options) { - if (count($options) > 1) { - continue; - } if (isset($options['on'])) { foreach ($options['on'] as $sbas_id) { - $tmp[$n][$sbas_id] = 1; + if(!isset($tmp[$n][$sbas_id])) { + $tmp[$n][$sbas_id] = array(); + } + $tmp[$n][$sbas_id][] = 1; } } if (isset($options['off'])) { foreach ($options['off'] as $sbas_id) { - $tmp[$n][$sbas_id] = 0; + if(!isset($tmp[$n][$sbas_id])) { + $tmp[$n][$sbas_id] = array(); + } + $tmp[$n][$sbas_id][] = 0; } } } - + foreach($tmp as $n=>$bas) { + foreach($bas as $sbas_id=>$values) { + if(count($values) > 1) { + unset($tmp[$n][$sbas_id]); + } else { + $tmp[$n][$sbas_id] = $values[0]; + } + } + if(count($tmp[$n]) == 0) { + unset($tmp[$n]); + } + } $this->status = $tmp; return $this; @@ -639,11 +653,14 @@ class SearchEngineOptions } $bas = array_filter($bas, function ($collection) use ($app) { - if ($app['authentication']->isAuthenticated()) { - return $app['acl']->get($app['authentication']->getUser())->has_access_to_base($collection->get_base_id()); - } else { - return in_array($collection, $app->getOpenCollections()); + if($collection !== null) { + if ($app['authentication']->isAuthenticated()) { + return $app['acl']->get($app['authentication']->getUser())->has_access_to_base($collection->get_base_id()); + } else { + return in_array($collection, $app->getOpenCollections()); + } } + return false; // CollectionNotFound }); $databoxes = []; diff --git a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineResult.php b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineResult.php index 476280816e..80b9e20f7a 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineResult.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineResult.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. diff --git a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineSuggestion.php b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineSuggestion.php index b51be44bdc..3997ea46e2 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineSuggestion.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineSuggestion.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. diff --git a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/AbstractCharset.php b/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/AbstractCharset.php index 81ea5ff54f..ac76cf38fc 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/AbstractCharset.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/AbstractCharset.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. diff --git a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/ConfigurationPanel.php b/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/ConfigurationPanel.php index 2264e6875f..b8e3926b1a 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/ConfigurationPanel.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/ConfigurationPanel.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. diff --git a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php b/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php index 4eb9c78618..3206d045a8 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.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. diff --git a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngineSubscriber.php b/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngineSubscriber.php index c293e15ece..9ecfec1bff 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngineSubscriber.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngineSubscriber.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. diff --git a/lib/Alchemy/Phrasea/Setup/ConfigurationTester.php b/lib/Alchemy/Phrasea/Setup/ConfigurationTester.php index d06a95598d..54fee60df4 100644 --- a/lib/Alchemy/Phrasea/Setup/ConfigurationTester.php +++ b/lib/Alchemy/Phrasea/Setup/ConfigurationTester.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. diff --git a/lib/Alchemy/Phrasea/Setup/Information.php b/lib/Alchemy/Phrasea/Setup/Information.php index 2ace8205f6..2a2cb2095e 100644 --- a/lib/Alchemy/Phrasea/Setup/Information.php +++ b/lib/Alchemy/Phrasea/Setup/Information.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. diff --git a/lib/Alchemy/Phrasea/Setup/InformationInterface.php b/lib/Alchemy/Phrasea/Setup/InformationInterface.php index 38cc9462ba..3713f72942 100644 --- a/lib/Alchemy/Phrasea/Setup/InformationInterface.php +++ b/lib/Alchemy/Phrasea/Setup/InformationInterface.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. diff --git a/lib/Alchemy/Phrasea/Setup/Installer.php b/lib/Alchemy/Phrasea/Setup/Installer.php index 5051f46844..8202c92bcb 100644 --- a/lib/Alchemy/Phrasea/Setup/Installer.php +++ b/lib/Alchemy/Phrasea/Setup/Installer.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. diff --git a/lib/Alchemy/Phrasea/Setup/Probe/BinariesProbe.php b/lib/Alchemy/Phrasea/Setup/Probe/BinariesProbe.php index 5d775f3094..9fcb07072d 100644 --- a/lib/Alchemy/Phrasea/Setup/Probe/BinariesProbe.php +++ b/lib/Alchemy/Phrasea/Setup/Probe/BinariesProbe.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. diff --git a/lib/Alchemy/Phrasea/Setup/Probe/CacheServerProbe.php b/lib/Alchemy/Phrasea/Setup/Probe/CacheServerProbe.php index 076e7c1f65..b58269a224 100644 --- a/lib/Alchemy/Phrasea/Setup/Probe/CacheServerProbe.php +++ b/lib/Alchemy/Phrasea/Setup/Probe/CacheServerProbe.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. diff --git a/lib/Alchemy/Phrasea/Setup/Probe/DataboxStructureProbe.php b/lib/Alchemy/Phrasea/Setup/Probe/DataboxStructureProbe.php index 83260d3738..868147747e 100644 --- a/lib/Alchemy/Phrasea/Setup/Probe/DataboxStructureProbe.php +++ b/lib/Alchemy/Phrasea/Setup/Probe/DataboxStructureProbe.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. diff --git a/lib/Alchemy/Phrasea/Setup/Probe/FilesystemProbe.php b/lib/Alchemy/Phrasea/Setup/Probe/FilesystemProbe.php index c532a799e9..8ba178ef2e 100644 --- a/lib/Alchemy/Phrasea/Setup/Probe/FilesystemProbe.php +++ b/lib/Alchemy/Phrasea/Setup/Probe/FilesystemProbe.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. diff --git a/lib/Alchemy/Phrasea/Setup/Probe/LocalesProbe.php b/lib/Alchemy/Phrasea/Setup/Probe/LocalesProbe.php index 6327f221d1..d7ad961b05 100644 --- a/lib/Alchemy/Phrasea/Setup/Probe/LocalesProbe.php +++ b/lib/Alchemy/Phrasea/Setup/Probe/LocalesProbe.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. diff --git a/lib/Alchemy/Phrasea/Setup/Probe/OpcodeCacheProbe.php b/lib/Alchemy/Phrasea/Setup/Probe/OpcodeCacheProbe.php index 792d6a97d8..5b269acadb 100644 --- a/lib/Alchemy/Phrasea/Setup/Probe/OpcodeCacheProbe.php +++ b/lib/Alchemy/Phrasea/Setup/Probe/OpcodeCacheProbe.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. diff --git a/lib/Alchemy/Phrasea/Setup/Probe/PhpProbe.php b/lib/Alchemy/Phrasea/Setup/Probe/PhpProbe.php index 9797cc15fc..10af411d91 100644 --- a/lib/Alchemy/Phrasea/Setup/Probe/PhpProbe.php +++ b/lib/Alchemy/Phrasea/Setup/Probe/PhpProbe.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. diff --git a/lib/Alchemy/Phrasea/Setup/Probe/PhraseaProbe.php b/lib/Alchemy/Phrasea/Setup/Probe/PhraseaProbe.php index 9842ec1a17..8c9c8127e5 100644 --- a/lib/Alchemy/Phrasea/Setup/Probe/PhraseaProbe.php +++ b/lib/Alchemy/Phrasea/Setup/Probe/PhraseaProbe.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. diff --git a/lib/Alchemy/Phrasea/Setup/Probe/ProbeInterface.php b/lib/Alchemy/Phrasea/Setup/Probe/ProbeInterface.php index cbc6f40e64..74d294d94d 100644 --- a/lib/Alchemy/Phrasea/Setup/Probe/ProbeInterface.php +++ b/lib/Alchemy/Phrasea/Setup/Probe/ProbeInterface.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. diff --git a/lib/Alchemy/Phrasea/Setup/Probe/SearchEngineProbe.php b/lib/Alchemy/Phrasea/Setup/Probe/SearchEngineProbe.php index 0b9859b175..ebb06e0be4 100644 --- a/lib/Alchemy/Phrasea/Setup/Probe/SearchEngineProbe.php +++ b/lib/Alchemy/Phrasea/Setup/Probe/SearchEngineProbe.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. diff --git a/lib/Alchemy/Phrasea/Setup/Probe/SubdefsPathsProbe.php b/lib/Alchemy/Phrasea/Setup/Probe/SubdefsPathsProbe.php index 3eb6b09626..83bb9ac989 100644 --- a/lib/Alchemy/Phrasea/Setup/Probe/SubdefsPathsProbe.php +++ b/lib/Alchemy/Phrasea/Setup/Probe/SubdefsPathsProbe.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. diff --git a/lib/Alchemy/Phrasea/Setup/Probe/SystemProbe.php b/lib/Alchemy/Phrasea/Setup/Probe/SystemProbe.php index 9cc8b38441..6d8ba22e56 100644 --- a/lib/Alchemy/Phrasea/Setup/Probe/SystemProbe.php +++ b/lib/Alchemy/Phrasea/Setup/Probe/SystemProbe.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. diff --git a/lib/Alchemy/Phrasea/Setup/RequirementInterface.php b/lib/Alchemy/Phrasea/Setup/RequirementInterface.php index 9a70af75ef..ed923bb4e9 100644 --- a/lib/Alchemy/Phrasea/Setup/RequirementInterface.php +++ b/lib/Alchemy/Phrasea/Setup/RequirementInterface.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. diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.php index c87ba21520..4c1c32b8a6 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.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. diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/CacheServerRequirement.php b/lib/Alchemy/Phrasea/Setup/Requirements/CacheServerRequirement.php index 334eec81ff..01b586b5d9 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/CacheServerRequirement.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/CacheServerRequirement.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. diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php index 804b266ad3..a76bd36760 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.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. diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/LocalesRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/LocalesRequirements.php index 790a87b0fd..c6ec15f53d 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/LocalesRequirements.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/LocalesRequirements.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. diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/OpcodeCacheRequirement.php b/lib/Alchemy/Phrasea/Setup/Requirements/OpcodeCacheRequirement.php index 33d43cb567..93d2daf03a 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/OpcodeCacheRequirement.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/OpcodeCacheRequirement.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. diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/PhpRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/PhpRequirements.php index d53d8d2e72..666f118b9c 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/PhpRequirements.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/PhpRequirements.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. diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/PhraseaRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/PhraseaRequirements.php index ccd281f53a..940320f003 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/PhraseaRequirements.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/PhraseaRequirements.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. diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/RequirementInterface.php b/lib/Alchemy/Phrasea/Setup/Requirements/RequirementInterface.php index 2f818474a6..bd5374e74f 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/RequirementInterface.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/RequirementInterface.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. diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.php index 667b632018..15da4e21a5 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.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. diff --git a/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration31.php b/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration31.php index 00d896e3bc..4ae7621657 100644 --- a/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration31.php +++ b/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration31.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. diff --git a/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration35.php b/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration35.php index dc62369e2f..86f40280cd 100644 --- a/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration35.php +++ b/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration35.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. diff --git a/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php b/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php index 25a06ca974..fda45795cb 100644 --- a/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php +++ b/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.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. diff --git a/lib/Alchemy/Phrasea/Setup/Version/Migration/MigrationInterface.php b/lib/Alchemy/Phrasea/Setup/Version/Migration/MigrationInterface.php index ae1c24ad8c..b57074fc9b 100644 --- a/lib/Alchemy/Phrasea/Setup/Version/Migration/MigrationInterface.php +++ b/lib/Alchemy/Phrasea/Setup/Version/Migration/MigrationInterface.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. diff --git a/lib/Alchemy/Phrasea/Setup/Version/Probe/Probe31.php b/lib/Alchemy/Phrasea/Setup/Version/Probe/Probe31.php index db8679d88c..40f96b805e 100644 --- a/lib/Alchemy/Phrasea/Setup/Version/Probe/Probe31.php +++ b/lib/Alchemy/Phrasea/Setup/Version/Probe/Probe31.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. diff --git a/lib/Alchemy/Phrasea/Setup/Version/Probe/Probe35.php b/lib/Alchemy/Phrasea/Setup/Version/Probe/Probe35.php index 447eff638e..008a02fe12 100644 --- a/lib/Alchemy/Phrasea/Setup/Version/Probe/Probe35.php +++ b/lib/Alchemy/Phrasea/Setup/Version/Probe/Probe35.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. diff --git a/lib/Alchemy/Phrasea/Setup/Version/Probe/Probe38.php b/lib/Alchemy/Phrasea/Setup/Version/Probe/Probe38.php index d39f11d610..dbede4844f 100644 --- a/lib/Alchemy/Phrasea/Setup/Version/Probe/Probe38.php +++ b/lib/Alchemy/Phrasea/Setup/Version/Probe/Probe38.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. diff --git a/lib/Alchemy/Phrasea/Setup/Version/Probe/ProbeInterface.php b/lib/Alchemy/Phrasea/Setup/Version/Probe/ProbeInterface.php index 956e05469f..a48bae1f58 100644 --- a/lib/Alchemy/Phrasea/Setup/Version/Probe/ProbeInterface.php +++ b/lib/Alchemy/Phrasea/Setup/Version/Probe/ProbeInterface.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. diff --git a/lib/Alchemy/Phrasea/Twig/BytesConverter.php b/lib/Alchemy/Phrasea/Twig/BytesConverter.php index c4f3016992..a451ff120c 100644 --- a/lib/Alchemy/Phrasea/Twig/BytesConverter.php +++ b/lib/Alchemy/Phrasea/Twig/BytesConverter.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. diff --git a/lib/Alchemy/Phrasea/Twig/Camelize.php b/lib/Alchemy/Phrasea/Twig/Camelize.php index bd93e93439..5933ab8553 100644 --- a/lib/Alchemy/Phrasea/Twig/Camelize.php +++ b/lib/Alchemy/Phrasea/Twig/Camelize.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. diff --git a/lib/Alchemy/Phrasea/Twig/Fit.php b/lib/Alchemy/Phrasea/Twig/Fit.php index b8b4f0741a..5520159d75 100644 --- a/lib/Alchemy/Phrasea/Twig/Fit.php +++ b/lib/Alchemy/Phrasea/Twig/Fit.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. diff --git a/lib/Alchemy/Phrasea/Utilities/Less/Builder.php b/lib/Alchemy/Phrasea/Utilities/Less/Builder.php index c5da858f8c..827c5ffdff 100644 --- a/lib/Alchemy/Phrasea/Utilities/Less/Builder.php +++ b/lib/Alchemy/Phrasea/Utilities/Less/Builder.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. diff --git a/lib/Alchemy/Phrasea/Utilities/Less/Compiler.php b/lib/Alchemy/Phrasea/Utilities/Less/Compiler.php index bc39ea61da..3d021b573f 100644 --- a/lib/Alchemy/Phrasea/Utilities/Less/Compiler.php +++ b/lib/Alchemy/Phrasea/Utilities/Less/Compiler.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. diff --git a/lib/Alchemy/Phrasea/Utilities/String/Camelizer.php b/lib/Alchemy/Phrasea/Utilities/String/Camelizer.php index d8cf62ea88..51e7b7dc69 100644 --- a/lib/Alchemy/Phrasea/Utilities/String/Camelizer.php +++ b/lib/Alchemy/Phrasea/Utilities/String/Camelizer.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. diff --git a/lib/Alchemy/Phrasea/Vocabulary/ControlProvider/ControlProviderInterface.php b/lib/Alchemy/Phrasea/Vocabulary/ControlProvider/ControlProviderInterface.php index 858e594f0c..5740dea00c 100644 --- a/lib/Alchemy/Phrasea/Vocabulary/ControlProvider/ControlProviderInterface.php +++ b/lib/Alchemy/Phrasea/Vocabulary/ControlProvider/ControlProviderInterface.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. diff --git a/lib/Alchemy/Phrasea/Vocabulary/ControlProvider/UserProvider.php b/lib/Alchemy/Phrasea/Vocabulary/ControlProvider/UserProvider.php index 31bf8bc1c5..cdde341ad2 100644 --- a/lib/Alchemy/Phrasea/Vocabulary/ControlProvider/UserProvider.php +++ b/lib/Alchemy/Phrasea/Vocabulary/ControlProvider/UserProvider.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. diff --git a/lib/Alchemy/Phrasea/Vocabulary/Controller.php b/lib/Alchemy/Phrasea/Vocabulary/Controller.php index e8fee12fd7..92225d266c 100644 --- a/lib/Alchemy/Phrasea/Vocabulary/Controller.php +++ b/lib/Alchemy/Phrasea/Vocabulary/Controller.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. diff --git a/lib/Alchemy/Phrasea/Vocabulary/Term.php b/lib/Alchemy/Phrasea/Vocabulary/Term.php index 0734682c8c..d36ada231e 100644 --- a/lib/Alchemy/Phrasea/Vocabulary/Term.php +++ b/lib/Alchemy/Phrasea/Vocabulary/Term.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. diff --git a/lib/classes/ACL.php b/lib/classes/ACL.php index c777f6693c..155650f73f 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Adapter.php b/lib/classes/API/OAuth2/Adapter.php index 89114b0002..3b0e73d2ec 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Application/Navigator.php b/lib/classes/API/OAuth2/Application/Navigator.php index acaada890b..a53986aa0f 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Application/OfficePlugin.php b/lib/classes/API/OAuth2/Application/OfficePlugin.php index 6d0e6e0192..da85c0c1d4 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/Exception.php b/lib/classes/API/OAuth2/Exception/Exception.php index 7c748c0b4a..2816b59a45 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/Interface.php b/lib/classes/API/OAuth2/Exception/Interface.php index a923764773..bc31cf7e01 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/Redirect.php b/lib/classes/API/OAuth2/Exception/Redirect.php index aa951aeb6a..6ad47a5c95 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/Redirect/AccessDenied.php b/lib/classes/API/OAuth2/Exception/Redirect/AccessDenied.php index ba1ccf87d5..3c1f7a7225 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/Redirect/InvalidClient.php b/lib/classes/API/OAuth2/Exception/Redirect/InvalidClient.php index dacace9a31..401df47d55 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/Redirect/InvalidRequest.php b/lib/classes/API/OAuth2/Exception/Redirect/InvalidRequest.php index 6d48c641e7..5822534599 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/Redirect/InvalidScope.php b/lib/classes/API/OAuth2/Exception/Redirect/InvalidScope.php index c0c0a23f44..3b170cafdb 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/Redirect/ServerError.php b/lib/classes/API/OAuth2/Exception/Redirect/ServerError.php index c900f04aeb..a8d204eb73 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/Redirect/TemporaryUnavailable.php b/lib/classes/API/OAuth2/Exception/Redirect/TemporaryUnavailable.php index ab130fdbaf..6779aa1569 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/Redirect/UnauthorizedClient.php b/lib/classes/API/OAuth2/Exception/Redirect/UnauthorizedClient.php index 4223080b03..10777698de 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/Redirect/UnsupportedResponseType.php b/lib/classes/API/OAuth2/Exception/Redirect/UnsupportedResponseType.php index a90381e93a..337d535067 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/WWWAuthenticate.php b/lib/classes/API/OAuth2/Exception/WWWAuthenticate.php index 2570c23eed..3b3f5e5dd9 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/ExpiredToken.php b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/ExpiredToken.php index e50097e9ab..9af1a653f1 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InsufficientScope.php b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InsufficientScope.php index 23e945b1ea..c845d62eb1 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidClient.php b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidClient.php index 7151365e0d..f86ecee43f 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidRequest.php b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidRequest.php index b614711aa6..ffd9b4c637 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidToken.php b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidToken.php index a345586b12..5750269631 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/BadRequest.php b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/BadRequest.php index 075461546e..cc9764ed57 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/Forbidden.php b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/Forbidden.php index e0b59fe309..7d9eaf9738 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/Unauthorized.php b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/Unauthorized.php index b8f0de6321..a9124369f3 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Form/DevAppDesktop.php b/lib/classes/API/OAuth2/Form/DevAppDesktop.php index 7b50727b71..35222eb83b 100644 --- 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. diff --git a/lib/classes/API/OAuth2/Form/DevAppInternet.php b/lib/classes/API/OAuth2/Form/DevAppInternet.php index e05fa297b3..3db541ccd8 100644 --- 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. diff --git a/lib/classes/API/Webhook.php b/lib/classes/API/Webhook.php index 08389682e9..de50697355 100644 --- 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. diff --git a/lib/classes/Bridge/Account.php b/lib/classes/Bridge/Account.php index ac0548d620..3029b6ef15 100644 --- 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. diff --git a/lib/classes/Bridge/AccountSettings.php b/lib/classes/Bridge/AccountSettings.php index ebb25fd9fd..0c53b03dfe 100644 --- 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. diff --git a/lib/classes/Bridge/Api.php b/lib/classes/Bridge/Api.php index 14753a4db1..88dcf9179c 100644 --- 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. diff --git a/lib/classes/Bridge/Api/Abstract.php b/lib/classes/Bridge/Api/Abstract.php index 8b0b1a00ba..fa7e2e5364 100644 --- 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. diff --git a/lib/classes/Bridge/Api/AbstractCollection.php b/lib/classes/Bridge/Api/AbstractCollection.php index 7980c74b24..d8798ce102 100644 --- 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. diff --git a/lib/classes/Bridge/Api/Auth/Abstract.php b/lib/classes/Bridge/Api/Auth/Abstract.php index b8c5929ab8..66add80848 100644 --- 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. diff --git a/lib/classes/Bridge/Api/Auth/Flickr.php b/lib/classes/Bridge/Api/Auth/Flickr.php index ba7e413f58..2ecc3ada3c 100644 --- 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. diff --git a/lib/classes/Bridge/Api/Auth/Interface.php b/lib/classes/Bridge/Api/Auth/Interface.php index 5a1626e032..6fe7605dfb 100644 --- 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. diff --git a/lib/classes/Bridge/Api/Auth/OAuth2.php b/lib/classes/Bridge/Api/Auth/OAuth2.php index 436b89d706..4f0d32179a 100644 --- 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. diff --git a/lib/classes/Bridge/Api/Auth/Youtube.php b/lib/classes/Bridge/Api/Auth/Youtube.php index 33adf4013c..580b23acc6 100644 --- 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. diff --git a/lib/classes/Bridge/Api/ContainerCollection.php b/lib/classes/Bridge/Api/ContainerCollection.php index 6b8c342bf7..67226748c9 100644 --- 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. diff --git a/lib/classes/Bridge/Api/ContainerInterface.php b/lib/classes/Bridge/Api/ContainerInterface.php index e003933c3b..dc53afdaa6 100644 --- 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. diff --git a/lib/classes/Bridge/Api/Dailymotion.php b/lib/classes/Bridge/Api/Dailymotion.php index 92828123d6..2facc8caa7 100644 --- 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. diff --git a/lib/classes/Bridge/Api/ElementCollection.php b/lib/classes/Bridge/Api/ElementCollection.php index 6fb60a86ff..bdeab338f1 100644 --- 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. diff --git a/lib/classes/Bridge/Api/ElementInterface.php b/lib/classes/Bridge/Api/ElementInterface.php index 348ba35cf5..7002616604 100644 --- 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. diff --git a/lib/classes/Bridge/Api/Flickr.php b/lib/classes/Bridge/Api/Flickr.php index 4b5a2be3a0..2d6b38ac3b 100644 --- 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. diff --git a/lib/classes/Bridge/Api/Flickr/Container.php b/lib/classes/Bridge/Api/Flickr/Container.php index 6b3c7e25d0..d6723022be 100644 --- 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. diff --git a/lib/classes/Bridge/Api/Flickr/Element.php b/lib/classes/Bridge/Api/Flickr/Element.php index 95ad3ae955..d82b801951 100644 --- 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. diff --git a/lib/classes/Bridge/Api/Interface.php b/lib/classes/Bridge/Api/Interface.php index 155029a613..c1925116ed 100644 --- 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. diff --git a/lib/classes/Bridge/Api/Youtube.php b/lib/classes/Bridge/Api/Youtube.php index e5a82ec640..dd06920a7d 100644 --- 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. diff --git a/lib/classes/Bridge/Api/Youtube/Container.php b/lib/classes/Bridge/Api/Youtube/Container.php index 1576cfc577..82f1ed479a 100644 --- 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. diff --git a/lib/classes/Bridge/Api/Youtube/Element.php b/lib/classes/Bridge/Api/Youtube/Element.php index 7162b9f172..676b38d3fc 100644 --- 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. diff --git a/lib/classes/Bridge/Element.php b/lib/classes/Bridge/Element.php index 8f241a9368..b896cc363e 100644 --- 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. diff --git a/lib/classes/Bridge/Exception.php b/lib/classes/Bridge/Exception.php index 58773754c8..befd8be039 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/AccountNotFound.php b/lib/classes/Bridge/Exception/AccountNotFound.php index f944b8ba9c..b9119c16cb 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ActionAuthBadConnection.php b/lib/classes/Bridge/Exception/ActionAuthBadConnection.php index f32af0bf5e..580e188804 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ActionAuthNeedReconnect.php b/lib/classes/Bridge/Exception/ActionAuthNeedReconnect.php index 64cd37e9e8..a8c939560b 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ActionForbidden.php b/lib/classes/Bridge/Exception/ActionForbidden.php index 42d40ac06e..9124883f31 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ActionInvalidObjectId.php b/lib/classes/Bridge/Exception/ActionInvalidObjectId.php index fdd037ceba..669d460104 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ActionMandatoryField.php b/lib/classes/Bridge/Exception/ActionMandatoryField.php index b6c98ec02e..55f3833071 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ApiConnectorAccessTokenFailed.php b/lib/classes/Bridge/Exception/ApiConnectorAccessTokenFailed.php index 2703ac5c2b..5bad4b0174 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ApiConnectorNotConfigured.php b/lib/classes/Bridge/Exception/ApiConnectorNotConfigured.php index 579dd040f5..a005b3c60f 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ApiConnectorNotConnected.php b/lib/classes/Bridge/Exception/ApiConnectorNotConnected.php index b230ede840..e2c20b81cd 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ApiConnectorNotFound.php b/lib/classes/Bridge/Exception/ApiConnectorNotFound.php index 532c2076b2..affe1b4d98 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ApiConnectorRequestFailed.php b/lib/classes/Bridge/Exception/ApiConnectorRequestFailed.php index a9ad88cafb..aabfb9827f 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ApiDisabled.php b/lib/classes/Bridge/Exception/ApiDisabled.php index e50b199b70..4c35fcd0f6 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ApiNotFound.php b/lib/classes/Bridge/Exception/ApiNotFound.php index 214c7a32b4..1b0f647cdc 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ContainerUnknown.php b/lib/classes/Bridge/Exception/ContainerUnknown.php index 8976f1a306..06069890ea 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ElementNotFound.php b/lib/classes/Bridge/Exception/ElementNotFound.php index 288c78c9ae..aad7cacd10 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ElementUnknown.php b/lib/classes/Bridge/Exception/ElementUnknown.php index 520f27ae54..931b13ccbe 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/InvalidRecordType.php b/lib/classes/Bridge/Exception/InvalidRecordType.php index 70ff94c36f..75e3bc44bd 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/ObjectUnknown.php b/lib/classes/Bridge/Exception/ObjectUnknown.php index 796dcc3f5a..9742a01c66 100644 --- 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. diff --git a/lib/classes/Bridge/Exception/TokenNotFound.php b/lib/classes/Bridge/Exception/TokenNotFound.php index 037ab1f4fc..f0632e6f1b 100644 --- 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. diff --git a/lib/classes/Exception/Abstract.php b/lib/classes/Exception/Abstract.php index 0a57183885..bd51eebf10 100644 --- 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. diff --git a/lib/classes/Exception/Databox/CollectionNotFound.php b/lib/classes/Exception/Databox/CollectionNotFound.php index e959888f4c..81a4d70ff6 100644 --- 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. diff --git a/lib/classes/Exception/Databox/FieldNotFound.php b/lib/classes/Exception/Databox/FieldNotFound.php index e363600141..d1e9205495 100644 --- 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. diff --git a/lib/classes/Exception/Databox/SubdefNotFound.php b/lib/classes/Exception/Databox/SubdefNotFound.php index 21c651b49f..61738b39a8 100644 --- 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. diff --git a/lib/classes/Exception/Databox/metadataDescriptionNotFound.php b/lib/classes/Exception/Databox/metadataDescriptionNotFound.php index a25ecc8944..417632b83e 100644 --- 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. diff --git a/lib/classes/Exception/InternalServerError.php b/lib/classes/Exception/InternalServerError.php index e0b23c71fe..35f90fd46d 100644 --- 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. diff --git a/lib/classes/Exception/InvalidArgument.php b/lib/classes/Exception/InvalidArgument.php index fb8d9bf1d3..41f5502e50 100644 --- 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. diff --git a/lib/classes/Exception/Media/SubdefNotFound.php b/lib/classes/Exception/Media/SubdefNotFound.php index ad4fa4f3fd..7097d43477 100644 --- 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. diff --git a/lib/classes/Exception/Record/AdapterNotFound.php b/lib/classes/Exception/Record/AdapterNotFound.php index 66212fa906..97743416b0 100644 --- 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. diff --git a/lib/classes/Exception/Session/LoggerNotFound.php b/lib/classes/Exception/Session/LoggerNotFound.php index e2074d6c84..2560be5ea8 100644 --- 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. diff --git a/lib/classes/Exception/Setup/CannotWriteLockFile.php b/lib/classes/Exception/Setup/CannotWriteLockFile.php index 69d9d0a4cd..dc44e7db9a 100644 --- 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. diff --git a/lib/classes/Exception/Setup/FixBadEmailAddresses.php b/lib/classes/Exception/Setup/FixBadEmailAddresses.php index e81f9d5187..a259bb05bb 100644 --- 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. diff --git a/lib/classes/Exception/Setup/PhraseaAlreadyInstalled.php b/lib/classes/Exception/Setup/PhraseaAlreadyInstalled.php index ba22ced53c..687f51a108 100644 --- 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. diff --git a/lib/classes/Exception/Setup/UpgradeAlreadyStarted.php b/lib/classes/Exception/Setup/UpgradeAlreadyStarted.php index a70dd0280a..c6026364cc 100644 --- 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. diff --git a/lib/classes/Exception/Upload/CannotWriteFile.php b/lib/classes/Exception/Upload/CannotWriteFile.php index 7144fdd8dc..3399fbda68 100644 --- 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. diff --git a/lib/classes/Exception/Upload/Error.php b/lib/classes/Exception/Upload/Error.php index 35f2554a48..59866b5fbc 100644 --- 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. diff --git a/lib/classes/Exception/Upload/FileTooBig.php b/lib/classes/Exception/Upload/FileTooBig.php index 8dbcc5ff83..9df6b26d44 100644 --- 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. diff --git a/lib/classes/Session/Logger.php b/lib/classes/Session/Logger.php index 2b86e5d3fa..0d5ce0e79b 100644 --- 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. diff --git a/lib/classes/Setup/Upgrade.php b/lib/classes/Setup/Upgrade.php index d796f9aece..6220eb4884 100644 --- 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. diff --git a/lib/classes/User/Query.php b/lib/classes/User/Query.php index a7953a9322..66a922f36a 100644 --- 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. diff --git a/lib/classes/User/QueryInterface.php b/lib/classes/User/QueryInterface.php index e2e93acf52..44ddc4e467 100644 --- 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. diff --git a/lib/classes/appbox.php b/lib/classes/appbox.php index 9fae1cbaf0..5ff2f82235 100644 --- 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. diff --git a/lib/classes/base.php b/lib/classes/base.php index 771ab8cd85..051fe8c627 100644 --- 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. diff --git a/lib/classes/cache/cacheableInterface.php b/lib/classes/cache/cacheableInterface.php index 5a3b08a663..7b0c0420d0 100644 --- 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. diff --git a/lib/classes/cache/databox.php b/lib/classes/cache/databox.php index fc7f945038..2c3bdb00c9 100644 --- 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. diff --git a/lib/classes/caption/Field/ThesaurusValue.php b/lib/classes/caption/Field/ThesaurusValue.php index 8554dd70a9..d58231bb19 100644 --- 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. diff --git a/lib/classes/caption/Field/Value.php b/lib/classes/caption/Field/Value.php index 5eea6200ed..429c41a8db 100644 --- 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. diff --git a/lib/classes/caption/field.php b/lib/classes/caption/field.php index 07efb26010..c945c697cc 100644 --- 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. diff --git a/lib/classes/caption/interface.php b/lib/classes/caption/interface.php index c523b22f54..779f259f0a 100644 --- 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. diff --git a/lib/classes/caption/record.php b/lib/classes/caption/record.php index 9718b399cd..736eda19d5 100644 --- 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. diff --git a/lib/classes/collection.php b/lib/classes/collection.php index c1ed5a2f0b..a79bf6f626 100644 --- a/lib/classes/collection.php +++ b/lib/classes/collection.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. diff --git a/lib/classes/connection/pdoStatement.php b/lib/classes/connection/pdoStatement.php index 7386c54837..f7ebce70a3 100644 --- a/lib/classes/connection/pdoStatement.php +++ b/lib/classes/connection/pdoStatement.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. diff --git a/lib/classes/connection/pdoStatementReconnectable.php b/lib/classes/connection/pdoStatementReconnectable.php index 4216d55af1..04c150cbd8 100644 --- a/lib/classes/connection/pdoStatementReconnectable.php +++ b/lib/classes/connection/pdoStatementReconnectable.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. diff --git a/lib/classes/connection/statement.php b/lib/classes/connection/statement.php index 12317cf259..3a2243bb38 100644 --- a/lib/classes/connection/statement.php +++ b/lib/classes/connection/statement.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. diff --git a/lib/classes/databox.php b/lib/classes/databox.php index 63744352ca..c8d53f7667 100644 --- a/lib/classes/databox.php +++ b/lib/classes/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. @@ -625,6 +625,10 @@ class databox extends base ]); $conn->connect(); + if (false === $connection->supportInnoDB()) { + throw new \Exception('Database server does not support InnoDB storage engine'); + } + $conn = $app['phraseanet.appbox']->get_connection(); $sql = 'SELECT MAX(ord) as ord FROM sbas'; $stmt = $conn->prepare($sql); diff --git a/lib/classes/databox/Field/DCES/Contributor.php b/lib/classes/databox/Field/DCES/Contributor.php index aefe2ba28e..d0df516cee 100644 --- a/lib/classes/databox/Field/DCES/Contributor.php +++ b/lib/classes/databox/Field/DCES/Contributor.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. diff --git a/lib/classes/databox/Field/DCES/Coverage.php b/lib/classes/databox/Field/DCES/Coverage.php index ad0915dabd..57df366ccb 100644 --- a/lib/classes/databox/Field/DCES/Coverage.php +++ b/lib/classes/databox/Field/DCES/Coverage.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. diff --git a/lib/classes/databox/Field/DCES/Creator.php b/lib/classes/databox/Field/DCES/Creator.php index 380c5edead..a2952c908b 100644 --- a/lib/classes/databox/Field/DCES/Creator.php +++ b/lib/classes/databox/Field/DCES/Creator.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. diff --git a/lib/classes/databox/Field/DCES/Date.php b/lib/classes/databox/Field/DCES/Date.php index e8a97781ab..b3636f3144 100644 --- a/lib/classes/databox/Field/DCES/Date.php +++ b/lib/classes/databox/Field/DCES/Date.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. diff --git a/lib/classes/databox/Field/DCES/Description.php b/lib/classes/databox/Field/DCES/Description.php index a6e01de245..9ba0e6dd2c 100644 --- a/lib/classes/databox/Field/DCES/Description.php +++ b/lib/classes/databox/Field/DCES/Description.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. diff --git a/lib/classes/databox/Field/DCES/Format.php b/lib/classes/databox/Field/DCES/Format.php index f7cea07b8b..249226b22b 100644 --- a/lib/classes/databox/Field/DCES/Format.php +++ b/lib/classes/databox/Field/DCES/Format.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. diff --git a/lib/classes/databox/Field/DCES/Identifier.php b/lib/classes/databox/Field/DCES/Identifier.php index 77d2d59bd7..2425dc7c2b 100644 --- a/lib/classes/databox/Field/DCES/Identifier.php +++ b/lib/classes/databox/Field/DCES/Identifier.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. diff --git a/lib/classes/databox/Field/DCES/Language.php b/lib/classes/databox/Field/DCES/Language.php index bd4d9859cf..6baa7a4551 100644 --- a/lib/classes/databox/Field/DCES/Language.php +++ b/lib/classes/databox/Field/DCES/Language.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. diff --git a/lib/classes/databox/Field/DCES/Publisher.php b/lib/classes/databox/Field/DCES/Publisher.php index 1e3003bf91..12a64208f5 100644 --- a/lib/classes/databox/Field/DCES/Publisher.php +++ b/lib/classes/databox/Field/DCES/Publisher.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. diff --git a/lib/classes/databox/Field/DCES/Relation.php b/lib/classes/databox/Field/DCES/Relation.php index ad05a319a7..f3e7a9d819 100644 --- a/lib/classes/databox/Field/DCES/Relation.php +++ b/lib/classes/databox/Field/DCES/Relation.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. diff --git a/lib/classes/databox/Field/DCES/Rights.php b/lib/classes/databox/Field/DCES/Rights.php index 68d74272e5..67be8cd49d 100644 --- a/lib/classes/databox/Field/DCES/Rights.php +++ b/lib/classes/databox/Field/DCES/Rights.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. diff --git a/lib/classes/databox/Field/DCES/Source.php b/lib/classes/databox/Field/DCES/Source.php index 2f52bfbf58..7624f518b1 100644 --- a/lib/classes/databox/Field/DCES/Source.php +++ b/lib/classes/databox/Field/DCES/Source.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. diff --git a/lib/classes/databox/Field/DCES/Subject.php b/lib/classes/databox/Field/DCES/Subject.php index 7f091e1858..d53ba821bb 100644 --- a/lib/classes/databox/Field/DCES/Subject.php +++ b/lib/classes/databox/Field/DCES/Subject.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. diff --git a/lib/classes/databox/Field/DCES/Title.php b/lib/classes/databox/Field/DCES/Title.php index 78ddc76507..377a71e349 100644 --- a/lib/classes/databox/Field/DCES/Title.php +++ b/lib/classes/databox/Field/DCES/Title.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. diff --git a/lib/classes/databox/Field/DCES/Type.php b/lib/classes/databox/Field/DCES/Type.php index 47fdf732a2..6a18535c6e 100644 --- a/lib/classes/databox/Field/DCES/Type.php +++ b/lib/classes/databox/Field/DCES/Type.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. diff --git a/lib/classes/databox/Field/DCESAbstract.php b/lib/classes/databox/Field/DCESAbstract.php index e9caeb2352..085de04b22 100644 --- a/lib/classes/databox/Field/DCESAbstract.php +++ b/lib/classes/databox/Field/DCESAbstract.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. diff --git a/lib/classes/databox/cgu.php b/lib/classes/databox/cgu.php index 6bf4234c5d..5ee28ca337 100644 --- a/lib/classes/databox/cgu.php +++ b/lib/classes/databox/cgu.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. diff --git a/lib/classes/databox/descriptionStructure.php b/lib/classes/databox/descriptionStructure.php index 01f0ca49de..5896cf882d 100644 --- a/lib/classes/databox/descriptionStructure.php +++ b/lib/classes/databox/descriptionStructure.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. diff --git a/lib/classes/databox/field.php b/lib/classes/databox/field.php index 34f916f1f3..c60dec337b 100644 --- a/lib/classes/databox/field.php +++ b/lib/classes/databox/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. diff --git a/lib/classes/databox/status.php b/lib/classes/databox/status.php index 76e2b6e4f5..4842169846 100644 --- a/lib/classes/databox/status.php +++ b/lib/classes/databox/status.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. diff --git a/lib/classes/databox/subdef.php b/lib/classes/databox/subdef.php index 6ca49c1e9e..9331b17efa 100644 --- a/lib/classes/databox/subdef.php +++ b/lib/classes/databox/subdef.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. diff --git a/lib/classes/databox/subdefsStructure.php b/lib/classes/databox/subdefsStructure.php index 73f1ccb895..e2904f0863 100644 --- a/lib/classes/databox/subdefsStructure.php +++ b/lib/classes/databox/subdefsStructure.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. diff --git a/lib/classes/eventsmanager/notify/autoregister.php b/lib/classes/eventsmanager/notify/autoregister.php index 17f9e717a6..b1c7fb4b0d 100644 --- a/lib/classes/eventsmanager/notify/autoregister.php +++ b/lib/classes/eventsmanager/notify/autoregister.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. diff --git a/lib/classes/eventsmanager/notify/bridgeuploadfail.php b/lib/classes/eventsmanager/notify/bridgeuploadfail.php index f8496ebc12..d3b083e702 100644 --- a/lib/classes/eventsmanager/notify/bridgeuploadfail.php +++ b/lib/classes/eventsmanager/notify/bridgeuploadfail.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. diff --git a/lib/classes/eventsmanager/notify/downloadmailfail.php b/lib/classes/eventsmanager/notify/downloadmailfail.php index f1cdc15d18..8c36376168 100644 --- a/lib/classes/eventsmanager/notify/downloadmailfail.php +++ b/lib/classes/eventsmanager/notify/downloadmailfail.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. diff --git a/lib/classes/eventsmanager/notify/feed.php b/lib/classes/eventsmanager/notify/feed.php index 84e4d36575..5bbab9e7b6 100644 --- a/lib/classes/eventsmanager/notify/feed.php +++ b/lib/classes/eventsmanager/notify/feed.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. diff --git a/lib/classes/eventsmanager/notify/order.php b/lib/classes/eventsmanager/notify/order.php index 928bae6352..e09c60cbf6 100644 --- a/lib/classes/eventsmanager/notify/order.php +++ b/lib/classes/eventsmanager/notify/order.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. diff --git a/lib/classes/eventsmanager/notify/orderdeliver.php b/lib/classes/eventsmanager/notify/orderdeliver.php index 5ea6916f76..968d639f1b 100644 --- a/lib/classes/eventsmanager/notify/orderdeliver.php +++ b/lib/classes/eventsmanager/notify/orderdeliver.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. diff --git a/lib/classes/eventsmanager/notify/ordernotdelivered.php b/lib/classes/eventsmanager/notify/ordernotdelivered.php index 7986c0692d..cee7bc9ba3 100644 --- a/lib/classes/eventsmanager/notify/ordernotdelivered.php +++ b/lib/classes/eventsmanager/notify/ordernotdelivered.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. diff --git a/lib/classes/eventsmanager/notify/push.php b/lib/classes/eventsmanager/notify/push.php index e06c7d0c6c..d6f00ec6ed 100644 --- a/lib/classes/eventsmanager/notify/push.php +++ b/lib/classes/eventsmanager/notify/push.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. diff --git a/lib/classes/eventsmanager/notify/register.php b/lib/classes/eventsmanager/notify/register.php index 4a7d4dc5cc..8525d19345 100644 --- a/lib/classes/eventsmanager/notify/register.php +++ b/lib/classes/eventsmanager/notify/register.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. diff --git a/lib/classes/eventsmanager/notify/uploadquarantine.php b/lib/classes/eventsmanager/notify/uploadquarantine.php index 49bdbbc4a1..83929c5399 100644 --- a/lib/classes/eventsmanager/notify/uploadquarantine.php +++ b/lib/classes/eventsmanager/notify/uploadquarantine.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. diff --git a/lib/classes/eventsmanager/notify/validate.php b/lib/classes/eventsmanager/notify/validate.php index 138cd7295e..0cb380526f 100644 --- a/lib/classes/eventsmanager/notify/validate.php +++ b/lib/classes/eventsmanager/notify/validate.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. diff --git a/lib/classes/eventsmanager/notify/validationdone.php b/lib/classes/eventsmanager/notify/validationdone.php index 38d593b334..4937eb0e04 100644 --- a/lib/classes/eventsmanager/notify/validationdone.php +++ b/lib/classes/eventsmanager/notify/validationdone.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. diff --git a/lib/classes/eventsmanager/notify/validationreminder.php b/lib/classes/eventsmanager/notify/validationreminder.php index 714381f5b0..d730b455c2 100644 --- a/lib/classes/eventsmanager/notify/validationreminder.php +++ b/lib/classes/eventsmanager/notify/validationreminder.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. diff --git a/lib/classes/ftpclient.php b/lib/classes/ftpclient.php index 6cffd73a07..ba4f5cba18 100644 --- a/lib/classes/ftpclient.php +++ b/lib/classes/ftpclient.php @@ -43,15 +43,21 @@ class ftpclient throw new Exception('Nom d\'hote incorrect ' . $host); } - if ($ssl === true) { - if (($this->connexion = @ftp_ssl_connect($host, $port, $timeout)) === false) { - throw new Exception('Impossible de se connecter au serveur FTP en SSL'); - } - } else { - if (($this->connexion = @ftp_connect($host, $port, $timeout)) === false) { - throw new Exception('Impossible de se connecter au serveur FTP ' . $host . ":$port $timeout"); + try { + if ($ssl === true) { + if (($this->connexion = @ftp_ssl_connect($host, $port, $timeout)) === false) { + throw new Exception('Impossible de se connecter au serveur FTP en SSL'); + } + } else { + if (($this->connexion = @ftp_connect($host, $port, $timeout)) === false) { + throw new Exception('Impossible de se connecter au serveur FTP ' . $host . ":$port $timeout"); + } } } + catch(\Exception $e) { + // any unknown pb + throw $e; + } return $this; } diff --git a/lib/classes/http/query.php b/lib/classes/http/query.php index 7e31355233..698307c853 100644 --- a/lib/classes/http/query.php +++ b/lib/classes/http/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. diff --git a/lib/classes/media/Permalink/Adapter.php b/lib/classes/media/Permalink/Adapter.php index 94a7eec76d..c1b0273ecf 100644 --- a/lib/classes/media/Permalink/Adapter.php +++ b/lib/classes/media/Permalink/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. diff --git a/lib/classes/media/Permalink/Interface.php b/lib/classes/media/Permalink/Interface.php index bb2568dcb8..a37928f63f 100644 --- a/lib/classes/media/Permalink/Interface.php +++ b/lib/classes/media/Permalink/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. diff --git a/lib/classes/media/abstract.php b/lib/classes/media/abstract.php index c807be9087..e5398bb17f 100644 --- a/lib/classes/media/abstract.php +++ b/lib/classes/media/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. diff --git a/lib/classes/media/adapter.php b/lib/classes/media/adapter.php index e5329da375..91f9a95417 100644 --- a/lib/classes/media/adapter.php +++ b/lib/classes/media/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. diff --git a/lib/classes/media/subdef.php b/lib/classes/media/subdef.php index 6d364af6ce..a49ac8a8ec 100644 --- a/lib/classes/media/subdef.php +++ b/lib/classes/media/subdef.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. @@ -206,7 +206,8 @@ class media_subdef extends media_abstract implements cache_cacheableInterface $this->mime = $row['mime']; $this->file = $row['file']; $this->path = p4string::addEndSlash($row['path']); - $this->etag = $row['etag'] !== null ? $row['etag'] : file_exists($this->get_pathfile()) ? sha1_file($this->get_pathfile()) : null; + $this->is_physically_present = file_exists($this->get_pathfile()); + $this->etag = $row['etag']; $this->is_substituted = ! ! $row['substit']; $this->subdef_id = (int) $row['subdef_id']; @@ -215,7 +216,6 @@ class media_subdef extends media_abstract implements cache_cacheableInterface if ($row['created_on']) $this->creation_date = new DateTime($row['created_on']); - $this->is_physically_present = true; } elseif ($substitute === false) { throw new Exception_Media_SubdefNotFound($this->name . ' not found'); } @@ -346,7 +346,10 @@ class media_subdef extends media_abstract implements cache_cacheableInterface public function getEtag() { if (!$this->etag && $this->is_physically_present()) { - $this->setEtag(sha1_file($this->get_pathfile())); + $file = new SplFileInfo($this->get_pathfile()); + if ($file->isFile()) { + $this->setEtag(md5($file->getMTime())); + } } return $this->etag; @@ -364,6 +367,23 @@ class media_subdef extends media_abstract implements cache_cacheableInterface return $this; } + public function set_substituted($substit) + { + $this->is_substituted = !!$substit; + + $sql = "UPDATE subdef SET substit = :substit, updated_on=NOW() WHERE subdef_id = :subdef_id"; + $stmt = $this->record->get_databox()->get_connection()->prepare($sql); + $stmt->execute(array( + ':subdef_id' => $this->subdef_id, + ':substit' => $this->is_substituted + )); + $stmt->closeCursor(); + + $this->delete_data_from_cache(); + + return $this; + } + /** * * @return int @@ -737,7 +757,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface if ($this->get_name() === 'thumbnail') { if ($this->app['phraseanet.static-file-factory']->isStaticFileModeEnabled() && null !== $url = $this->app['phraseanet.static-file']->getUrl($this->get_pathfile())) { - $this->url = $url; + $this->url = $url. "?etag=".$this->getEtag(); return; } diff --git a/lib/classes/module/console/aboutAuthors.php b/lib/classes/module/console/aboutAuthors.php index 342e96073e..0f601cac8f 100644 --- a/lib/classes/module/console/aboutAuthors.php +++ b/lib/classes/module/console/aboutAuthors.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. diff --git a/lib/classes/module/console/aboutLicense.php b/lib/classes/module/console/aboutLicense.php index d8a8091f18..2319071c87 100644 --- a/lib/classes/module/console/aboutLicense.php +++ b/lib/classes/module/console/aboutLicense.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. diff --git a/lib/classes/module/console/checkExtension.php b/lib/classes/module/console/checkExtension.php index 9ccfc60470..aac66f781a 100644 --- a/lib/classes/module/console/checkExtension.php +++ b/lib/classes/module/console/checkExtension.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. diff --git a/lib/classes/module/console/fieldsDelete.php b/lib/classes/module/console/fieldsDelete.php index 5207f49c22..57d74c397c 100644 --- a/lib/classes/module/console/fieldsDelete.php +++ b/lib/classes/module/console/fieldsDelete.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. diff --git a/lib/classes/module/console/fieldsList.php b/lib/classes/module/console/fieldsList.php index c969b3c01a..b33481414e 100644 --- a/lib/classes/module/console/fieldsList.php +++ b/lib/classes/module/console/fieldsList.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. diff --git a/lib/classes/module/console/fieldsMerge.php b/lib/classes/module/console/fieldsMerge.php index 61a78ddc5f..79a262aede 100644 --- a/lib/classes/module/console/fieldsMerge.php +++ b/lib/classes/module/console/fieldsMerge.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. diff --git a/lib/classes/module/console/fieldsRename.php b/lib/classes/module/console/fieldsRename.php index 9189a9f06d..30f8fb76eb 100644 --- a/lib/classes/module/console/fieldsRename.php +++ b/lib/classes/module/console/fieldsRename.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. diff --git a/lib/classes/module/console/sphinxGenerateSuggestion.php b/lib/classes/module/console/sphinxGenerateSuggestion.php index 5453d8a994..59f127bbca 100644 --- a/lib/classes/module/console/sphinxGenerateSuggestion.php +++ b/lib/classes/module/console/sphinxGenerateSuggestion.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. diff --git a/lib/classes/module/console/systemBackupDB.php b/lib/classes/module/console/systemBackupDB.php index 29bf4e6071..9dbb391e19 100644 --- a/lib/classes/module/console/systemBackupDB.php +++ b/lib/classes/module/console/systemBackupDB.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. diff --git a/lib/classes/module/console/systemClearCache.php b/lib/classes/module/console/systemClearCache.php index 5950053f75..1c49f37c8e 100644 --- a/lib/classes/module/console/systemClearCache.php +++ b/lib/classes/module/console/systemClearCache.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. diff --git a/lib/classes/module/console/systemExport.php b/lib/classes/module/console/systemExport.php index b6a24cdbd3..68946ccdde 100644 --- a/lib/classes/module/console/systemExport.php +++ b/lib/classes/module/console/systemExport.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. diff --git a/lib/classes/module/console/systemMailCheck.php b/lib/classes/module/console/systemMailCheck.php index 72b8171f03..ca93ed0313 100644 --- a/lib/classes/module/console/systemMailCheck.php +++ b/lib/classes/module/console/systemMailCheck.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. diff --git a/lib/classes/module/console/systemTemplateGenerator.php b/lib/classes/module/console/systemTemplateGenerator.php index 49b892ef8c..7647544770 100644 --- a/lib/classes/module/console/systemTemplateGenerator.php +++ b/lib/classes/module/console/systemTemplateGenerator.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. diff --git a/lib/classes/module/console/systemUpgrade.php b/lib/classes/module/console/systemUpgrade.php index 14a738a623..48b8641e78 100644 --- a/lib/classes/module/console/systemUpgrade.php +++ b/lib/classes/module/console/systemUpgrade.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. diff --git a/lib/classes/module/report.php b/lib/classes/module/report.php index e502f3dd91..ff2286e8b4 100644 --- a/lib/classes/module/report.php +++ b/lib/classes/module/report.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. diff --git a/lib/classes/module/report/activity.php b/lib/classes/module/report/activity.php index 853d1c947b..022279366f 100644 --- a/lib/classes/module/report/activity.php +++ b/lib/classes/module/report/activity.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. diff --git a/lib/classes/module/report/add.php b/lib/classes/module/report/add.php index 2b31ccdf49..f42d649454 100644 --- a/lib/classes/module/report/add.php +++ b/lib/classes/module/report/add.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. diff --git a/lib/classes/module/report/connexion.php b/lib/classes/module/report/connexion.php index 9f8992e4d6..7c1fdfbaf1 100644 --- a/lib/classes/module/report/connexion.php +++ b/lib/classes/module/report/connexion.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. diff --git a/lib/classes/module/report/dashboard.php b/lib/classes/module/report/dashboard.php index 46fd433548..2f5eeb7670 100644 --- a/lib/classes/module/report/dashboard.php +++ b/lib/classes/module/report/dashboard.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. diff --git a/lib/classes/module/report/dashboard/componentInterface.php b/lib/classes/module/report/dashboard/componentInterface.php index d12b65aa9e..01a213c6da 100644 --- a/lib/classes/module/report/dashboard/componentInterface.php +++ b/lib/classes/module/report/dashboard/componentInterface.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. diff --git a/lib/classes/module/report/dashboard/feed.php b/lib/classes/module/report/dashboard/feed.php index fba2907810..a8258c33a2 100644 --- a/lib/classes/module/report/dashboard/feed.php +++ b/lib/classes/module/report/dashboard/feed.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. diff --git a/lib/classes/module/report/dashboard/group.php b/lib/classes/module/report/dashboard/group.php index 1f0d6544ad..26cb051769 100644 --- a/lib/classes/module/report/dashboard/group.php +++ b/lib/classes/module/report/dashboard/group.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. diff --git a/lib/classes/module/report/dashboard/merge.php b/lib/classes/module/report/dashboard/merge.php index edfb626fdd..0034ff6124 100644 --- a/lib/classes/module/report/dashboard/merge.php +++ b/lib/classes/module/report/dashboard/merge.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. diff --git a/lib/classes/module/report/dashboard/sort.php b/lib/classes/module/report/dashboard/sort.php index 480f3a3a19..2d8259021c 100644 --- a/lib/classes/module/report/dashboard/sort.php +++ b/lib/classes/module/report/dashboard/sort.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. diff --git a/lib/classes/module/report/download.php b/lib/classes/module/report/download.php index 3a36b0365b..11672d212d 100644 --- a/lib/classes/module/report/download.php +++ b/lib/classes/module/report/download.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. diff --git a/lib/classes/module/report/edit.php b/lib/classes/module/report/edit.php index b435af72db..afc30e52b0 100644 --- a/lib/classes/module/report/edit.php +++ b/lib/classes/module/report/edit.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. diff --git a/lib/classes/module/report/filter.php b/lib/classes/module/report/filter.php index abc6568434..23ef3525e4 100644 --- a/lib/classes/module/report/filter.php +++ b/lib/classes/module/report/filter.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. diff --git a/lib/classes/module/report/nav.php b/lib/classes/module/report/nav.php index 061acbb47b..3dc298a6f7 100644 --- a/lib/classes/module/report/nav.php +++ b/lib/classes/module/report/nav.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. diff --git a/lib/classes/module/report/push.php b/lib/classes/module/report/push.php index d161b521c9..f189cfd87b 100644 --- a/lib/classes/module/report/push.php +++ b/lib/classes/module/report/push.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. diff --git a/lib/classes/module/report/question.php b/lib/classes/module/report/question.php index c417dfa651..e5464de999 100644 --- a/lib/classes/module/report/question.php +++ b/lib/classes/module/report/question.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. diff --git a/lib/classes/module/report/sent.php b/lib/classes/module/report/sent.php index f330210a86..05da9e024e 100644 --- a/lib/classes/module/report/sent.php +++ b/lib/classes/module/report/sent.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. diff --git a/lib/classes/module/report/sql.php b/lib/classes/module/report/sql.php index 970dd1ca03..aff62f62c4 100644 --- a/lib/classes/module/report/sql.php +++ b/lib/classes/module/report/sql.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. diff --git a/lib/classes/module/report/sqlReportInterface.php b/lib/classes/module/report/sqlReportInterface.php index 2adb20a551..31521fac84 100644 --- a/lib/classes/module/report/sqlReportInterface.php +++ b/lib/classes/module/report/sqlReportInterface.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. diff --git a/lib/classes/module/report/sqlaction.php b/lib/classes/module/report/sqlaction.php index 4a6113b614..d84b60b50e 100644 --- a/lib/classes/module/report/sqlaction.php +++ b/lib/classes/module/report/sqlaction.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. diff --git a/lib/classes/module/report/sqlconnexion.php b/lib/classes/module/report/sqlconnexion.php index 3f9f0c6fd8..9593f38604 100644 --- a/lib/classes/module/report/sqlconnexion.php +++ b/lib/classes/module/report/sqlconnexion.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. diff --git a/lib/classes/module/report/sqldownload.php b/lib/classes/module/report/sqldownload.php index dd62cee444..ed26922ae8 100644 --- a/lib/classes/module/report/sqldownload.php +++ b/lib/classes/module/report/sqldownload.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. diff --git a/lib/classes/module/report/sqlfilter.php b/lib/classes/module/report/sqlfilter.php index f5830b8c17..71ef0bfa89 100644 --- a/lib/classes/module/report/sqlfilter.php +++ b/lib/classes/module/report/sqlfilter.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. diff --git a/lib/classes/module/report/sqlquestion.php b/lib/classes/module/report/sqlquestion.php index 26d7832958..68d8d0c35f 100644 --- a/lib/classes/module/report/sqlquestion.php +++ b/lib/classes/module/report/sqlquestion.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. diff --git a/lib/classes/module/report/validate.php b/lib/classes/module/report/validate.php index 6c4223e516..38426e95b3 100644 --- a/lib/classes/module/report/validate.php +++ b/lib/classes/module/report/validate.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. diff --git a/lib/classes/patch/320alpha1a.php b/lib/classes/patch/320alpha1a.php index 8b7c4bf605..2dcb793f26 100644 --- a/lib/classes/patch/320alpha1a.php +++ b/lib/classes/patch/320alpha1a.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. diff --git a/lib/classes/patch/320alpha1b.php b/lib/classes/patch/320alpha1b.php index a709f83a15..167435e55e 100644 --- a/lib/classes/patch/320alpha1b.php +++ b/lib/classes/patch/320alpha1b.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. diff --git a/lib/classes/patch/320alpha2a.php b/lib/classes/patch/320alpha2a.php index 8fbfae522e..e5ba96420f 100644 --- a/lib/classes/patch/320alpha2a.php +++ b/lib/classes/patch/320alpha2a.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. diff --git a/lib/classes/patch/320alpha3a.php b/lib/classes/patch/320alpha3a.php index d76dc866b6..787a0370d1 100644 --- a/lib/classes/patch/320alpha3a.php +++ b/lib/classes/patch/320alpha3a.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. diff --git a/lib/classes/patch/320alpha4a.php b/lib/classes/patch/320alpha4a.php index 7e8ccf48cc..c248e11514 100644 --- a/lib/classes/patch/320alpha4a.php +++ b/lib/classes/patch/320alpha4a.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. diff --git a/lib/classes/patch/320alpha4b.php b/lib/classes/patch/320alpha4b.php index 9f55e83a2f..e728cda731 100644 --- a/lib/classes/patch/320alpha4b.php +++ b/lib/classes/patch/320alpha4b.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. @@ -91,6 +91,8 @@ class patch_320alpha4b extends patchAbstract } $feed = $this->get_feed($appbox, $user, $row['pub_restrict'], $row['homelink'], $app); + $feed = $this->get_feed($app, $appbox, $user, $row['pub_restrict'], $row['homelink']); + if (! $feed instanceof Feed) { continue; } @@ -174,7 +176,7 @@ class patch_320alpha4b extends patchAbstract } protected static $feeds = []; - protected function get_feed(appbox $appbox, User $user, $pub_restrict, $homelink, Application $app) + protected function get_feed(Application $app, appbox $appbox, User $user, $pub_restrict, $homelink) { $user_key = 'user_' . $user->getId(); if ($homelink == '1') { diff --git a/lib/classes/patch/320alpha5a.php b/lib/classes/patch/320alpha5a.php index 1cabd25c1e..cc57d1b4d5 100644 --- a/lib/classes/patch/320alpha5a.php +++ b/lib/classes/patch/320alpha5a.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. diff --git a/lib/classes/patch/320alpha6a.php b/lib/classes/patch/320alpha6a.php index ccc9d753da..8ec6d92983 100644 --- a/lib/classes/patch/320alpha6a.php +++ b/lib/classes/patch/320alpha6a.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. diff --git a/lib/classes/patch/320alpha8a.php b/lib/classes/patch/320alpha8a.php index 890df24136..e06a293adb 100644 --- a/lib/classes/patch/320alpha8a.php +++ b/lib/classes/patch/320alpha8a.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. diff --git a/lib/classes/patch/360alpha1a.php b/lib/classes/patch/360alpha1a.php index 687b060f0c..f4ace5fa8f 100644 --- a/lib/classes/patch/360alpha1a.php +++ b/lib/classes/patch/360alpha1a.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. diff --git a/lib/classes/patch/360alpha1b.php b/lib/classes/patch/360alpha1b.php index 55a86dcdd7..e7e2d989c2 100644 --- a/lib/classes/patch/360alpha1b.php +++ b/lib/classes/patch/360alpha1b.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. diff --git a/lib/classes/patch/360alpha2a.php b/lib/classes/patch/360alpha2a.php index 09c66cae77..725d1ae7e1 100644 --- a/lib/classes/patch/360alpha2a.php +++ b/lib/classes/patch/360alpha2a.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. diff --git a/lib/classes/patch/360alpha2b.php b/lib/classes/patch/360alpha2b.php index 14ac564147..205dba4817 100644 --- a/lib/classes/patch/360alpha2b.php +++ b/lib/classes/patch/360alpha2b.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. diff --git a/lib/classes/patch/361alpha1a.php b/lib/classes/patch/361alpha1a.php index a7db9cd319..03a50b5201 100644 --- a/lib/classes/patch/361alpha1a.php +++ b/lib/classes/patch/361alpha1a.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. diff --git a/lib/classes/patch/370alpha1a.php b/lib/classes/patch/370alpha1a.php index 7bd2e8b024..cfb20f3cd3 100644 --- a/lib/classes/patch/370alpha1a.php +++ b/lib/classes/patch/370alpha1a.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. diff --git a/lib/classes/patch/370alpha3a.php b/lib/classes/patch/370alpha3a.php index 059df55520..86f3b59e23 100644 --- a/lib/classes/patch/370alpha3a.php +++ b/lib/classes/patch/370alpha3a.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. diff --git a/lib/classes/patch/370alpha4a.php b/lib/classes/patch/370alpha4a.php index fc3785b6ce..d040d0f197 100644 --- a/lib/classes/patch/370alpha4a.php +++ b/lib/classes/patch/370alpha4a.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. diff --git a/lib/classes/patch/370alpha5a.php b/lib/classes/patch/370alpha5a.php index a7c9799499..9386ce319a 100644 --- a/lib/classes/patch/370alpha5a.php +++ b/lib/classes/patch/370alpha5a.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. diff --git a/lib/classes/patch/370alpha6a.php b/lib/classes/patch/370alpha6a.php index 931a86856d..ca62ad114b 100644 --- a/lib/classes/patch/370alpha6a.php +++ b/lib/classes/patch/370alpha6a.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. diff --git a/lib/classes/patch/370alpha7a.php b/lib/classes/patch/370alpha7a.php index 89515dd2e7..366fafc888 100644 --- a/lib/classes/patch/370alpha7a.php +++ b/lib/classes/patch/370alpha7a.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. diff --git a/lib/classes/patch/370alpha8a.php b/lib/classes/patch/370alpha8a.php index ac371288c3..b0d754d5eb 100644 --- a/lib/classes/patch/370alpha8a.php +++ b/lib/classes/patch/370alpha8a.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. diff --git a/lib/classes/patch/370alpha9a.php b/lib/classes/patch/370alpha9a.php index cc36be8eec..e3f18145a3 100644 --- a/lib/classes/patch/370alpha9a.php +++ b/lib/classes/patch/370alpha9a.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. diff --git a/lib/classes/patch/3715alpha1a.php b/lib/classes/patch/3715alpha1a.php index fc1bf468f8..3fe6f1f501 100644 --- a/lib/classes/patch/3715alpha1a.php +++ b/lib/classes/patch/3715alpha1a.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. diff --git a/lib/classes/patch/371alpha1a.php b/lib/classes/patch/371alpha1a.php index 3a2f6ef3b1..c33cfebc10 100644 --- a/lib/classes/patch/371alpha1a.php +++ b/lib/classes/patch/371alpha1a.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. diff --git a/lib/classes/patch/373alpha1a.php b/lib/classes/patch/373alpha1a.php index 7b7987b93e..4fcf8be30c 100644 --- a/lib/classes/patch/373alpha1a.php +++ b/lib/classes/patch/373alpha1a.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. diff --git a/lib/classes/patch/379alpha1a.php b/lib/classes/patch/379alpha1a.php index 4056356a74..ebb1fc121f 100644 --- a/lib/classes/patch/379alpha1a.php +++ b/lib/classes/patch/379alpha1a.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. diff --git a/lib/classes/patch/380alpha10a.php b/lib/classes/patch/380alpha10a.php index 2cd7ace751..3cefc55433 100644 --- a/lib/classes/patch/380alpha10a.php +++ b/lib/classes/patch/380alpha10a.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. diff --git a/lib/classes/patch/380alpha11a.php b/lib/classes/patch/380alpha11a.php index 60810aa83e..3e4f9536bd 100644 --- a/lib/classes/patch/380alpha11a.php +++ b/lib/classes/patch/380alpha11a.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. diff --git a/lib/classes/patch/380alpha13a.php b/lib/classes/patch/380alpha13a.php index 4225215676..3c0d9dc972 100644 --- a/lib/classes/patch/380alpha13a.php +++ b/lib/classes/patch/380alpha13a.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. diff --git a/lib/classes/patch/380alpha14a.php b/lib/classes/patch/380alpha14a.php index ca1fd3055b..a47b9e0f65 100644 --- a/lib/classes/patch/380alpha14a.php +++ b/lib/classes/patch/380alpha14a.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. diff --git a/lib/classes/patch/380alpha15a.php b/lib/classes/patch/380alpha15a.php index befa165a72..196656a8fa 100644 --- a/lib/classes/patch/380alpha15a.php +++ b/lib/classes/patch/380alpha15a.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. diff --git a/lib/classes/patch/380alpha16a.php b/lib/classes/patch/380alpha16a.php index dd1d40be12..8ee289a7f3 100644 --- a/lib/classes/patch/380alpha16a.php +++ b/lib/classes/patch/380alpha16a.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. diff --git a/lib/classes/patch/380alpha17a.php b/lib/classes/patch/380alpha17a.php index 2eb87a7957..9550ed3977 100644 --- a/lib/classes/patch/380alpha17a.php +++ b/lib/classes/patch/380alpha17a.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. diff --git a/lib/classes/patch/380alpha18a.php b/lib/classes/patch/380alpha18a.php index abe61275a8..e94700409a 100644 --- a/lib/classes/patch/380alpha18a.php +++ b/lib/classes/patch/380alpha18a.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. diff --git a/lib/classes/patch/380alpha2a.php b/lib/classes/patch/380alpha2a.php index 67b202e91d..ac82a0ca87 100644 --- a/lib/classes/patch/380alpha2a.php +++ b/lib/classes/patch/380alpha2a.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. diff --git a/lib/classes/patch/380alpha2b.php b/lib/classes/patch/380alpha2b.php index 44624d2c73..9649e36884 100644 --- a/lib/classes/patch/380alpha2b.php +++ b/lib/classes/patch/380alpha2b.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. diff --git a/lib/classes/patch/380alpha3a.php b/lib/classes/patch/380alpha3a.php index b8e5f9b26a..3439109f16 100644 --- a/lib/classes/patch/380alpha3a.php +++ b/lib/classes/patch/380alpha3a.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. diff --git a/lib/classes/patch/380alpha3b.php b/lib/classes/patch/380alpha3b.php index e889da8bd3..a80ad9e5eb 100644 --- a/lib/classes/patch/380alpha3b.php +++ b/lib/classes/patch/380alpha3b.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. diff --git a/lib/classes/patch/380alpha4a.php b/lib/classes/patch/380alpha4a.php index d16e38b77e..8f108e71c9 100644 --- a/lib/classes/patch/380alpha4a.php +++ b/lib/classes/patch/380alpha4a.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. diff --git a/lib/classes/patch/380alpha6a.php b/lib/classes/patch/380alpha6a.php index 4711e2d23c..e3e3f45fe6 100644 --- a/lib/classes/patch/380alpha6a.php +++ b/lib/classes/patch/380alpha6a.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. diff --git a/lib/classes/patch/380alpha8a.php b/lib/classes/patch/380alpha8a.php index 2b1d9fba10..80b3dd08a5 100644 --- a/lib/classes/patch/380alpha8a.php +++ b/lib/classes/patch/380alpha8a.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. diff --git a/lib/classes/patch/380alpha9a.php b/lib/classes/patch/380alpha9a.php index a3340876eb..44ec54d194 100644 --- a/lib/classes/patch/380alpha9a.php +++ b/lib/classes/patch/380alpha9a.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. diff --git a/lib/classes/patch/381alpha1b.php b/lib/classes/patch/381alpha1b.php index 7618950a83..ef714232d0 100644 --- a/lib/classes/patch/381alpha1b.php +++ b/lib/classes/patch/381alpha1b.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. diff --git a/lib/classes/patch/381alpha2a.php b/lib/classes/patch/381alpha2a.php index 49b2d8d6ac..9b070ce0a3 100644 --- a/lib/classes/patch/381alpha2a.php +++ b/lib/classes/patch/381alpha2a.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. diff --git a/lib/classes/patch/381alpha3a.php b/lib/classes/patch/381alpha3a.php index 53a9a285d7..f5ae5bf2f7 100644 --- a/lib/classes/patch/381alpha3a.php +++ b/lib/classes/patch/381alpha3a.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. diff --git a/lib/classes/patch/381alpha4a.php b/lib/classes/patch/381alpha4a.php index b60a246e52..a9eaf52776 100644 --- a/lib/classes/patch/381alpha4a.php +++ b/lib/classes/patch/381alpha4a.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. diff --git a/lib/classes/patch/383alpha1a.php b/lib/classes/patch/383alpha1a.php index 2ba4c95475..e83b8adb49 100644 --- a/lib/classes/patch/383alpha1a.php +++ b/lib/classes/patch/383alpha1a.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. diff --git a/lib/classes/patch/383alpha2a.php b/lib/classes/patch/383alpha2a.php index ae41104d8d..feed057ed0 100644 --- a/lib/classes/patch/383alpha2a.php +++ b/lib/classes/patch/383alpha2a.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. diff --git a/lib/classes/patch/383alpha3a.php b/lib/classes/patch/383alpha3a.php index 74bba60f6c..15f5710660 100644 --- a/lib/classes/patch/383alpha3a.php +++ b/lib/classes/patch/383alpha3a.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. diff --git a/lib/classes/patch/383alpha4a.php b/lib/classes/patch/383alpha4a.php new file mode 100644 index 0000000000..008b28b672 --- /dev/null +++ b/lib/classes/patch/383alpha4a.php @@ -0,0 +1,97 @@ +release; + } + + /** + * {@inheritdoc} + */ + public function require_all_upgrades() + { + return false; + } + + /** + * {@inheritdoc} + */ + public function concern() + { + return $this->concern; + } + + /** + * {@inheritdoc} + */ + public function apply(base $appbox, Application $app) + { + $em = $app['EM']; + $mappingFieldType = $mappingFieldResult = new ResultSetMapping(); + + $rs = $em->createNativeQuery( + "SHOW FIELDS FROM usr WHERE Field = 'usr_login';", + $mappingFieldType->addScalarResult('Type', 'Type') + )->getSingleResult(); + + if (0 !== strpos(strtolower($rs['Type']), 'varbinary')) { + return; + } + + // As 'usr_login' field type is varbinary it can contain any charset (utf8 or latin1). + // Compare usr_login to usr_login converted to utf8>utf32>utf8 + // will detect broken char for latin1 encoded string. + // Then detected 'usr_login' fields must be converted from latin1 to utf8. + $rs = $em->createNativeQuery( + 'SELECT t.usr_id, t.login_utf8 FROM ( + SELECT usr_id, + usr_login AS login_unknown_charset, + CONVERT(CAST(usr_login AS CHAR CHARACTER SET latin1) USING utf8) AS login_utf8, + CONVERT(CONVERT(CAST(usr_login AS CHAR CHARACTER SET utf8) USING utf32) USING utf8) AS login_utf8_utf32_utf8 + FROM usr + ) AS t + WHERE t.login_utf8_utf32_utf8 != t.login_unknown_charset', + $mappingFieldResult->addScalarResult('usr_id', 'usr_id')->addScalarResult('login_utf8', 'login_utf8') + )->getResult(); + + foreach ($rs as $row) { + $em->getConnection()->executeQuery(sprintf('UPDATE usr SET usr_login="%s" WHERE usr_id=%d', $row['login_utf8'], $row['usr_id'])); + } + + foreach (array( + // drop index + "ALTER TABLE usr DROP INDEX usr_login;", + // change field type + "ALTER TABLE usr MODIFY usr_login VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_bin;", + // recreate index + "CREATE UNIQUE INDEX usr_login ON usr (usr_login);" + ) as $sql) { + $em->getConnection()->executeQuery($sql); + } + + return true; + } +} diff --git a/lib/classes/patch/383alpha5a.php b/lib/classes/patch/383alpha5a.php index b1648e6366..241258050d 100644 --- a/lib/classes/patch/383alpha5a.php +++ b/lib/classes/patch/383alpha5a.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. diff --git a/lib/classes/patch/384alpha1a.php b/lib/classes/patch/384alpha1a.php index 5166f700b4..b12f3a9945 100644 --- a/lib/classes/patch/384alpha1a.php +++ b/lib/classes/patch/384alpha1a.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. diff --git a/lib/classes/patch/384alpha2a.php b/lib/classes/patch/384alpha2a.php index 54f84e583e..29e750a009 100644 --- a/lib/classes/patch/384alpha2a.php +++ b/lib/classes/patch/384alpha2a.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. diff --git a/lib/classes/patch/384alpha3a.php b/lib/classes/patch/384alpha3a.php index 40be3cabd0..fbcccc0653 100644 --- a/lib/classes/patch/384alpha3a.php +++ b/lib/classes/patch/384alpha3a.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. diff --git a/lib/classes/patch/384alpha4a.php b/lib/classes/patch/384alpha4a.php index d5e14c721d..771a1351dc 100644 --- a/lib/classes/patch/384alpha4a.php +++ b/lib/classes/patch/384alpha4a.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. diff --git a/lib/classes/patch/384alpha5a.php b/lib/classes/patch/384alpha5a.php index 4a94a0379c..767d9dd541 100644 --- a/lib/classes/patch/384alpha5a.php +++ b/lib/classes/patch/384alpha5a.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. diff --git a/lib/classes/patch/386alpha1a.php b/lib/classes/patch/386alpha1a.php index 333d80ab60..d13ac818d7 100644 --- a/lib/classes/patch/386alpha1a.php +++ b/lib/classes/patch/386alpha1a.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. diff --git a/lib/classes/patch/386alpha2a.php b/lib/classes/patch/386alpha2a.php index 151c90983a..0ff9cb5c6a 100644 --- a/lib/classes/patch/386alpha2a.php +++ b/lib/classes/patch/386alpha2a.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. diff --git a/lib/classes/patch/386alpha3a.php b/lib/classes/patch/386alpha3a.php index 11df672f35..1e607f3277 100644 --- a/lib/classes/patch/386alpha3a.php +++ b/lib/classes/patch/386alpha3a.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. diff --git a/lib/classes/patch/386alpha4a.php b/lib/classes/patch/386alpha4a.php index d5d91bd410..8d7aa4e34f 100644 --- a/lib/classes/patch/386alpha4a.php +++ b/lib/classes/patch/386alpha4a.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. diff --git a/lib/classes/patchthesaurus/100.php b/lib/classes/patchthesaurus/100.php index 09934b8b35..b017981886 100644 --- a/lib/classes/patchthesaurus/100.php +++ b/lib/classes/patchthesaurus/100.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. diff --git a/lib/classes/patchthesaurus/200.php b/lib/classes/patchthesaurus/200.php index ca6b3817b9..a69df152ee 100644 --- a/lib/classes/patchthesaurus/200.php +++ b/lib/classes/patchthesaurus/200.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. diff --git a/lib/classes/patchthesaurus/201.php b/lib/classes/patchthesaurus/201.php index 95eb641d1d..b2f4006b24 100644 --- a/lib/classes/patchthesaurus/201.php +++ b/lib/classes/patchthesaurus/201.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. diff --git a/lib/classes/patchthesaurus/202.php b/lib/classes/patchthesaurus/202.php index 50916c81c6..5a46db03ab 100644 --- a/lib/classes/patchthesaurus/202.php +++ b/lib/classes/patchthesaurus/202.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. diff --git a/lib/classes/patchthesaurus/203.php b/lib/classes/patchthesaurus/203.php index 6d67ce10f2..ecd88defb7 100644 --- a/lib/classes/patchthesaurus/203.php +++ b/lib/classes/patchthesaurus/203.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. diff --git a/lib/classes/patchthesaurus/204.php b/lib/classes/patchthesaurus/204.php index b0a6d547f2..881755ff33 100644 --- a/lib/classes/patchthesaurus/204.php +++ b/lib/classes/patchthesaurus/204.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. diff --git a/lib/classes/phrasea.php b/lib/classes/phrasea.php index 408d294a04..7384c259d1 100644 --- a/lib/classes/phrasea.php +++ b/lib/classes/phrasea.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. diff --git a/lib/classes/queries.php b/lib/classes/queries.php index 5927b1ddd2..84588fd1c9 100644 --- a/lib/classes/queries.php +++ b/lib/classes/queries.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. diff --git a/lib/classes/random.php b/lib/classes/random.php index 9b6ea4fa29..19431bf7a4 100644 --- a/lib/classes/random.php +++ b/lib/classes/random.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. diff --git a/lib/classes/record/Interface.php b/lib/classes/record/Interface.php index b88880691a..01a1a296f1 100644 --- a/lib/classes/record/Interface.php +++ b/lib/classes/record/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. diff --git a/lib/classes/record/adapter.php b/lib/classes/record/adapter.php index dc8f654bb8..6a01cbd56a 100644 --- a/lib/classes/record/adapter.php +++ b/lib/classes/record/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. @@ -312,6 +312,32 @@ class record_adapter implements record_Interface, cache_cacheableInterface return $this; } + public function set_mime($mime) + { + $old_mime = $this->get_mime(); + + // see http://lists.w3.org/Archives/Public/xml-dist-app/2003Jul/0064.html + if (!preg_match("/^[a-zA-Z0-9!#$%^&\*_\-\+{}\|'.`~]+\/[a-zA-Z0-9!#$%^&\*_\-\+{}\|'.`~]+$/", $mime)) { + throw new \Exception(sprintf('Unrecognized mime type %s', $mime)); + } + + $connection = connection::getPDOConnection($this->app, $this->get_sbas_id()); + + $sql = 'UPDATE record SET mime = :mime WHERE record_id = :record_id'; + $stmt = $connection->prepare($sql); + $stmt->execute(array(':mime' => $mime, ':record_id' => $this->get_record_id())); + $stmt->closeCursor(); + + if ($mime !== $old_mime) { + $this->rebuild_subdefs(); + } + + $this->mime = $mime; + $this->delete_data_from_cache(); + + return $this; + } + /** * Return true if the record is a grouping * @@ -671,10 +697,6 @@ class record_adapter implements record_Interface, cache_cacheableInterface continue; } - if ($subdef->is_substituted()) { - continue; - } - $subdefs[$subdef->get_name()] = $subdef; } @@ -962,6 +984,77 @@ class record_adapter implements record_Interface, cache_cacheableInterface return $this->get_databox()->get_sbas_id(); } + public function substitute_subdef($name, MediaInterface $media, Application $app) + { + $newfilename = $this->record_id . '_0_' . $name . '.' . $media->getFile()->getExtension(); + + $base_url = ''; + + $subdef_def = false; + + if ($name == 'document') { + $baseprefs = $this->get_databox()->get_sxml_structure(); + + $pathhd = p4string::addEndSlash((string) ($baseprefs->path)); + + $filehd = $this->get_record_id() . "_document." . strtolower($media->getFile()->getExtension()); + $pathhd = databox::dispatch($app['filesystem'], $pathhd); + + $app['filesystem']->copy($media->getFile()->getRealPath(), $pathhd . $filehd, true); + + $subdefFile = $pathhd . $filehd; + + $meta_writable = true; + } else { + $type = $this->is_grouping() ? 'image' : $this->get_type(); + + $subdef_def = $this->get_databox()->get_subdef_structure()->get_subdef($type, $name); + + if ($this->has_subdef($name) && $this->get_subdef($name)->is_physically_present()) { + + $path_file_dest = $this->get_subdef($name)->get_pathfile(); + $this->get_subdef($name)->remove_file(); + $this->clearSubdefCache($name); + } else { + $path = databox::dispatch($app['filesystem'], $subdef_def->get_path()); + $app['filesystem']->mkdir($path, 0750); + $path_file_dest = $path . $newfilename; + } + + try { + $app['media-alchemyst']->turnInto( + $media->getFile()->getRealPath(), + $path_file_dest, + $subdef_def->getSpecs() + ); + } catch (\MediaAlchemyst\Exception\ExceptionInterface $e) { + return $this; + } + + $subdefFile = $path_file_dest; + + $meta_writable = $subdef_def->meta_writeable(); + } + + $app['filesystem']->chmod($subdefFile, 0760); + $media = $app['mediavorus']->guess($subdefFile); + + $subdef = media_subdef::create($app, $this, $name, $media); + $subdef->set_substituted(true); + + $this->delete_data_from_cache(self::CACHE_SUBDEFS); + + if ($meta_writable) { + $this->write_metas(); + } + + if ($name == 'document') { + $this->rebuild_subdefs(); + } + + return $this; + } + /** * * @param DOMDocument $dom_doc @@ -1111,6 +1204,38 @@ class record_adapter implements record_Interface, cache_cacheableInterface return $this; } + public function get_missing_subdefs() + { + $databox = $this->get_databox(); + + try { + $this->get_hd_file(); + } catch (\Exception $e) { + return array(); + } + + $subDefDefinitions = $databox->get_subdef_structure()->getSubdefGroup($this->get_type()); + if (!$subDefDefinitions) { + return array(); + } + + $record = $this; + $wanted_subdefs = array_map(function($subDef) { + return $subDef->get_name(); + }, array_filter($subDefDefinitions, function($subDef) use ($record) { + return !$record->has_subdef($subDef->get_name()); + })); + + + $missing_subdefs = array_map(function($subDef) { + return $subDef->get_name(); + }, array_filter($this->get_subdefs(), function($subdef) { + return !$subdef->is_physically_present(); + })); + + return array_values(array_merge($wanted_subdefs, $missing_subdefs)); + } + /** * * @return record_adapter @@ -1284,7 +1409,6 @@ class record_adapter implements record_Interface, cache_cacheableInterface $record->delete_data_from_cache(\record_adapter::CACHE_SUBDEFS); $record->insertTechnicalDatas($app['mediavorus']); - $record->rebuild_subdefs(); return $record; } diff --git a/lib/classes/record/exportElement.php b/lib/classes/record/exportElement.php index eee4b434dd..b05c270b2a 100644 --- a/lib/classes/record/exportElement.php +++ b/lib/classes/record/exportElement.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. diff --git a/lib/classes/record/orderElement.php b/lib/classes/record/orderElement.php index 50293eb1ff..fe65a39ed8 100644 --- a/lib/classes/record/orderElement.php +++ b/lib/classes/record/orderElement.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. diff --git a/lib/classes/record/preview.php b/lib/classes/record/preview.php index 3ddb20ff19..2faf626e5c 100644 --- a/lib/classes/record/preview.php +++ b/lib/classes/record/preview.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. diff --git a/lib/classes/recordutils/image.php b/lib/classes/recordutils/image.php index 56f259f874..46706b2a0b 100644 --- a/lib/classes/recordutils/image.php +++ b/lib/classes/recordutils/image.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. diff --git a/lib/classes/set/abstract.php b/lib/classes/set/abstract.php index cb1ba7e8fc..0f0f012ced 100644 --- a/lib/classes/set/abstract.php +++ b/lib/classes/set/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. diff --git a/lib/classes/set/export.php b/lib/classes/set/export.php index 6ba4432a2f..3a258a5857 100644 --- a/lib/classes/set/export.php +++ b/lib/classes/set/export.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. diff --git a/lib/classes/set/exportftp.php b/lib/classes/set/exportftp.php index b396955ee6..b3b8d52daf 100644 --- a/lib/classes/set/exportftp.php +++ b/lib/classes/set/exportftp.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. diff --git a/lib/classes/set/selection.php b/lib/classes/set/selection.php index bb8a330f60..1e44a5dfa6 100644 --- a/lib/classes/set/selection.php +++ b/lib/classes/set/selection.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. diff --git a/lib/classes/setup.php b/lib/classes/setup.php index 2642e7d01b..0ecd2f933c 100644 --- a/lib/classes/setup.php +++ b/lib/classes/setup.php @@ -2,7 +2,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. diff --git a/lib/classes/thesaurus/xpath.php b/lib/classes/thesaurus/xpath.php index c0cd41a854..1f37d61774 100644 --- a/lib/classes/thesaurus/xpath.php +++ b/lib/classes/thesaurus/xpath.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. diff --git a/lib/classes/unicode.php b/lib/classes/unicode.php index 2e5e990f7c..7eb4b19ab6 100644 --- a/lib/classes/unicode.php +++ b/lib/classes/unicode.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. diff --git a/templates/web/admin/collection/collection.html.twig b/templates/web/admin/collection/collection.html.twig index e92bec6e49..a1ee23c845 100644 --- a/templates/web/admin/collection/collection.html.twig +++ b/templates/web/admin/collection/collection.html.twig @@ -213,31 +213,6 @@ {% endif %} -{# Bandeau de présentation #} -
-
{{ 'admin::base:collection: image de presentation :' | trans }}
- {% if collection.getPresentation(bas_id) is not empty %} -
{{ collection.getPresentation(bas_id)| raw }}
- {% if app['acl'].get(app['authentication'].getUser()).has_right_on_base(bas_id, 'manage') %} -
- -
- {% endif%} - {% elseif app['acl'].get(app['authentication'].getUser()).has_right_on_base(bas_id, 'manage') %} - {{ 'admin::base:collection: aucun fichier (minilogo, watermark ...)' | trans }} -
- - - {% trans %}Select files...{% endtrans %} - - -
- {% endif %} -
- {# Invalid file type modal shown when uploaded logo file is invalid #}