hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Controller/Prod/TOU.php
	lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Security/Firewall.php
	lib/classes/task/abstract.php
	tests/Alchemy/Tests/Phrasea/Security/FirewallTest.php
This commit is contained in:
Nicolas Le Goff
2014-02-05 19:42:22 +01:00
parent 280e8b6178 863975d7ca
commit c4eadb7e0e
52 changed files with 133 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php
View File

@@ -24,8 +24,9 @@ class Thesaurus implements ControllerProviderInterface
$controllers = $app['controllers_factory'];
$app['firewall']->addMandatoryAuthentication($controllers);
$controllers->before(function () use ($app) {
$app['firewall']->requireAuthentication();
$app['firewall']->requireAccessToModule('thesaurus');
});

4
lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
View File

@@ -26,9 +26,7 @@ class Xmlhttp implements ControllerProviderInterface
$controllers = $app['controllers_factory'];
$controllers->before(function () use ($app) {
$app['firewall']->requireAuthentication();
});
$app['firewall']->addMandatoryAuthentication($controllers);
$controllers->match('acceptcandidates.j.php', 'controller.thesaurus.xmlhttp:AcceptCandidatesJson')
->before(function () use ($app) {