Skip to content

Commit

Permalink
5.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@ngodfraind
ngodfraind committed Apr 29, 2015
1 parent d93b105 commit 5a875f3
Show file tree
Hide file tree
Showing 72 changed files with 46 additions and 4,845 deletions.
87 changes: 46 additions & 41 deletions Controller/ForumController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Component\Form\FormError;
use Symfony\Component\Security\Core\SecurityContextInterface;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
Expand All @@ -39,23 +40,27 @@
class ForumController extends Controller
{
private $manager;
private $security;
private $tokenStorage;
private $authorization;

/**
* Constructor.
*
* @DI\InjectParams({
* "manager" = @DI\Inject("claroline.manager.forum_manager"),
* "security" = @DI\Inject("security.context")
* "manager" = @DI\Inject("claroline.manager.forum_manager"),
* "authorization" = @DI\Inject("security.authorization_checker"),
* "tokenStorage" = @DI\Inject("security.token_storage")
* })
*/
public function __construct(
Manager $manager,
SecurityContextInterface $security
TokenStorageInterface $tokenStorage,
AuthorizationCheckerInterface $authorization
)
{
$this->manager = $manager;
$this->security = $security;
$this->tokenStorage = $tokenStorage;
$this->authorization = $authorization;
}
/**
* @Route(
Expand All @@ -73,11 +78,11 @@ public function openAction(Forum $forum)
$em = $this->getDoctrine()->getManager();
$this->checkAccess($forum);
$categories = $em->getRepository('ClarolineForumBundle:Forum')->findCategories($forum);
$user = $this->security->getToken()->getUser();
$user = $this->tokenStorage->getToken()->getUser();
$hasSubscribed = $user === 'anon.' ?
false :
$this->manager->hasSubscribed($user, $forum);
$isModerator = $this->security->isGranted(
$isModerator = $this->authorization->isGranted(
'moderate',
new ResourceCollection(array($forum->getResourceNode()))
) && $user !== 'anon.';
Expand Down Expand Up @@ -123,9 +128,9 @@ public function subjectsAction(Category $category, $page, $max)
}
$collection = new ResourceCollection(array($forum->getResourceNode()));
$isAnon = $this->isAnon();
$canCreateSubject = $this->security->isGranted('post', $collection) &&
$canCreateSubject = $this->authorization->isGranted('post', $collection) &&
!$isAnon;
$isModerator = $this->security->isGranted('moderate', $collection) &&
$isModerator = $this->authorization->isGranted('moderate', $collection) &&
!$isAnon;

return array(
Expand Down Expand Up @@ -153,7 +158,7 @@ public function subjectFormAction(Category $category)
$forum = $category->getForum();
$collection = new ResourceCollection(array($forum->getResourceNode()));

if (!$this->security->isGranted('post', $collection)) {
if (!$this->authorization->isGranted('post', $collection)) {
throw new AccessDeniedException($collection->getErrorsForDisplay());
}

Expand All @@ -179,7 +184,7 @@ public function categoryFormAction(Forum $forum)
{
$collection = new ResourceCollection(array($forum->getResourceNode()));

if (!$this->security->isGranted('post', $collection)) {
if (!$this->authorization->isGranted('post', $collection)) {
throw new AccessDeniedException($collection->getErrorsForDisplay());
}

Expand All @@ -203,7 +208,7 @@ public function createCategoryAction(Forum $forum)
{
$collection = new ResourceCollection(array($forum->getResourceNode()));

if (!$this->security->isGranted('post', $collection)) {
if (!$this->authorization->isGranted('post', $collection)) {
throw new AccessDeniedException($collection->getErrorsForDisplay());
}

Expand Down Expand Up @@ -238,15 +243,15 @@ public function createSubjectAction(Category $category)
$forum = $category->getForum();
$collection = new ResourceCollection(array($forum->getResourceNode()));

if (!$this->security->isGranted('post', $collection)) {
if (!$this->authorization->isGranted('post', $collection)) {
throw new AccessDeniedException($collection->getErrorsForDisplay());
}

$form = $this->get('form.factory')->create(new SubjectType(), new Subject);
$form->handleRequest($this->get('request'));

if ($form->isValid()) {
$user = $this->security->getToken()->getUser();
$user = $this->tokenStorage->getToken()->getUser();
$subject = $form->getData();
$subject->setCreator($user);
$subject->setAuthor($user->getFirstName() . ' ' . $user->getLastName());
Expand Down Expand Up @@ -297,13 +302,13 @@ public function messagesAction(Subject $subject, $page, $max)
$forum = $subject->getCategory()->getForum();
$this->checkAccess($forum);
$isAnon = $this->isAnon();
$isModerator = $this->security->isGranted(
$isModerator = $this->authorization->isGranted(
'moderate',
new ResourceCollection(array($forum->getResourceNode()))
) && !$isAnon;
$pager = $this->manager->getMessagesPager($subject, $page, $max);
$collection = new ResourceCollection(array($forum->getResourceNode()));
$canAnswer = $this->security->isGranted('post', $collection) && !$isAnon;
$canAnswer = $this->authorization->isGranted('post', $collection) && !$isAnon;
$form = $this->get('form.factory')->create(new MessageType());

return array(
Expand Down Expand Up @@ -354,9 +359,9 @@ public function editMessageFormAction(Message $message)
{
$subject = $message->getSubject();
$forum = $subject->getCategory()->getForum();
$isModerator = $this->security->isGranted('moderate', new ResourceCollection(array($forum->getResourceNode())));
$isModerator = $this->authorization->isGranted('moderate', new ResourceCollection(array($forum->getResourceNode())));

if (!$isModerator && $this->security->getToken()->getUser() !== $message->getCreator()) {
if (!$isModerator && $this->tokenStorage->getToken()->getUser() !== $message->getCreator()) {
throw new AccessDeniedException();
}

Expand All @@ -383,9 +388,9 @@ public function editMessageAction(Message $message)
{
$subject = $message->getSubject();
$forum = $subject->getCategory()->getForum();
$isModerator = $this->security->isGranted('moderate', new ResourceCollection(array($forum->getResourceNode())));
$isModerator = $this->authorization->isGranted('moderate', new ResourceCollection(array($forum->getResourceNode())));

if (!$isModerator && $this->security->getToken()->getUser() !== $message->getCreator()) {
if (!$isModerator && $this->tokenStorage->getToken()->getUser() !== $message->getCreator()) {
throw new AccessDeniedException();
}

Expand Down Expand Up @@ -421,9 +426,9 @@ public function editMessageAction(Message $message)
public function editCategoryFormAction(Category $category)
{
$forum = $category->getForum();
$isModerator = $this->security->isGranted('moderate', new ResourceCollection(array($forum->getResourceNode())));
$isModerator = $this->authorization->isGranted('moderate', new ResourceCollection(array($forum->getResourceNode())));

if (!$isModerator && $this->security->getToken()->getUser()) {
if (!$isModerator && $this->tokenStorage->getToken()->getUser()) {
throw new AccessDeniedException();
}

Expand All @@ -447,9 +452,9 @@ public function editCategoryFormAction(Category $category)
public function editCategoryAction(Category $category)
{
$forum = $category->getForum();
$isModerator = $this->security->isGranted('moderate', new ResourceCollection(array($forum->getResourceNode())));
$isModerator = $this->authorization->isGranted('moderate', new ResourceCollection(array($forum->getResourceNode())));

if (!$isModerator && $this->security->getToken()->getUser()) {
if (!$isModerator && $this->tokenStorage->getToken()->getUser()) {
throw new AccessDeniedException();
}

Expand Down Expand Up @@ -479,7 +484,7 @@ public function deleteCategory(Category $category)
{
$forum = $category->getForum();

if ($this->security->isGranted('moderate', new ResourceCollection(array($category->getForum()->getResourceNode())))) {
if ($this->authorization->isGranted('moderate', new ResourceCollection(array($category->getForum()->getResourceNode())))) {

$this->manager->deleteCategory($category);

Expand Down Expand Up @@ -525,9 +530,9 @@ public function searchAction(Forum $forum, $page, $search)
*/
public function editSubjectFormAction(Subject $subject)
{
$isModerator = $this->security->isGranted('moderate', new ResourceCollection(array($subject->getCategory()->getForum()->getResourceNode())));
$isModerator = $this->authorization->isGranted('moderate', new ResourceCollection(array($subject->getCategory()->getForum()->getResourceNode())));

if (!$isModerator && $this->security->getToken()->getUser() !== $subject->getCreator()) {
if (!$isModerator && $this->tokenStorage->getToken()->getUser() !== $subject->getCreator()) {
throw new AccessDeniedException();
}

Expand Down Expand Up @@ -556,11 +561,11 @@ public function editSubjectFormAction(Subject $subject)
*/
public function editSubjectAction(Subject $subject)
{
$isModerator = $this->security->isGranted(
$isModerator = $this->authorization->isGranted(
'moderate', new ResourceCollection(array($subject->getCategory()->getForum()->getResourceNode()))
);

if (!$isModerator && $this->security->getToken()->getUser() !== $subject->getCreator()) {
if (!$isModerator && $this->tokenStorage->getToken()->getUser() !== $subject->getCreator()) {
throw new AccessDeniedException();
}

Expand Down Expand Up @@ -595,7 +600,7 @@ public function editSubjectAction(Subject $subject)
*/
public function deleteMessageAction(Message $message)
{
if ($this->security->isGranted('moderate', new ResourceCollection(array($message->getSubject()->getCategory()->getForum()->getResourceNode())))) {
if ($this->authorization->isGranted('moderate', new ResourceCollection(array($message->getSubject()->getCategory()->getForum()->getResourceNode())))) {
$this->manager->deleteMessage($message);

return new RedirectResponse(
Expand Down Expand Up @@ -654,7 +659,7 @@ public function unsubscribeAction(Forum $forum, User $user)
*/
public function deleteSubjectAction(Subject $subject)
{
if ($this->security->isGranted('moderate', new ResourceCollection(array($subject->getCategory()->getForum()->getResourceNode())))) {
if ($this->authorization->isGranted('moderate', new ResourceCollection(array($subject->getCategory()->getForum()->getResourceNode())))) {

$this->manager->deleteSubject($subject);

Expand All @@ -674,7 +679,7 @@ private function checkAccess(Forum $forum)
{
$collection = new ResourceCollection(array($forum->getResourceNode()));

if (!$this->security->isGranted('OPEN', $collection)) {
if (!$this->authorization->isGranted('OPEN', $collection)) {
throw new AccessDeniedException($collection->getErrorsForDisplay());
}
}
Expand Down Expand Up @@ -708,9 +713,9 @@ protected function dispatch($event)
*/
public function forumsWorkspaceWidgetAction(Workspace $workspace)
{
$user = $this->security->getToken()->getUser();
$user = $this->tokenStorage->getToken()->getUser();
$utils = $this->get('claroline.security.utilities');
$token = $this->security->getToken($user);
$token = $this->tokenStorage->getToken($user);
$roles = $utils->getRoles($token);

$workspaces = array();
Expand All @@ -737,9 +742,9 @@ public function forumsWorkspaceWidgetAction(Workspace $workspace)
*/
public function forumsDesktopWidgetAction()
{
$user = $this->security->getToken()->getUser();
$user = $this->tokenStorage->getToken()->getUser();
$utils = $this->get('claroline.security.utilities');
$token = $this->security->getToken();
$token = $this->tokenStorage->getToken();
$roles = $utils->getRoles($token);

// Get user workspaces
Expand Down Expand Up @@ -970,7 +975,7 @@ public function replyMessageAction(Message $message)
);

}


/**
* @Route(
Expand Down Expand Up @@ -1019,7 +1024,7 @@ public function activateGlobalNotificationsAction(Forum $forum)
{
$collection = new ResourceCollection(array($forum->getResourceNode()));

if (!$this->security->isGranted('MODERATE', $collection)) {
if (!$this->authorization->isGranted('MODERATE', $collection)) {
throw new AccessDeniedException($collection->getErrorsForDisplay());
}

Expand All @@ -1042,7 +1047,7 @@ public function disableGlobalNotificationsAction(Forum $forum)
{
$collection = new ResourceCollection(array($forum->getResourceNode()));

if (!$this->security->isGranted('MODERATE', $collection)) {
if (!$this->authorization->isGranted('MODERATE', $collection)) {
throw new AccessDeniedException($collection->getErrorsForDisplay());
}

Expand All @@ -1055,6 +1060,6 @@ public function disableGlobalNotificationsAction(Forum $forum)

private function isAnon()
{
return $this->security->getToken()->getUser() === 'anon.';
return $this->tokenStorage->getToken()->getUser() === 'anon.';
}
}
Loading

0 comments on commit 5a875f3

Please sign in to comment.