diff --git a/plugin/zoom/lang/french.php b/plugin/zoom/lang/french.php index cc39a6829f..f95b611f6c 100755 --- a/plugin/zoom/lang/french.php +++ b/plugin/zoom/lang/french.php @@ -27,7 +27,8 @@ Pour les obtenir, créez une JWT app :
La page App Credentials affiche la clé (API Key) and le code secret (API Secret) à saisir ici.
Attention : -
Zoom n'est PAS un logiciel libre et des règles spécifiques de protection des données personnelles s'y appliquent. +
Zoom n'est PAS un logiciel libre +et des règles spécifiques de protection des données personnelles s'y appliquent. Merci de vérifier auprès de Zoom qu'elles sont satisfaisantes pour vous et les apprenants qui l'utiliseront."; // please keep these lines alphabetically sorted diff --git a/plugin/zoom/lib/API/JWTClient.php b/plugin/zoom/lib/API/JWTClient.php index 2c01dfe7fe..95351d5b84 100755 --- a/plugin/zoom/lib/API/JWTClient.php +++ b/plugin/zoom/lib/API/JWTClient.php @@ -298,7 +298,7 @@ class JWTClient * @param string $relativePath @see self::send * @param string $listClassName name of the API's list class, such as 'MeetingList' * @param string $arrayPropertyName name of the class property that contains the actual items, such as 'meetings' - * @param array $parameters query string parameters associative array + * @param array $parameters query string parameters associative array * * @throws Exception on API, JSON or other error * diff --git a/plugin/zoom/lib/API/Meeting.php b/plugin/zoom/lib/API/Meeting.php index eadcd0d297..d8dbd1a40c 100644 --- a/plugin/zoom/lib/API/Meeting.php +++ b/plugin/zoom/lib/API/Meeting.php @@ -56,7 +56,7 @@ class Meeting } /** - * @inheritDoc + * {@inheritdoc} */ protected function itemClass($propertyName) { diff --git a/plugin/zoom/lib/API/MeetingInstances.php b/plugin/zoom/lib/API/MeetingInstances.php index 4f7a0efa85..41102898be 100644 --- a/plugin/zoom/lib/API/MeetingInstances.php +++ b/plugin/zoom/lib/API/MeetingInstances.php @@ -21,7 +21,7 @@ class MeetingInstances } /** - * @inheritDoc + * {@inheritdoc} */ protected function itemClass($propertyName) { diff --git a/plugin/zoom/lib/API/MeetingList.php b/plugin/zoom/lib/API/MeetingList.php index c46e22627f..c6ade8aea9 100644 --- a/plugin/zoom/lib/API/MeetingList.php +++ b/plugin/zoom/lib/API/MeetingList.php @@ -21,7 +21,7 @@ class MeetingList } /** - * @inheritDoc + * {@inheritdoc} */ protected function itemClass($propertyName) { diff --git a/plugin/zoom/lib/API/MeetingListItem.php b/plugin/zoom/lib/API/MeetingListItem.php index c1bf5a9fb9..4180f35926 100644 --- a/plugin/zoom/lib/API/MeetingListItem.php +++ b/plugin/zoom/lib/API/MeetingListItem.php @@ -29,7 +29,7 @@ class MeetingListItem // public $agenda; /** - * @inheritDoc + * {@inheritdoc} */ protected function itemClass($propertyName) { diff --git a/plugin/zoom/lib/API/ParticipantList.php b/plugin/zoom/lib/API/ParticipantList.php index 3751ff0073..a0d3b4f655 100644 --- a/plugin/zoom/lib/API/ParticipantList.php +++ b/plugin/zoom/lib/API/ParticipantList.php @@ -21,7 +21,7 @@ class ParticipantList } /** - * @inheritDoc + * {@inheritdoc} */ protected function itemClass($propertyName) { diff --git a/plugin/zoom/lib/API/RecordingMeeting.php b/plugin/zoom/lib/API/RecordingMeeting.php index 61ef3b6862..499ff53fe3 100644 --- a/plugin/zoom/lib/API/RecordingMeeting.php +++ b/plugin/zoom/lib/API/RecordingMeeting.php @@ -48,7 +48,7 @@ class RecordingMeeting } /** - * @inheritDoc + * {@inheritdoc} */ protected function itemClass($propertyName) { diff --git a/plugin/zoom/lib/CourseMeeting.php b/plugin/zoom/lib/CourseMeeting.php index a93324d977..2be4fb9cd0 100644 --- a/plugin/zoom/lib/CourseMeeting.php +++ b/plugin/zoom/lib/CourseMeeting.php @@ -11,13 +11,14 @@ class CourseMeeting extends API\Meeting use DisplayableMeetingTrait; /** - * @inheritDoc + * {@inheritdoc} */ public static function fromJson($json) { $instance = parent::fromJson($json); $instance->decodeAndRemoveTag(); $instance->initializeDisplayableProperties(); + return $instance; } @@ -38,6 +39,7 @@ class CourseMeeting extends API\Meeting $instance = parent::fromTopicAndType($topic, $type); $instance->setCourseAndSessionId($courseId, $sessionId); $instance->initializeDisplayableProperties(); + return $instance; } } diff --git a/plugin/zoom/lib/CourseMeetingInfoGet.php b/plugin/zoom/lib/CourseMeetingInfoGet.php index c7b2e7a25a..033f3e62d4 100644 --- a/plugin/zoom/lib/CourseMeetingInfoGet.php +++ b/plugin/zoom/lib/CourseMeetingInfoGet.php @@ -11,13 +11,14 @@ class CourseMeetingInfoGet extends API\MeetingInfoGet use DisplayableMeetingTrait; /** - * @inheritDoc + * {@inheritdoc} */ public static function fromJson($json) { $instance = parent::fromJson($json); $instance->decodeAndRemoveTag(); $instance->initializeDisplayableProperties(); + return $instance; } diff --git a/plugin/zoom/lib/CourseMeetingList.php b/plugin/zoom/lib/CourseMeetingList.php index 9451fd92b2..acd6014287 100644 --- a/plugin/zoom/lib/CourseMeetingList.php +++ b/plugin/zoom/lib/CourseMeetingList.php @@ -6,13 +6,14 @@ namespace Chamilo\PluginBundle\Zoom; class CourseMeetingList extends API\MeetingList { /** - * @inheritDoc + * {@inheritdoc} */ protected function itemClass($propertyName) { if ('meetings' === $propertyName) { return CourseMeetingListItem::class; } + return parent::itemClass($propertyName); } } diff --git a/plugin/zoom/lib/CourseMeetingListItem.php b/plugin/zoom/lib/CourseMeetingListItem.php index 2ce63f49f6..c019da04e9 100644 --- a/plugin/zoom/lib/CourseMeetingListItem.php +++ b/plugin/zoom/lib/CourseMeetingListItem.php @@ -11,13 +11,14 @@ class CourseMeetingListItem extends API\MeetingListItem use DisplayableMeetingTrait; /** - * @inheritDoc + * {@inheritdoc} */ public static function fromJson($json) { $instance = parent::fromJson($json); $instance->decodeAndRemoveTag(); $instance->initializeDisplayableProperties(); + return $instance; } diff --git a/plugin/zoom/lib/CourseMeetingTrait.php b/plugin/zoom/lib/CourseMeetingTrait.php index 641ff33bb2..2b6c062bb9 100644 --- a/plugin/zoom/lib/CourseMeetingTrait.php +++ b/plugin/zoom/lib/CourseMeetingTrait.php @@ -6,7 +6,7 @@ namespace Chamilo\PluginBundle\Zoom; /** * Trait CourseMeetingTrait. - * A Zoom meeting linked to a (course, session) pair + * A Zoom meeting linked to a (course, session) pair. * * @package Chamilo\PluginBundle\Zoom */ diff --git a/plugin/zoom/lib/DisplayableMeetingTrait.php b/plugin/zoom/lib/DisplayableMeetingTrait.php index 136755292b..72d88138c5 100644 --- a/plugin/zoom/lib/DisplayableMeetingTrait.php +++ b/plugin/zoom/lib/DisplayableMeetingTrait.php @@ -51,7 +51,7 @@ trait DisplayableMeetingTrait if (!empty($this->duration)) { $now = new DateTime(); $later = new DateTime(); - $later->add(new DateInterval('PT' . $this->duration . 'M')); + $later->add(new DateInterval('PT'.$this->duration.'M')); $this->durationInterval = $later->diff($now); $this->formattedDuration = $this->durationInterval->format(get_lang('%Hh%I')); } diff --git a/plugin/zoom/lib/zoom_plugin.class.php b/plugin/zoom/lib/zoom_plugin.class.php index 920e368861..22f1ef1667 100755 --- a/plugin/zoom/lib/zoom_plugin.class.php +++ b/plugin/zoom/lib/zoom_plugin.class.php @@ -206,7 +206,7 @@ class ZoomPlugin extends Plugin * Updates a meeting. * * @param int $meetingId - * @param CourseMeetingInfoGet $meeting with updated properties + * @param CourseMeetingInfoGet $meeting with updated properties * * @throws Exception on API error */ @@ -268,29 +268,6 @@ class ZoomPlugin extends Plugin return $this->jwtClient()->getParticipants($meetingUUID); } - /** - * Adds a link to a meeting's recordings. - * - * @param string $meetingUUID UUID of the meeting - * - * @throws Exception on API error - * - * @return Link the newly added link - */ - public function copyRecordingToLinkTool($meetingUUID) - { - $recordings = $this->jwtClient()->getRecordings($meetingUUID); - $link = new Link(); - $link->save( - [ - 'url' => $recordings->share_url, - 'title' => $recordings->topic, - ] - ); - - return $link; - } - /** * Caches and returns the JWT client instance, initialized with plugin settings. * @@ -343,6 +320,7 @@ class ZoomPlugin extends Plugin { $meeting->settings->auto_recording = 'cloud'; $meeting->tagAgenda(); + return CourseMeetingInfoGet::fromMeetingInfoGet($this->jwtClient()->createMeeting($meeting)); } }