Merge branch 'main' into issue-1318

Author: ferishili

app/controllers/redirect.php

@@ -27,6 +27,9 @@ public function before_filter(&$action, &$args)
 
     public function perform_action($action, $token)
     {
+        $this->set_layout(null);
+        $this->assets_url = rtrim($this->plugin->getPluginUrl(), '/') . '/assets';
+
         $video = null;
         $video_share = null;
         if ($action == 'share') {
@@ -38,8 +41,10 @@ public function perform_action($action, $token)
 
         if (empty($video)) {
             $this->error = _('Das Video wurde nicht gefunden, ist defekt oder momentan (noch) nicht verfügbar.');
+            return;
         } else if ($video->trashed) {
             $this->error = _('Das Video wurde zur Löschung markiert und kann daher nicht abgerufen werden.');
+            return;
         }
 
         /*
@@ -53,6 +58,7 @@ public function perform_action($action, $token)
         $lti = LtiHelper::getLaunchData($video->config_id, $customtool, $video_share);
         if (empty($lti) || empty($customtool)) {
             $this->error = _('Das Video wurde nicht gefunden, ist defekt oder momentan (noch) nicht verfügbar.');
+            return;
         }
 
         // get correct endpoint for redirect type
@@ -64,12 +70,6 @@ public function perform_action($action, $token)
 
         $this->launch_data = $ltilink['launch_data'];
         $this->launch_url  = $ltilink['launch_url'];
-
-        if (!empty($this->error)) {
-            $this->assets_url = rtrim($this->plugin->getPluginUrl(), '/') . '/assets';
-        }
-
-        $this->set_layout(null);
     }
 
     public function download_action($token, $type, $index)

courseware/package-lock.json

@@ -5,6 +5,7 @@
 
 use Opencast\Models\CoursewareBlockMappings;
 use Opencast\Models\VideoCoursewareBlocks;
+use Opencast\Models\Videos;
 use Courseware\Block;
 
 class OpencastCoursewareBlockCopyMapping extends CronJob
@@ -36,23 +37,24 @@ public function execute($last_result, $parameters = array())
                 $token = $mapping->token;
                 $new_block_query->execute([':token' => $token]);
                 $new_block_record = $new_block_query->fetchOne(PDO::FETCH_ASSOC);
-                if (!empty($new_block_record)) {
+                $video = Videos::find($mapping->video_id);
+                if (!empty($new_block_record) && !empty($video)) {
                     echo 'Peform mapping for block: ' . $new_block_record['id'] . "\n";
 
                     // Add record into the VideoCoursewareBlocks
                     $msg = 'Record is added into oc_video_cw_blocks';
-                    $added = VideoCoursewareBlocks::setRecord($mapping->new_seminar_id, $mapping->token, $new_block_record['id']);
+                    $added = VideoCoursewareBlocks::setRecord($mapping->new_seminar_id, $video->token, $new_block_record['id']);
                     if (!$added) {
                         $msg = 'No record is added into oc_video_cw_blocks!';
                     }
-                    echo $msg;
+                    echo $msg . "\n";
 
                     // Get the actual block object.
                     $new_block = Block::find($new_block_record['id']);
                     if (!empty($new_block)) {
                         // Remove extra param from block's payload.
                         $palyload = json_decode($new_block->payload, true);
-                        unset($palyload['copied_from']);
+                        unset($palyload['copied_token']);
                         $new_block->payload = json_encode($palyload);
                         $new_block->store();
                         echo "Block's Playload cleared \n";

cronjobs/opencast_courseware_block_copy_mapping.php

@@ -79,6 +79,9 @@ public function execute($last_result, $parameters = array())
                     // check if video exists in Stud.IP
                     $video = Videos::findByEpisode($event->identifier);
 
+                    $video->created = date('Y-m-d H:i:s', strtotime($event->created));
+                    $video->store();
+
                     if ($video->config_id != $config->id) {
                         echo 'config id mismatch for Video with id: '. $video->id .", $config->id <> {$video->config_id}\n";
                         continue;

cronjobs/opencast_sync_acls.php

@@ -4,6 +4,7 @@
 use Opis\JsonSchema\Schema;
 use Opencast\Models\VideoCoursewareBlocks;
 use Opencast\Models\CoursewareBlockMappings;
+use Opencast\Models\Videos;
 /**
  * This class represents the content of a Courseware test block.
  *
@@ -63,7 +64,10 @@ public function copyPayload(string $rangeId = ''): array
         $token = md5($this->block['id'] . time());
         $payload['copied_token'] = $token;
 
-        CoursewareBlockMappings::setRecord($token, $payload['token'], $rangeId);
+        if (!empty($payload['token']) && Course::exists($rangeId)) {
+            $video = Videos::findByToken($payload['token']);
+            CoursewareBlockMappings::setRecord($token, $video->id, $rangeId);
+        }
 
         return $payload;
     }

lib/BlockTypes/OpencastBlockV3.php

@@ -115,7 +115,8 @@ public static function getCourseVideosTags($course_id)
                 ' INNER JOIN oc_playlist_seminar AS ops ON (ops.playlist_id = opv.playlist_id AND ops.seminar_id = :cid)';
         $params = [':cid' => $course_id];
 
-        if (!$perm->have_studip_perm('dozent', $course_id)) {
+        $required_course_perm = \Config::get()->OPENCAST_TUTOR_EPISODE_PERM ? 'tutor' : 'dozent';
+        if (!$perm->have_studip_perm($required_course_perm, $course_id)) {
             $query .= ' LEFT JOIN oc_playlist_seminar_video AS opsv ON (opsv.playlist_seminar_id = ops.id AND opsv.video_id = opv.video_id)'.
                 ' WHERE (opsv.visibility IS NULL AND opsv.visible_timestamp IS NULL AND ops.visibility = "visible"'.
                 ' OR opsv.visibility = "visible" AND opsv.visible_timestamp IS NULL'.

lib/Models/Tags.php

@@ -109,7 +109,7 @@ public static function getPlaylistVideos($playlist_id, $filters)
             $sql .= ' INNER JOIN oc_playlist_seminar AS ops ON (ops.seminar_id = :cid AND ops.playlist_id = opv.playlist_id)'.
                     ' LEFT JOIN oc_playlist_seminar_video AS opsv ON (opsv.playlist_seminar_id = ops.id AND opsv.video_id = opv.video_id)';
 
-            $where = ' WHERE '. self::getVisibilitySql();
+            $where = ' WHERE '. self::getVisibilitySql($cid);
 
             $params[':cid'] = $cid;
         }
@@ -150,7 +150,7 @@ public static function getCourseVideos($course_id, $filters)
         if (!$perm->have_studip_perm($required_course_perm, $course_id)) {
             $sql .= ' LEFT JOIN oc_playlist_seminar_video AS opsv ON (opsv.playlist_seminar_id = ops.id AND opsv.video_id = opv.video_id)';
 
-            $where = ' WHERE '. self::getVisibilitySql();
+            $where = ' WHERE '. self::getVisibilitySql($course_id);
         }
 
         $query = [
@@ -162,10 +162,15 @@ public static function getCourseVideos($course_id, $filters)
         return self::getFilteredVideos($query, $filters);
     }
 
-    private static function getVisibilitySql()
+    private static function getVisibilitySql($course_id)
     {
         // if each video has to explicitly set to visible, filter out everything else
-        if (\Config::get()->OPENCAST_HIDE_EPISODES) {
+        $course_hide_episodes = \Config::get()->OPENCAST_HIDE_EPISODES;
+        $course_default_episodes_visibility = \CourseConfig::get($course_id)->OPENCAST_COURSE_DEFAULT_EPISODES_VISIBILITY ?? 'default';
+        if ($course_default_episodes_visibility !== 'default') {
+            $course_hide_episodes = $course_default_episodes_visibility === 'hidden' ? true : false;
+        }
+        if ($course_hide_episodes) {
             return '(
                 (opsv.visibility = "visible" AND opsv.visible_timestamp IS NULL)
                 OR (opsv.visible_timestamp < NOW())
@@ -494,7 +499,7 @@ public static function getNumberOfNewCourseVideos($course_id, $last_visit, $user
         if (!$perm->have_perm('dozent', $user_id)) {
             $sql .= ' LEFT JOIN oc_playlist_seminar_video AS opsv ON (opsv.playlist_seminar_id = ops.id AND opsv.video_id = opv.video_id)';
 
-            $where .= ' AND '. self::getVisibilitySql();
+            $where .= ' AND '. self::getVisibilitySql($course_id);
         }
 
         $sql .= $where;
@@ -980,7 +985,7 @@ public static function parseEvent($eventType, $episode, $video)
             $presentation_download = [];
             $audio_download        = [];
             $annotation_tool       = false;
-            $duration              = 0;
+            $duration              = $video->duration;
             $track_link            = '';
             $livestream_link       = '';
 

lib/Models/Videos.php

@@ -126,7 +126,7 @@ public static function hasRole($check_role, $user_id = null)
      * @param string $check_role
      * @param string $user_id
      *
-     * @return boolean
+     * @return array|boolean list of institutes or false if the checks are not met!
      */
     public static function getRoleInstitutes($check_role, $user_id)
     {

lib/Providers/Perm.php

@@ -63,7 +63,6 @@ public function authenticatedRoutes(RouteCollectorProxy $group)
 
         $group->get("/videos/{token}/shares", Routes\Video\VideoSharesList::class);
         $group->put("/videos/{token}/shares", Routes\Video\VideoSharesUpdate::class);
-        $group->post("/videos/{course_id}/copy", Routes\Video\VideoCopyToCourse::class);
 
         $group->put("/videos/{token}/worldwide_share", Routes\Video\VideoWorldwideShareUpdate::class);
 
@@ -108,6 +107,8 @@ public function authenticatedRoutes(RouteCollectorProxy $group)
         $group->delete("/courses/{course_id}/playlist/{token}", Routes\Course\CourseRemovePlaylist::class);
 
         $group->put("/courses/{course_id}/upload/{upload}", Routes\Course\CourseSetUpload::class); // TODO: document in api docs
+        // TODO: document in api docs?
+        $group->put("/courses/{course_id}/episodes_visibility", Routes\Course\CourseSetDefaultVideosVisibility::class);
 
         $group->get("/courses/videos", Routes\Course\CourseListForUserVideos::class);
         $group->get("/courses/videos/playlist/{token}", Routes\Course\CourseListForPlaylistVideos::class);

lib/RouteMap.php

@@ -36,7 +36,8 @@ public function __invoke(Request $request, Response $response, $args)
 
         if (empty($series)) {
             // only tutor or above should be able to trigger this series creation!
-            if ($perm->have_studip_perm('tutor', $course_id)) {
+            $required_course_perm = \Config::get()->OPENCAST_TUTOR_EPISODE_PERM ? 'tutor' : 'dozent';
+            if ($perm->have_studip_perm($required_course_perm, $course_id)) {
                 // No series for this course yet! Create one!
                 $config_id = \Config::get()->OPENCAST_DEFAULT_SERVER;
                 $series_client = new SeriesClient($config_id);
@@ -53,16 +54,31 @@ public function __invoke(Request $request, Response $response, $args)
             }
         }
 
+        // Default Course Episodes Visibility.
+        // The course specific config option OPENCAST_COURSE_DEFAULT_EPISODES_VISIBILITY has 3 possible values:
+            // - default: use the default value from the config (OPENCAST_HIDE_EPISODES) at the time!
+            // - visible: show the episodes to students by default
+            // - hidden: hide the episodes from students by default
+        // Getting with the default value from the config (OPENCAST_HIDE_EPISODES).
+        $course_hide_episodes = \Config::get()->OPENCAST_HIDE_EPISODES;
+        $course_default_episodes_visibility = \CourseConfig::get($course_id)->OPENCAST_COURSE_DEFAULT_EPISODES_VISIBILITY
+                                                ?? 'default';
+        if ($course_default_episodes_visibility !== 'default') {
+            $course_hide_episodes = $course_default_episodes_visibility === 'hidden' ? true : false;
+        }
+
         $results = [
             'series'    => [
                 'series_id'  => $series->series_id,
             ],
-            'workflow'              => SeminarWorkflowConfiguration::getWorkflowForCourse($course_id),
-            'edit_allowed'          => Perm::editAllowed($course_id),
-            'upload_allowed'        => Perm::uploadAllowed($course_id),
-            'upload_enabled'        => \CourseConfig::get($course_id)->OPENCAST_ALLOW_STUDENT_UPLOAD ? 1 : 0,
-            'has_default_playlist'  => Helpers::checkCourseDefaultPlaylist($course_id),
-            'scheduling_allowed'    => Perm::schedulingAllowed($course_id)
+            'workflow'                           => SeminarWorkflowConfiguration::getWorkflowForCourse($course_id),
+            'edit_allowed'                       => Perm::editAllowed($course_id),
+            'upload_allowed'                     => Perm::uploadAllowed($course_id),
+            'upload_enabled'                     => \CourseConfig::get($course_id)->OPENCAST_ALLOW_STUDENT_UPLOAD ? 1 : 0,
+            'has_default_playlist'               => Helpers::checkCourseDefaultPlaylist($course_id),
+            'scheduling_allowed'                 => Perm::schedulingAllowed($course_id),
+            'course_hide_episodes'               => $course_hide_episodes, // Use this in a course instead of OPENCAST_HIDE_EPISODES!
+            'course_default_episodes_visibility' => $course_default_episodes_visibility,
         ];
 
         return $this->createResponse($results, $response);