Merge pull request #262 from ferishili/v2.6_corrections

V2.6 corrections
elan-ev · Apr 30, 2021 · 8415c02 · 8415c02
2 parents 489238a + 5edaeb0
commit 8415c02
Show file tree

Hide file tree

Showing 10 changed files with 94 additions and 34 deletions.
diff --git a/Driver/BigBlueButton.php b/Driver/BigBlueButton.php
@@ -333,7 +333,7 @@ private function buildQueryString($params)
     {
         $segments = array();
         foreach ($params as $key => $value) {
-            if (filter_var($value, FILTER_VALIDATE_BOOLEAN)) {
+            if (filter_var($value, FILTER_VALIDATE_BOOLEAN) && $key != 'duration') {
                 $encoded_value = $value == true ? 'true' : 'false';
             } else {
                 $encoded_value = rawurlencode($value);

diff --git a/app/controllers/index.php b/app/controllers/index.php
@@ -148,6 +148,9 @@ public function index_action()
             if ($err == 'course-type') {
                 PageLayout::postError(_('Der ausgewählte Server ist in diesem Veranstaltungstyp nicht verfügbar.'));
             }
+            if ($err == 'accessdenied') {
+                throw new AccessDeniedException();
+            }
         }
     }
 

diff --git a/app/controllers/room.php b/app/controllers/room.php
@@ -139,7 +139,6 @@ public function join_meeting_action($link_hex, $cid)
         if (!$name) {
             $name = $invitations_link->default_name;
         }
-        $name = $this->sonderzeichen($name);
         $meeting = $invitations_link->meeting;
 
         // Checking Course Type

diff --git a/lib/MeetingsController.php b/lib/MeetingsController.php
@@ -141,4 +141,43 @@ public function checkRecordingCapability($driver, $cid) {
             "seriesid" => $seriesid
         ];
     }
+
+    /**
+     * Checks if a group assigned to a meeting still exists, otherwise remove the group_id
+     * from the MeetingCourse model
+     * 
+     * @param MeetingCourse $meetingCourse the meeting course object
+     */
+    public function checkAssignedGroup(MeetingCourse $meetingCourse) {
+        if ($meetingCourse->group_id) {
+            try {
+                $group = \Statusgruppen::find($meetingCourse->group_id);
+                if (!$group) {
+                    $meetingCourse->group_id = null;
+                    $meetingCourse->store();
+                }
+            } catch (Throwable $e) {
+                throw new Error(_('Unable to check Assigned Group'), 404);
+            }
+        }
+        return $meetingCourse;
+    }
+
+    /**
+     * This method check the permission (global and if he is in the group) for a given user
+     *
+     * @param $group_id The Group-ID
+     * @param $cid The Course-ID
+     * @return bool True if user have permission, False otherwise
+     */
+    public function checkGroupPermission($group_id, $cid)
+    {
+        global $perm, $user;
+        $group = new \Statusgruppen($group_id);
+
+        return $group->isMember($user->id)
+            || ($user && is_object($perm)
+                && $perm->have_studip_perm('tutor', $cid, $user->id)
+            );
+    }
 }
diff --git a/lib/Routes/Rooms/RoomAdd.php b/lib/Routes/Rooms/RoomAdd.php
@@ -130,6 +130,15 @@ public function __invoke(Request $request, Response $response, $args)
                     }
                 }
             }
