Minor code style fix - refs BT#17288

pull/3274/head
Sébastien Ducoulombier 6 years ago
parent 4c55d67a22
commit 296db4e016
  1. 3
      plugin/zoom/lang/french.php
  2. 2
      plugin/zoom/lib/API/JWTClient.php
  3. 2
      plugin/zoom/lib/API/Meeting.php
  4. 2
      plugin/zoom/lib/API/MeetingInstances.php
  5. 2
      plugin/zoom/lib/API/MeetingList.php
  6. 2
      plugin/zoom/lib/API/MeetingListItem.php
  7. 2
      plugin/zoom/lib/API/ParticipantList.php
  8. 2
      plugin/zoom/lib/API/RecordingMeeting.php
  9. 4
      plugin/zoom/lib/CourseMeeting.php
  10. 3
      plugin/zoom/lib/CourseMeetingInfoGet.php
  11. 3
      plugin/zoom/lib/CourseMeetingList.php
  12. 3
      plugin/zoom/lib/CourseMeetingListItem.php
  13. 2
      plugin/zoom/lib/CourseMeetingTrait.php
  14. 2
      plugin/zoom/lib/DisplayableMeetingTrait.php
  15. 26
      plugin/zoom/lib/zoom_plugin.class.php

@ -27,7 +27,8 @@ Pour les obtenir, créez une <em>JWT app</em> :
<br/>La page <em>App Credentials</em> affiche la clé (API Key) and le code secret (API Secret) à saisir ici.
<br/>
<strong>Attention</strong> :
<br/>Zoom n'est <em>PAS</em> un logiciel libre et des règles spécifiques de protection des données personnelles s'y appliquent.
<br/>Zoom n'est <em>PAS</em> 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

@ -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
*

@ -56,7 +56,7 @@ class Meeting
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function itemClass($propertyName)
{

@ -21,7 +21,7 @@ class MeetingInstances
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function itemClass($propertyName)
{

@ -21,7 +21,7 @@ class MeetingList
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function itemClass($propertyName)
{

@ -29,7 +29,7 @@ class MeetingListItem
// public $agenda;
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function itemClass($propertyName)
{

@ -21,7 +21,7 @@ class ParticipantList
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function itemClass($propertyName)
{

@ -48,7 +48,7 @@ class RecordingMeeting
}
/**
* @inheritDoc
* {@inheritdoc}
*/
protected function itemClass($propertyName)
{

@ -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;
}
}

@ -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;
}

@ -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);
}
}

@ -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;
}

@ -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
*/

@ -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'));
}

@ -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));
}
}

Loading…
Cancel
Save