diff --git a/lib/classes/JsonApi/Routes/Courseware/BlocksCopy.php b/lib/classes/JsonApi/Routes/Courseware/BlocksCopy.php index 00bf546197bd42fab68d4f3c4333659e2dabd202..3e34ed0e97dbd248955c422bdc09ac4d5b41afc3 100755 --- a/lib/classes/JsonApi/Routes/Courseware/BlocksCopy.php +++ b/lib/classes/JsonApi/Routes/Courseware/BlocksCopy.php @@ -30,8 +30,9 @@ class BlocksCopy extends NonJsonApiController $block = \Courseware\Block::find($data['block']['id']); $container = \Courseware\Container::find($data['parent_id']); + $user = $this->getUser($request); - if (!Authority::canCreateBlocks($user = $this->getUser($request), $container)) { + if (!Authority::canCreateBlocks($user, $container) || !Authority::canUpdateBlock($user, $block)) { throw new AuthorizationFailedException(); } @@ -58,4 +59,4 @@ class BlocksCopy extends NonJsonApiController //TODO update section block ids return true; } -} \ No newline at end of file +} diff --git a/lib/classes/JsonApi/Routes/Courseware/ContainersCopy.php b/lib/classes/JsonApi/Routes/Courseware/ContainersCopy.php index 9cfbf9dd73f10832237e6fa1491e687016b44f08..087483994292b40fb291e8c01261fcf6c544309a 100755 --- a/lib/classes/JsonApi/Routes/Courseware/ContainersCopy.php +++ b/lib/classes/JsonApi/Routes/Courseware/ContainersCopy.php @@ -30,7 +30,8 @@ class ContainersCopy extends NonJsonApiController $container = \Courseware\Container::find($data['container']['id']); $element = \Courseware\StructuralElement::find($data['parent_id']); - if (!Authority::canCreateContainer($user = $this->getUser($request), $element)) { + $user = $this->getUser($request); + if (!Authority::canCreateContainer($user, $element) || !Authority::canUpdateContainer($user, $container)) { throw new AuthorizationFailedException(); } @@ -48,4 +49,4 @@ class ContainersCopy extends NonJsonApiController return $container; } -} \ No newline at end of file +} diff --git a/lib/classes/JsonApi/Routes/Courseware/StructuralElementsCopy.php b/lib/classes/JsonApi/Routes/Courseware/StructuralElementsCopy.php index 5dcb6d4719486e91f412303023dee60616feb55c..2dfee89b08fb600f46412bb162bb3e61cb4204d9 100755 --- a/lib/classes/JsonApi/Routes/Courseware/StructuralElementsCopy.php +++ b/lib/classes/JsonApi/Routes/Courseware/StructuralElementsCopy.php @@ -28,7 +28,8 @@ class StructuralElementsCopy extends NonJsonApiController $sourceElement = StructuralElement::find($args['id']); $newParent = StructuralElement::find($data['parent_id']); - if (!Authority::canCreateContainer($user = $this->getUser($request), $newParent)) { + $user = $this->getUser($request); + if (!Authority::canCreateStructuralElement($user, $newParent) || !Authority::canUpdateStructuralElement($user, $sourceElement)) { throw new AuthorizationFailedException(); }