Minor - Plugins: Zoom - auto add a student (from course) to a meeting

BT#17288
pull/3433/head
Julio Montoya 5 years ago
parent 44b2f5dfe3
commit 1a1ca985b3
  1. 9
      plugin/zoom/join_meeting.php
  2. 14
      plugin/zoom/lib/ZoomPlugin.php
  3. 4
      plugin/zoom/start.php
  4. 6
      plugin/zoom/view/start.tpl

@ -18,12 +18,11 @@ $plugin = ZoomPlugin::create();
$content = '';
/** @var Meeting $meeting */
$meeting = $plugin->getMeetingRepository()->findOneBy(['meetingId' => $meetingId]);
if (null === $meeting) {
api_not_allowed(true, $plugin->get_lang('MeetingNotFound'));
}
try {
if (null === $meeting) {
throw new Exception($plugin->get_lang('Meeting not found'));
}
if ($meeting->isCourseMeeting()) {
api_protect_course_script(true);
}
@ -33,8 +32,6 @@ try {
if (!empty($startJoinURL)) {
$content .= Display::url($plugin->get_lang('EnterMeeting'), $startJoinURL, ['class' => 'btn btn-primary']);
} else {
//echo Display::return_message($plugin->get_lang('ConferenceNotStarted'), 'warning');
}
if ($plugin->userIsConferenceManager($meeting)) {

@ -1186,9 +1186,21 @@ class ZoomPlugin extends Plugin
return $this->registerUser($meeting, $currentUser)->getCreatedRegistration()->join_url;
}
if ($meeting->isCourseMeeting() && $this->userIsCourseConferenceManager()) {
if ($meeting->isCourseMeeting()) {
if ($this->userIsCourseConferenceManager()) {
return $meeting->getMeetingInfoGet()->start_url;
}
$isSubscribed = CourseManager::is_user_subscribed_in_course(
$currentUser->getId(),
api_get_course_id(),
api_get_session_id()
);
if ($isSubscribed) {
return $this->registerUser($meeting, $currentUser)->getCreatedRegistration()->join_url;
}
}
if ('true' === $this->get('enableParticipantRegistration')) {
//if ('true' === $this->get('enableParticipantRegistration') && $meeting->requiresRegistration()) {

@ -23,7 +23,8 @@ $group = api_get_group_entity();
$session = api_get_session_entity();
$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
if ($plugin->userIsCourseConferenceManager()) {
$isManager = $plugin->userIsCourseConferenceManager();
if ($isManager) {
switch ($action) {
case 'delete':
$meeting = $plugin->getMeetingRepository()->findOneBy(['meetingId' => $_REQUEST['meetingId']]);
@ -63,5 +64,6 @@ try {
);
}
$tpl->assign('is_manager', $isManager);
$tpl->assign('content', $tpl->fetch('zoom/view/start.tpl'));
$tpl->display_one_col_template();

@ -29,8 +29,9 @@
{{ 'Join'|get_plugin_lang('ZoomPlugin') }}
</a>
{% if is_manager %}
<a class="btn btn-default" href="meeting.php?meetingId={{ meeting.meetingId }}">
{{ 'Edit'|get_lang }}
{{ 'Details'|get_plugin_lang('ZoomPlugin') }}
</a>
<a class="btn btn-danger"
@ -39,12 +40,11 @@
>
{{ 'Delete'|get_lang }}
</a>
{% endif %}
</td>
</tr>
{% endfor %}
</table>
{% else %}
<!-- p>No scheduled meeting currently</p -->
{% endif %}
{% if scheduleMeetingForm %}

Loading…
Cancel
Save