@@ -104,9 +104,9 @@ discard block |
||
| 104 | 104 | function bigbluebuttonbn_get_join_url($meetingid, $username, $pw, $logouturl, $configtoken = null, |
| 105 | 105 | $userid = null, $clienttype = BIGBLUEBUTTON_CLIENTTYPE_FLASH) { |
| 106 | 106 | $data = ['meetingID' => $meetingid, |
| 107 | - 'fullName' => $username, |
|
| 108 | - 'password' => $pw, |
|
| 109 | - 'logoutURL' => $logouturl, |
|
| 107 | + 'fullName' => $username, |
|
| 108 | + 'password' => $pw, |
|
| 109 | + 'logoutURL' => $logouturl, |
|
| 110 | 110 | ]; |
| 111 | 111 | // Choose between Adobe Flash or HTML5 Client. |
| 112 | 112 | if ( $clienttype == BIGBLUEBUTTON_CLIENTTYPE_HTML5 ) { |
@@ -162,23 +162,23 @@ discard block |
||
| 162 | 162 | function bigbluebuttonbn_get_meeting_info_array($meetingid) { |
| 163 | 163 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 164 | 164 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 165 | - ); |
|
| 165 | + ); |
|
| 166 | 166 | if ($xml && $xml->returncode == 'SUCCESS' && empty($xml->messageKey)) { |
| 167 | 167 | // Meeting info was returned. |
| 168 | 168 | return array('returncode' => $xml->returncode, |
| 169 | - 'meetingID' => $xml->meetingID, |
|
| 170 | - 'moderatorPW' => $xml->moderatorPW, |
|
| 171 | - 'attendeePW' => $xml->attendeePW, |
|
| 172 | - 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 173 | - 'running' => $xml->running, |
|
| 174 | - 'recording' => $xml->recording, |
|
| 175 | - 'startTime' => $xml->startTime, |
|
| 176 | - 'endTime' => $xml->endTime, |
|
| 177 | - 'participantCount' => $xml->participantCount, |
|
| 178 | - 'moderatorCount' => $xml->moderatorCount, |
|
| 179 | - 'attendees' => $xml->attendees, |
|
| 180 | - 'metadata' => $xml->metadata, |
|
| 181 | - ); |
|
| 169 | + 'meetingID' => $xml->meetingID, |
|
| 170 | + 'moderatorPW' => $xml->moderatorPW, |
|
| 171 | + 'attendeePW' => $xml->attendeePW, |
|
| 172 | + 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 173 | + 'running' => $xml->running, |
|
| 174 | + 'recording' => $xml->recording, |
|
| 175 | + 'startTime' => $xml->startTime, |
|
| 176 | + 'endTime' => $xml->endTime, |
|
| 177 | + 'participantCount' => $xml->participantCount, |
|
| 178 | + 'moderatorCount' => $xml->moderatorCount, |
|
| 179 | + 'attendees' => $xml->attendees, |
|
| 180 | + 'metadata' => $xml->metadata, |
|
| 181 | + ); |
|
| 182 | 182 | } |
| 183 | 183 | if ($xml) { |
| 184 | 184 | // Either failure or success without meeting info. |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | function bigbluebuttonbn_get_default_config_xml() { |
| 331 | 331 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 332 | 332 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getDefaultConfigXML') |
| 333 | - ); |
|
| 333 | + ); |
|
| 334 | 334 | return $xml; |
| 335 | 335 | } |
| 336 | 336 | |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | foreach ($ids as $id) { |
| 435 | 435 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 436 | 436 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('deleteRecordings', ['recordID' => $id]) |
| 437 | - ); |
|
| 437 | + ); |
|
| 438 | 438 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 439 | 439 | return false; |
| 440 | 440 | } |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | foreach ($ids as $id) { |
| 454 | 454 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 455 | 455 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('publishRecordings', ['recordID' => $id, 'publish' => $publish]) |
| 456 | - ); |
|
| 456 | + ); |
|
| 457 | 457 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 458 | 458 | return false; |
| 459 | 459 | } |
@@ -472,7 +472,7 @@ discard block |
||
| 472 | 472 | foreach ($ids as $id) { |
| 473 | 473 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 474 | 474 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('updateRecordings', ['recordID' => $id] + (array) $params) |
| 475 | - ); |
|
| 475 | + ); |
|
| 476 | 476 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 477 | 477 | return false; |
| 478 | 478 | } |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | function bigbluebuttonbn_end_meeting($meetingid, $modpw) { |
| 490 | 490 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 491 | 491 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('end', ['meetingID' => $meetingid, 'password' => $modpw]) |
| 492 | - ); |
|
| 492 | + ); |
|
| 493 | 493 | if ($xml) { |
| 494 | 494 | // If the xml packet returned failure it displays the message to the user. |
| 495 | 495 | return array('returncode' => $xml->returncode, 'message' => $xml->message, 'messageKey' => $xml->messageKey); |
@@ -506,7 +506,7 @@ discard block |
||
| 506 | 506 | function bigbluebuttonbn_get_server_version() { |
| 507 | 507 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 508 | 508 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url() |
| 509 | - ); |
|
| 509 | + ); |
|
| 510 | 510 | if ($xml && $xml->returncode == 'SUCCESS') { |
| 511 | 511 | return $xml->version; |
| 512 | 512 | } |
@@ -573,10 +573,10 @@ discard block |
||
| 573 | 573 | } |
| 574 | 574 | $options = array(); |
| 575 | 575 | $options['CURLOPT_HTTPHEADER'] = array( |
| 576 | - 'Content-Type: '.$contenttype, |
|
| 577 | - 'Content-Length: '.strlen($data), |
|
| 578 | - 'Content-Language: en-US', |
|
| 579 | - ); |
|
| 576 | + 'Content-Type: '.$contenttype, |
|
| 577 | + 'Content-Length: '.strlen($data), |
|
| 578 | + 'Content-Language: en-US', |
|
| 579 | + ); |
|
| 580 | 580 | |
| 581 | 581 | return $c->post($url, $data, $options); |
| 582 | 582 | } |
@@ -723,16 +723,16 @@ discard block |
||
| 723 | 723 | 'all' => array( |
| 724 | 724 | 'name' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 725 | 725 | 'children' => [] |
| 726 | - ) |
|
| 727 | - ); |
|
| 726 | + ) |
|
| 727 | + ); |
|
| 728 | 728 | $data['role'] = array( |
| 729 | 729 | 'name' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 730 | 730 | 'children' => bigbluebuttonbn_get_roles_select($context) |
| 731 | - ); |
|
| 731 | + ); |
|
| 732 | 732 | $data['user'] = array( |
| 733 | 733 | 'name' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 734 | 734 | 'children' => bigbluebuttonbn_get_users_select($context) |
| 735 | - ); |
|
| 735 | + ); |
|
| 736 | 736 | return $data; |
| 737 | 737 | } |
| 738 | 738 | |
@@ -775,7 +775,7 @@ discard block |
||
| 775 | 775 | 'selectiontype' => 'all', |
| 776 | 776 | 'selectionid' => 'all', |
| 777 | 777 | 'role' => BIGBLUEBUTTONBN_ROLE_VIEWER |
| 778 | - ); |
|
| 778 | + ); |
|
| 779 | 779 | $defaultrules = explode(',', \mod_bigbluebuttonbn\locallib\config::get('participant_moderator_default')); |
| 780 | 780 | foreach ($defaultrules as $defaultrule) { |
| 781 | 781 | if ($defaultrule == '0') { |
@@ -788,9 +788,9 @@ discard block |
||
| 788 | 788 | continue; |
| 789 | 789 | } |
| 790 | 790 | $participantlist[] = array( |
| 791 | - 'selectiontype' => 'role', |
|
| 792 | - 'selectionid' => $defaultrule, |
|
| 793 | - 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 791 | + 'selectiontype' => 'role', |
|
| 792 | + 'selectionid' => $defaultrule, |
|
| 793 | + 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 794 | 794 | } |
| 795 | 795 | return $participantlist; |
| 796 | 796 | } |
@@ -829,11 +829,11 @@ discard block |
||
| 829 | 829 | 'all' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 830 | 830 | 'role' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 831 | 831 | 'user' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 832 | - ], |
|
| 832 | + ], |
|
| 833 | 833 | 'type_selected' => 'all', |
| 834 | 834 | 'options' => ['all' => '---------------'], |
| 835 | 835 | 'selected' => 'all', |
| 836 | - ]; |
|
| 836 | + ]; |
|
| 837 | 837 | } |
| 838 | 838 | |
| 839 | 839 | /** |
@@ -1152,7 +1152,7 @@ discard block |
||
| 1152 | 1152 | // Ping again and refresh the cache. |
| 1153 | 1153 | $meetinginfo = (array) bigbluebuttonbn_wrap_xml_load_file( |
| 1154 | 1154 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 1155 | - ); |
|
| 1155 | + ); |
|
| 1156 | 1156 | $cache->set($meetingid, array('creation_time' => time(), 'meeting_info' => json_encode($meetinginfo))); |
| 1157 | 1157 | return $meetinginfo; |
| 1158 | 1158 | } |
@@ -1566,8 +1566,8 @@ discard block |
||
| 1566 | 1566 | } |
| 1567 | 1567 | $id = 'playbacks-'.$recording['recordID']; |
| 1568 | 1568 | $recordingtypes = html_writer::start_tag('div', array('id' => $id, 'data-imported' => $dataimported, |
| 1569 | - 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
| 1570 | - 'title' => $title, $visibility => $visibility)); |
|
| 1569 | + 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
| 1570 | + 'title' => $title, $visibility => $visibility)); |
|
| 1571 | 1571 | foreach ($recording['playbacks'] as $playback) { |
| 1572 | 1572 | $recordingtypes .= bigbluebuttonbn_get_recording_data_row_type($recording, $bbbsession, $playback); |
| 1573 | 1573 | } |
@@ -1591,7 +1591,7 @@ discard block |
||
| 1591 | 1591 | } |
| 1592 | 1592 | $text = get_string('view_recording_format_'.$playback['type'], 'bigbluebuttonbn'); |
| 1593 | 1593 | $href = $CFG->wwwroot . '/mod/bigbluebuttonbn/bbb_view.php?action=play&bn=' . $bbbsession['bigbluebuttonbn']->id . |
| 1594 | - '&mid='.$recording['meetingID'] . '&rid=' . $recording['recordID'] . '&rtype=' . $playback['type']; |
|
| 1594 | + '&mid='.$recording['meetingID'] . '&rid=' . $recording['recordID'] . '&rtype=' . $playback['type']; |
|
| 1595 | 1595 | if (!isset($recording['imported']) || !isset($recording['protected']) || $recording['protected'] === 'false') { |
| 1596 | 1596 | $href .= '&href='.urlencode(trim($playback['url'])); |
| 1597 | 1597 | } |
@@ -1602,7 +1602,7 @@ discard block |
||
| 1602 | 1602 | 'data-action' => 'play', |
| 1603 | 1603 | 'data-target' => $playback['type'], |
| 1604 | 1604 | 'data-href' => $href, |
| 1605 | - ); |
|
| 1605 | + ); |
|
| 1606 | 1606 | if (!bigbluebuttonbn_is_bn_server() && !bigbluebuttonbn_is_valid_resource(trim($playback['url']))) { |
| 1607 | 1607 | $linkattributes['class'] = 'btn btn-sm btn-warning'; |
| 1608 | 1608 | $linkattributes['title'] = get_string('view_recording_format_errror_unreachable', 'bigbluebuttonbn'); |
@@ -1767,10 +1767,10 @@ discard block |
||
| 1767 | 1767 | 'id' => $id, |
| 1768 | 1768 | 'onclick' => $onclick, |
| 1769 | 1769 | 'data-action' => $data['action'] |
| 1770 | - ); |
|
| 1770 | + ); |
|
| 1771 | 1771 | if (!isset($recording['imported'])) { |
| 1772 | 1772 | $linkattributes['data-links'] = bigbluebuttonbn_count_recording_imported_instances( |
| 1773 | - $recording['recordID']); |
|
| 1773 | + $recording['recordID']); |
|
| 1774 | 1774 | } |
| 1775 | 1775 | if (isset($data['disabled'])) { |
| 1776 | 1776 | $iconattributes['class'] .= ' fa-' . $data['disabled']; |
@@ -2394,17 +2394,17 @@ discard block |
||
| 2394 | 2394 | function bigbluebuttonbn_get_instance_type_profiles() { |
| 2395 | 2395 | $instanceprofiles = array( |
| 2396 | 2396 | BIGBLUEBUTTONBN_TYPE_ALL => array('id' => BIGBLUEBUTTONBN_TYPE_ALL, |
| 2397 | - 'name' => get_string('instance_type_default', 'bigbluebuttonbn'), |
|
| 2398 | - 'features' => array('all')), |
|
| 2397 | + 'name' => get_string('instance_type_default', 'bigbluebuttonbn'), |
|
| 2398 | + 'features' => array('all')), |
|
| 2399 | 2399 | BIGBLUEBUTTONBN_TYPE_ROOM_ONLY => array('id' => BIGBLUEBUTTONBN_TYPE_ROOM_ONLY, |
| 2400 | - 'name' => get_string('instance_type_room_only', 'bigbluebuttonbn'), |
|
| 2401 | - 'features' => array('showroom', 'welcomemessage', 'voicebridge', 'waitformoderator', 'userlimit', |
|
| 2402 | - 'recording', 'sendnotifications', 'preuploadpresentation', 'permissions', 'schedule', 'groups', |
|
| 2403 | - 'modstandardelshdr', 'availabilityconditionsheader', 'tagshdr', 'competenciessection', |
|
| 2404 | - 'clienttype', 'completionattendance', 'completionengagement')), |
|
| 2400 | + 'name' => get_string('instance_type_room_only', 'bigbluebuttonbn'), |
|
| 2401 | + 'features' => array('showroom', 'welcomemessage', 'voicebridge', 'waitformoderator', 'userlimit', |
|
| 2402 | + 'recording', 'sendnotifications', 'preuploadpresentation', 'permissions', 'schedule', 'groups', |
|
| 2403 | + 'modstandardelshdr', 'availabilityconditionsheader', 'tagshdr', 'competenciessection', |
|
| 2404 | + 'clienttype', 'completionattendance', 'completionengagement')), |
|
| 2405 | 2405 | BIGBLUEBUTTONBN_TYPE_RECORDING_ONLY => array('id' => BIGBLUEBUTTONBN_TYPE_RECORDING_ONLY, |
| 2406 | - 'name' => get_string('instance_type_recording_only', 'bigbluebuttonbn'), |
|
| 2407 | - 'features' => array('showrecordings', 'importrecordings')) |
|
| 2406 | + 'name' => get_string('instance_type_recording_only', 'bigbluebuttonbn'), |
|
| 2407 | + 'features' => array('showrecordings', 'importrecordings')) |
|
| 2408 | 2408 | ); |
| 2409 | 2409 | return $instanceprofiles; |
| 2410 | 2410 | } |
@@ -2491,8 +2491,8 @@ discard block |
||
| 2491 | 2491 | $activitytime = ''; |
| 2492 | 2492 | if ($time) { |
| 2493 | 2493 | $activitytime = calendar_day_representation($time).' '. |
| 2494 | - get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2495 | - calendar_time_representation($time); |
|
| 2494 | + get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2495 | + calendar_time_representation($time); |
|
| 2496 | 2496 | } |
| 2497 | 2497 | return $activitytime; |
| 2498 | 2498 | } |
@@ -2811,7 +2811,7 @@ discard block |
||
| 2811 | 2811 | $renderer->render_group_element('participant_moderator_default', |
| 2812 | 2812 | $renderer->render_group_element_configmultiselect('participant_moderator_default', |
| 2813 | 2813 | array_keys($owner), array_merge($owner, $roles)) |
| 2814 | - ); |
|
| 2814 | + ); |
|
| 2815 | 2815 | } |
| 2816 | 2816 | } |
| 2817 | 2817 | |
@@ -2847,7 +2847,7 @@ discard block |
||
| 2847 | 2847 | // Web Client default. |
| 2848 | 2848 | $default = intval((int)\mod_bigbluebuttonbn\locallib\config::get('clienttype_default')); |
| 2849 | 2849 | $choices = array(BIGBLUEBUTTON_CLIENTTYPE_FLASH => get_string('mod_form_block_clienttype_flash', 'bigbluebuttonbn'), |
| 2850 | - BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
| 2850 | + BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
| 2851 | 2851 | $renderer->render_group_element('clienttype_default', |
| 2852 | 2852 | $renderer->render_group_element_configselect('clienttype_default', |
| 2853 | 2853 | $default, $choices)); |
@@ -2958,7 +2958,7 @@ discard block |
||
| 2958 | 2958 | return $output; |
| 2959 | 2959 | } |
| 2960 | 2960 | $output .= $OUTPUT->box_start('box boxalignleft adminerror alert alert-' . $type . ' alert-block fade in', |
| 2961 | - 'bigbluebuttonbn_view_general_warning') . "\n"; |
|
| 2961 | + 'bigbluebuttonbn_view_general_warning') . "\n"; |
|
| 2962 | 2962 | $output .= ' ' . $message . "\n"; |
| 2963 | 2963 | $output .= ' <div class="singlebutton pull-right">' . "\n"; |
| 2964 | 2964 | if (!empty($href)) { |
@@ -3311,8 +3311,8 @@ discard block |
||
| 3311 | 3311 | array( |
| 3312 | 3312 | 'email' => array('"' . fullname($USER) . '" <' . $USER->email . '>'), |
| 3313 | 3313 | 'context' => $bbbsession['bigbluebuttonbnURL'] |
| 3314 | - ) |
|
| 3315 | - ); |
|
| 3314 | + ) |
|
| 3315 | + ); |
|
| 3316 | 3316 | } |
| 3317 | 3317 | if ((boolean)\mod_bigbluebuttonbn\locallib\config::get('recordingready_enabled')) { |
| 3318 | 3318 | $metadata['bn-recording-ready-url'] = $bbbsession['recordingReadyURL']; |