Merge branch '1.10.x' of github.com:chamilo/chamilo-lms into 1.10.x

1.10.x
jmontoyaa 9 years ago
commit 2df7364593
  1. 9
      plugin/bbb/admin.php
  2. 13
      plugin/bbb/lib/bbb.lib.php

@ -43,10 +43,11 @@ if ($form->validate()) {
foreach ($meetings as &$meeting) {
$participants = $bbb->findMeetingParticipants($meeting['id']);
/** @var User $participant */
foreach ($participants as $participant) {
$meeting['participants'][] = $participant['participant']->getCompleteName()
. ' (' . $participant['participant']->getUsername() . ')';
foreach ($participants as $meetingParticipant) {
/** @var User $participant */
$participant = $meetingParticipant['participant'];
$meeting['participants'][] = $participant->getCompleteName()
. ' (' . $participant->getEmail() . ')';
}
}

@ -570,7 +570,6 @@ class bbb
}
$record = [];
$recordLink = get_lang('NoRecording');
if (empty($meetingDB['video_url'])) {
$recordingParams = ['meetingId' => $mId];
@ -595,11 +594,13 @@ class bbb
$record['playbackFormatUrl'] = $meetingDB['video_url'];
}
$recordLink = Display::url(
$this->plugin->get_lang('ViewRecord'),
$record['playbackFormatUrl'],
['target' => '_blank']
);
$recordLink = isset($record['playbackFormatUrl']) && !empty($record['playbackFormatUrl'])
? Display::url(
$this->plugin->get_lang('ViewRecord'),
$record['playbackFormatUrl'],
['target' => '_blank']
)
: get_lang('NoRecording');
if ($isAdminReport) {
$courseInfo = api_get_course_info_by_id($meetingDB['c_id']);

Loading…
Cancel
Save