+
+            // Check Group
+            if (isset($json['group_id']) && !empty($json['group_id'])) {
+                $group = \Statusgruppen::find($json['group_id']);
+                if (!$group) {
+                    $has_error = true;
+                    $error_text = I18N::_('Die ausgewählte Gruppe ist nicht mehr verfügbar');
+                }
+            }
 
             if (!$has_error) {
                 //putting mandatory logoutURL into features

diff --git a/lib/Routes/Rooms/RoomEdit.php b/lib/Routes/Rooms/RoomEdit.php
@@ -53,8 +53,17 @@ public function __invoke(Request $request, Response $response, $args)
         //Checking Server Active
         $active_server = $servers[$json['server_index']]['active'];
 
+        // Check group
+        $allow_group = true;
+        if (isset($json['group_id']) && !empty($json['group_id'])) {
+            $group = \Statusgruppen::find($json['group_id']);
+            if (!$group) {
+                $allow_group = false;
+            }
+        }
+
         $message = [];
-        if (!$meetingCourse->isNew() && $name && $allow_change_driver && $allow_change_server_index && $allow_course_type && $active_server) {
+        if (!$meetingCourse->isNew() && $name && $allow_change_driver && $allow_change_server_index && $allow_course_type && $active_server && $allow_group) {
             $change_date = new \DateTime();
             if (isset($json['active'])) {
                 $meetingCourse->active = $json['active'];
@@ -147,7 +156,12 @@ public function __invoke(Request $request, Response $response, $args)
                 'type' => 'success'
             ];
         } else {
-            $message = ($allow_course_type ? 'Raumeinstellung kann nicht bearbeitet werden!' : 'Der ausgewählte Server ist in diesem Veranstaltungstyp nicht verfügbar');
+            $message = 'Raumeinstellung kann nicht bearbeitet werden!';
+            if (!$allow_group) {
+                $message = 'Die ausgewählte Gruppe ist nicht mehr verfügbar.';
+            } else if (!$allow_course_type) {
+                $message = 'Der ausgewählte Server ist in diesem Veranstaltungstyp nicht verfügbar.';
+            }
             $message = [
                 'text' => I18N::_($message),
                 'type' => 'error'

diff --git a/lib/Routes/Rooms/RoomJoin.php b/lib/Routes/Rooms/RoomJoin.php
@@ -41,11 +41,22 @@ public function __invoke(Request $request, Response $response, $args)
         $room_id = $args['room_id'];
         $cid = $args['cid'];
 
-        if (!$perm->have_studip_perm('user', $cid)) {
-            throw new \AccessDeniedException();
+        $meetingCourse = new MeetingCourse([$room_id, $cid ]);
+        // Check Assigned Group
+        $meetingCourse = $this->checkAssignedGroup($meetingCourse);
+
+        // Check group access permission
+        if (!$perm->have_studip_perm('user', $cid) || ($meetingCourse->group_id && !$this->checkGroupPermission($meetingCourse->group_id, $cid))) {
+            header('Location:' .
+                \URLHelper::getURL(
+                    'plugins.php/meetingplugin/index',
+                    ['cid' => $cid, 'err' => 'accessdenied']
+                )
+            );
+            exit;
         }
 
-        $meeting = Meeting::find($room_id);
+        $meeting = $meetingCourse->meeting;
 
         // Checking folder existence
         $this->checkAssignedFolder($meeting);
@@ -71,8 +82,8 @@ public function __invoke(Request $request, Response $response, $args)
             exit;
         }
 
-        //putting mandatory logoutURL into features
         if ($features = json_decode($meeting->features, true)) {
+            //putting mandatory logoutURL into features
             if (!isset($features['logoutURL'])) {
                 $hostUrl = $request->getUri()->getScheme() . '://' . $request->getUri()->getHost()
                     .($request->getUri()->getPort() ? ':' . $request->getUri()->getPort() : '');
@@ -89,9 +100,9 @@ public function __invoke(Request $request, Response $response, $args)
                 } else if (isset($features['meta_opencast-dc-isPartOf'])) {
                     unset($features['meta_opencast-dc-isPartOf']);
                 }
-                $meeting->features = json_encode($features);
-                $meeting->store();
             }
+            $meeting->features = json_encode($features);
+            $meeting->store();
         }
 
         $driver = $driver_factory->getDriver($meeting->driver, $meeting->server_index);
@@ -100,7 +111,6 @@ public function __invoke(Request $request, Response $response, $args)
             && $features['room_anyone_can_start'] === 'false'
             && !$perm->have_studip_perm('tutor', $cid)
         ) {
-            $meetingCourse = new MeetingCourse([$room_id, $cid ]);
             $status = $driver->isMeetingRunning($meetingCourse->meeting->getMeetingParameters()) === 'true' ? true : false;
 
             if (!$status) {

diff --git a/lib/Routes/Rooms/RoomsList.php b/lib/Routes/Rooms/RoomsList.php
@@ -52,7 +52,11 @@ public function __invoke(Request $request, Response $response, $args)
         foreach ($meeting_course_list_raw as $meetingCourse) {
             try {
 
-                if ($meetingCourse->group_id && !$this->checkPermission($meetingCourse->group_id, $cid)) {
+                // Check Assigned Group
+                $meetingCourse = $this->checkAssignedGroup($meetingCourse);
+
+                // Check group access permission
+                if ($meetingCourse->group_id && !$this->checkGroupPermission($meetingCourse->group_id, $cid)) {
                     continue;
                 }
 
@@ -77,13 +81,13 @@ public function __invoke(Request $request, Response $response, $args)
                     }
                 }
 
-                $meeting = $meetingCourse->meeting->toArray();
-                $meeting = array_merge($meetingCourse->toArray(), $meeting);
                 // Checking folder existence
                 $this->checkAssignedFolder($meetingCourse->meeting);
                 if (!filter_var(Driver::getConfigValueByDriver($meetingCourse->meeting->driver, 'preupload'), FILTER_VALIDATE_BOOLEAN)) {
                     $meeting['preupload_not_allowed'] = _('Das automatische Hochladen von Folien ist derzeit nicht möglich');
                 }
+                $meeting = $meetingCourse->meeting->toArray();
+                $meeting = array_merge($meetingCourse->toArray(), $meeting);
 
                 $meeting['has_recordings'] = false;
 
@@ -180,22 +184,4 @@ private function getFeatures($str_features, $key = null)
             return $features;
         }
     }
-
-    /**
-     * This method check the permission (global and if he is in the group) for a given user
-     *
-     * @param $group_id The Group-ID
-     * @param $cid The Course-ID
-     * @return bool True if user have permission, False otherwise
-     */
-    public function checkPermission($group_id, $cid)
-    {
-        global $perm, $user;
-        $group = new \Statusgruppen($group_id);
-
-        return $group->isMember($user->id)
-            || ($user && is_object($perm)
-                && $perm->have_studip_perm('tutor', $cid, $user->id)
-            );
-    }
 }
diff --git a/vueapp/components/MeetingComponent.vue b/vueapp/components/MeetingComponent.vue
@@ -85,8 +85,8 @@
                             role="status-yellow" size="24"></StudipIcon>
                     <span v-translate>
                         Das Meeting gehört der Gruppe
-                        {{ group_name }}
                     </span>
+                    <span v-if="group_name" v-text="group_name"></span>
                 </div>
 
                 <div v-if="course_config.display.editRoom && room.folder_id !== null && room.details && room.details.folder">

diff --git a/vueapp/components/MeetingGuest.vue b/vueapp/components/MeetingGuest.vue
@@ -96,7 +96,7 @@ export default {
             }
 
             if (this.room && this.guest_name) {
-                this.room.guest_name = this.sonderzeichen(this.guest_name);
+                this.room.guest_name = this.guest_name;
                 this.$store.dispatch(ROOM_JOIN_GUEST, this.room)
                 .then(({ data }) => {
                     if (data.join_url != '') {