Merge branch 'master' of github.com:chamilo/chamilo-lms

Author: ywarnier

public/plugin/Bbb/lib/bbb.lib.php

@@ -1248,12 +1248,17 @@ public function getMeetings(
                 $recordings = $this->api->getRecordingsWithXmlResponseArray(['meetingId' => $meeting->getRemoteId()]);
                 if (!empty($recordings) && (!isset($recordings['messageKey']) || $recordings['messageKey'] !== 'noRecordings')) {
                     $record = end($recordings);
-                    if (isset($record['playbackFormatUrl'])) {
-                        $recordLink = Display::url(
-                            $this->plugin->get_lang('ViewRecord'),
-                            $record['playbackFormatUrl'],
-                            ['target' => '_blank', 'class' => 'btn btn--plain']
-                        );
+                    if (isset($record['playbackFormat'])) {
+                        $recordLink = array();
+                        foreach ($record['playbackFormat'] as $format) {
+                            $this->insertMeetingFormat(intval($meeting->getId()), $format->type->__toString(), $format->url->__toString());
+                            $recordLink['record'][] = 1;
+                            $recordLink[] = Display::url(
+                                $this->plugin->get_lang($format->type->__toString()),
+                                $format->url->__toString(),
+                                ['target' => '_blank', 'class' => 'btn btn--plain']
+                            );
+                        }
                         $this->updateMeetingVideoUrl($meeting->getId(), $record['playbackFormatUrl']);
                     }
                 }
@@ -1286,6 +1291,39 @@ public function getMeetings(
 
         return $result;
     }
+    
+    /**
+     * @param int $meetingId
+     * @param string $formatType
+     * @param string $resourceUrl
+     *
+     * @return bool|int
+     */
+    public function insertMeetingFormat(int $meetingId, string $formatType, string $resourceUrl)
+    {
+        $em = Database::getManager();
+        $sm = $em->getConnection()->getSchemaManager();
+        if ($sm->tablesExist('conference_recording')) {
+            $params = [
+                'format_type = ? and meeting_id = ? and resource_url = ?' => [$formatType, $meetingId, $resourceUrl],
+            ];
+            $result = Database::select(
+                'id',
+                'conference_recording',
+                ['where' => $params]
+            );
+            if (empty($result)) {
+                return Database::insert(
+                    'conference_recording',
+                    [
+                        'format_type' => $formatType,
+                        'resource_url' => $resourceUrl,
+                        'meeting_id' => $meetingId
+                    ]
+                );
+            }
+        }
+    }
 
     private function convertMeetingToArray(ConferenceMeeting $meeting): array
     {

public/plugin/Bbb/lib/bbb_api.php

@@ -358,13 +358,17 @@ public function getRecordingsWithXmlResponseArray(array $p): array
 
         if (isset($xml->recordings->recording)) {
             foreach ($xml->recordings->recording as $rec) {
+                foreach ($rec->playback->format as $format) {
+                    $formats[] = $format;
+                }
                 $out[] = [
                     'recordId'             => (string) $rec->recordID,
                     'meetingId'            => (string) $rec->meetingID,
                     'name'                 => (string) $rec->name,
                     'published'            => (string) $rec->published,
                     'startTime'            => (string) $rec->startTime,
                     'endTime'              => (string) $rec->endTime,
+                    'playbackFormat'       => $formats,
                     'playbackFormatType'   => (string) $rec->playback->format->type,
                     'playbackFormatUrl'    => (string) $rec->playback->format->url,
                     'playbackFormatLength' => (string) $rec->playback->format->length,

public/plugin/Bbb/view/listing.tpl

@@ -110,8 +110,12 @@
                         {% endif %}
                     </td>
                     <td class="px-4 py-2">
-                        {% if meeting.record == 1 %}
-                        {{ meeting.show_links }}
+                        {% if meeting.show_links.record  %}
+                            {% for link in meeting.show_links %}
+                                {% if link is not iterable  %}
+                                    {{ link }}
+                                {% endif %}
+                            {% endfor %}
                         {% else %}
                         <span class="text-gray-400">{{ 'NoRecording'|get_plugin_lang('BBBPlugin') }}</span>
                         {% endif %}

src/CoreBundle/Entity/AccessUrl.php

@@ -26,7 +26,6 @@
 #[ApiResource(
     normalizationContext: [
         'groups' => ['access_url:read'],
-        'swagger_definition_name' => 'Read',
     ],
     denormalizationContext: [
         'groups' => ['access_url:write', 'course_category:write'],

src/CoreBundle/Entity/CourseCategory.php

@@ -10,8 +10,12 @@
 use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
 use ApiPlatform\Metadata\ApiFilter;
 use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Delete;
+use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
 use ApiPlatform\Metadata\Link;
+use ApiPlatform\Metadata\Patch;
+use ApiPlatform\Metadata\Post;
 use ApiPlatform\Serializer\Filter\PropertyFilter;
 use Chamilo\CoreBundle\Repository\CourseCategoryRepository;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -23,14 +27,19 @@
 use Symfony\Component\Validator\Constraints as Assert;
 
 #[ApiResource(
+    operations: [
+        new Get(),
+        new GetCollection(),
+        new Post(security: "is_granted('ROLE_ADMIN')"),
+        new Delete(security: "is_granted('ROLE_ADMIN')"),
+        new Patch(security: "is_granted('ROLE_ADMIN')"),
+    ],
     normalizationContext: [
         'groups' => ['course_category:read', 'course:read'],
-        'swagger_definition_name' => 'Read',
     ],
     denormalizationContext: [
         'groups' => ['course_category:write', 'course:write'],
     ],
-    security: "is_granted('ROLE_ADMIN')"
 )]
 #[ORM\Table(name: 'course_category')]
 #[ORM\Index(columns: ['parent_id'], name: 'parent_id')]