diff options
Diffstat (limited to 'lib/models/Courseware')
| -rw-r--r-- | lib/models/Courseware/BlockTypes/BlockType.php | 6 | ||||
| -rw-r--r-- | lib/models/Courseware/BlockTypes/Folder.php | 2 | ||||
| -rw-r--r-- | lib/models/Courseware/BlockTypes/Gallery.php | 2 | ||||
| -rw-r--r-- | lib/models/Courseware/BlockTypes/Text.php | 1 | ||||
| -rw-r--r-- | lib/models/Courseware/Certificate.php | 3 | ||||
| -rw-r--r-- | lib/models/Courseware/Instance.php | 4 | ||||
| -rw-r--r-- | lib/models/Courseware/StructuralElement.php | 2 | ||||
| -rw-r--r-- | lib/models/Courseware/Template.php | 2 | ||||
| -rw-r--r-- | lib/models/Courseware/Unit.php | 3 |
9 files changed, 14 insertions, 11 deletions
diff --git a/lib/models/Courseware/BlockTypes/BlockType.php b/lib/models/Courseware/BlockTypes/BlockType.php index 13364d5..2ad04ae 100644 --- a/lib/models/Courseware/BlockTypes/BlockType.php +++ b/lib/models/Courseware/BlockTypes/BlockType.php @@ -116,9 +116,9 @@ abstract class BlockType ]; // try { - foreach (\PluginEngine::getPlugins(CoursewarePlugin::class) as $plugin) { - $blockTypes = $plugin->registerBlockTypes($blockTypes); - } + foreach (\PluginEngine::getPlugins(CoursewarePlugin::class) as $plugin) { + $blockTypes = $plugin->registerBlockTypes($blockTypes); + } // } catch (\Exception $e) { // // there is nothing we can do here other than absorbing exceptions // } diff --git a/lib/models/Courseware/BlockTypes/Folder.php b/lib/models/Courseware/BlockTypes/Folder.php index b3a0767..4d88e06 100644 --- a/lib/models/Courseware/BlockTypes/Folder.php +++ b/lib/models/Courseware/BlockTypes/Folder.php @@ -73,7 +73,7 @@ class Folder extends BlockType $file['meta'] = [ 'download-url' => $folderFile->getDownloadURL(), ]; - + if ($this->filePermission($typedFolder, $file, $user)) { array_push($payload['files'], $file); } diff --git a/lib/models/Courseware/BlockTypes/Gallery.php b/lib/models/Courseware/BlockTypes/Gallery.php index 2ad19b9..70d6eec 100644 --- a/lib/models/Courseware/BlockTypes/Gallery.php +++ b/lib/models/Courseware/BlockTypes/Gallery.php @@ -70,7 +70,7 @@ class Gallery extends BlockType $file['meta'] = [ 'download-url' => $folderFile->getDownloadURL(), ]; - + if ($this->filePermission($typedFolder, $file, $user) && $fileRef->isImage()) { array_push($payload['files'], $file); } diff --git a/lib/models/Courseware/BlockTypes/Text.php b/lib/models/Courseware/BlockTypes/Text.php index 4bccd88..9e7c07d 100644 --- a/lib/models/Courseware/BlockTypes/Text.php +++ b/lib/models/Courseware/BlockTypes/Text.php @@ -3,6 +3,7 @@ namespace Courseware\BlockTypes; use Opis\JsonSchema\Schema; + require_once 'lib/classes/Markup.class.php'; /** diff --git a/lib/models/Courseware/Certificate.php b/lib/models/Courseware/Certificate.php index d0c9fd9..2cdf726 100644 --- a/lib/models/Courseware/Certificate.php +++ b/lib/models/Courseware/Certificate.php @@ -2,7 +2,8 @@ namespace Courseware; -use \User, \Course; +use User; +use Course; /** * Courseware's certificates. diff --git a/lib/models/Courseware/Instance.php b/lib/models/Courseware/Instance.php index 66c024c..1c2b3a0 100644 --- a/lib/models/Courseware/Instance.php +++ b/lib/models/Courseware/Instance.php @@ -237,8 +237,8 @@ class Instance $this->unit->config['sequential_progression'] = $isSequentialProgression ? 1 : 0; } - const EDITING_PERMISSION_DOZENT = 'dozent'; - const EDITING_PERMISSION_TUTOR = 'tutor'; + public const EDITING_PERMISSION_DOZENT = 'dozent'; + public const EDITING_PERMISSION_TUTOR = 'tutor'; /** * Returns the level needed to edit this courseware instance. diff --git a/lib/models/Courseware/StructuralElement.php b/lib/models/Courseware/StructuralElement.php index 3cfca28..72fa2fe 100644 --- a/lib/models/Courseware/StructuralElement.php +++ b/lib/models/Courseware/StructuralElement.php @@ -867,7 +867,7 @@ SQL; return $element; } - private function copyImage(User $user, StructuralElement $parent) : ?string + private function copyImage(User $user, StructuralElement $parent): ?string { $file_ref_id = null; diff --git a/lib/models/Courseware/Template.php b/lib/models/Courseware/Template.php index 8161d98..146050a 100644 --- a/lib/models/Courseware/Template.php +++ b/lib/models/Courseware/Template.php @@ -25,4 +25,4 @@ class Template extends \SimpleORMap parent::configure($config); } -}
\ No newline at end of file +} diff --git a/lib/models/Courseware/Unit.php b/lib/models/Courseware/Unit.php index 5c470c9..c6e113c 100644 --- a/lib/models/Courseware/Unit.php +++ b/lib/models/Courseware/Unit.php @@ -79,7 +79,8 @@ class Unit extends \SimpleORMap public function canEdit(\User $user): bool { - return $this->structural_element->canEdit($user);; + return $this->structural_element->canEdit($user); + ; } public function copy(\User $user, string $rangeId, string $rangeType, array $modified = null): Unit |
