@@ -103,9 +103,9 @@ discard block |
||
| 103 | 103 | function bigbluebuttonbn_get_join_url($meetingid, $username, $pw, $logouturl, $configtoken = null, |
| 104 | 104 | $userid = null, $clienttype = BIGBLUEBUTTON_CLIENTTYPE_FLASH) { |
| 105 | 105 | $data = ['meetingID' => $meetingid, |
| 106 | - 'fullName' => $username, |
|
| 107 | - 'password' => $pw, |
|
| 108 | - 'logoutURL' => $logouturl, |
|
| 106 | + 'fullName' => $username, |
|
| 107 | + 'password' => $pw, |
|
| 108 | + 'logoutURL' => $logouturl, |
|
| 109 | 109 | ]; |
| 110 | 110 | // Choose between Adobe Flash or HTML5 Client. |
| 111 | 111 | if ( $clienttype == BIGBLUEBUTTON_CLIENTTYPE_HTML5 ) { |
@@ -161,23 +161,23 @@ discard block |
||
| 161 | 161 | function bigbluebuttonbn_get_meeting_info_array($meetingid) { |
| 162 | 162 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 163 | 163 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 164 | - ); |
|
| 164 | + ); |
|
| 165 | 165 | if ($xml && $xml->returncode == 'SUCCESS' && empty($xml->messageKey)) { |
| 166 | 166 | // Meeting info was returned. |
| 167 | 167 | return array('returncode' => $xml->returncode, |
| 168 | - 'meetingID' => $xml->meetingID, |
|
| 169 | - 'moderatorPW' => $xml->moderatorPW, |
|
| 170 | - 'attendeePW' => $xml->attendeePW, |
|
| 171 | - 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 172 | - 'running' => $xml->running, |
|
| 173 | - 'recording' => $xml->recording, |
|
| 174 | - 'startTime' => $xml->startTime, |
|
| 175 | - 'endTime' => $xml->endTime, |
|
| 176 | - 'participantCount' => $xml->participantCount, |
|
| 177 | - 'moderatorCount' => $xml->moderatorCount, |
|
| 178 | - 'attendees' => $xml->attendees, |
|
| 179 | - 'metadata' => $xml->metadata, |
|
| 180 | - ); |
|
| 168 | + 'meetingID' => $xml->meetingID, |
|
| 169 | + 'moderatorPW' => $xml->moderatorPW, |
|
| 170 | + 'attendeePW' => $xml->attendeePW, |
|
| 171 | + 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 172 | + 'running' => $xml->running, |
|
| 173 | + 'recording' => $xml->recording, |
|
| 174 | + 'startTime' => $xml->startTime, |
|
| 175 | + 'endTime' => $xml->endTime, |
|
| 176 | + 'participantCount' => $xml->participantCount, |
|
| 177 | + 'moderatorCount' => $xml->moderatorCount, |
|
| 178 | + 'attendees' => $xml->attendees, |
|
| 179 | + 'metadata' => $xml->metadata, |
|
| 180 | + ); |
|
| 181 | 181 | } |
| 182 | 182 | if ($xml) { |
| 183 | 183 | // Either failure or success without meeting info. |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | function bigbluebuttonbn_get_default_config_xml() { |
| 330 | 330 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 331 | 331 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getDefaultConfigXML') |
| 332 | - ); |
|
| 332 | + ); |
|
| 333 | 333 | return $xml; |
| 334 | 334 | } |
| 335 | 335 | |
@@ -433,7 +433,7 @@ discard block |
||
| 433 | 433 | foreach ($ids as $id) { |
| 434 | 434 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 435 | 435 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('deleteRecordings', ['recordID' => $id]) |
| 436 | - ); |
|
| 436 | + ); |
|
| 437 | 437 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 438 | 438 | return false; |
| 439 | 439 | } |
@@ -452,7 +452,7 @@ discard block |
||
| 452 | 452 | foreach ($ids as $id) { |
| 453 | 453 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 454 | 454 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('publishRecordings', ['recordID' => $id, 'publish' => $publish]) |
| 455 | - ); |
|
| 455 | + ); |
|
| 456 | 456 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 457 | 457 | return false; |
| 458 | 458 | } |
@@ -471,7 +471,7 @@ discard block |
||
| 471 | 471 | foreach ($ids as $id) { |
| 472 | 472 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 473 | 473 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('updateRecordings', ['recordID' => $id] + (array) $params) |
| 474 | - ); |
|
| 474 | + ); |
|
| 475 | 475 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 476 | 476 | return false; |
| 477 | 477 | } |
@@ -488,7 +488,7 @@ discard block |
||
| 488 | 488 | function bigbluebuttonbn_end_meeting($meetingid, $modpw) { |
| 489 | 489 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 490 | 490 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('end', ['meetingID' => $meetingid, 'password' => $modpw]) |
| 491 | - ); |
|
| 491 | + ); |
|
| 492 | 492 | if ($xml) { |
| 493 | 493 | // If the xml packet returned failure it displays the message to the user. |
| 494 | 494 | return array('returncode' => $xml->returncode, 'message' => $xml->message, 'messageKey' => $xml->messageKey); |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | function bigbluebuttonbn_get_server_version() { |
| 506 | 506 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 507 | 507 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url() |
| 508 | - ); |
|
| 508 | + ); |
|
| 509 | 509 | if ($xml && $xml->returncode == 'SUCCESS') { |
| 510 | 510 | return $xml->version; |
| 511 | 511 | } |
@@ -572,10 +572,10 @@ discard block |
||
| 572 | 572 | } |
| 573 | 573 | $options = array(); |
| 574 | 574 | $options['CURLOPT_HTTPHEADER'] = array( |
| 575 | - 'Content-Type: '.$contenttype, |
|
| 576 | - 'Content-Length: '.strlen($data), |
|
| 577 | - 'Content-Language: en-US', |
|
| 578 | - ); |
|
| 575 | + 'Content-Type: '.$contenttype, |
|
| 576 | + 'Content-Length: '.strlen($data), |
|
| 577 | + 'Content-Language: en-US', |
|
| 578 | + ); |
|
| 579 | 579 | |
| 580 | 580 | return $c->post($url, $data, $options); |
| 581 | 581 | } |
@@ -722,16 +722,16 @@ discard block |
||
| 722 | 722 | 'all' => array( |
| 723 | 723 | 'name' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 724 | 724 | 'children' => [] |
| 725 | - ) |
|
| 726 | - ); |
|
| 725 | + ) |
|
| 726 | + ); |
|
| 727 | 727 | $data['role'] = array( |
| 728 | 728 | 'name' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 729 | 729 | 'children' => bigbluebuttonbn_get_roles_select($context) |
| 730 | - ); |
|
| 730 | + ); |
|
| 731 | 731 | $data['user'] = array( |
| 732 | 732 | 'name' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 733 | 733 | 'children' => bigbluebuttonbn_get_users_select($context) |
| 734 | - ); |
|
| 734 | + ); |
|
| 735 | 735 | return $data; |
| 736 | 736 | } |
| 737 | 737 | |
@@ -774,7 +774,7 @@ discard block |
||
| 774 | 774 | 'selectiontype' => 'all', |
| 775 | 775 | 'selectionid' => 'all', |
| 776 | 776 | 'role' => BIGBLUEBUTTONBN_ROLE_VIEWER |
| 777 | - ); |
|
| 777 | + ); |
|
| 778 | 778 | $defaultrules = explode(',', \mod_bigbluebuttonbn\locallib\config::get('participant_moderator_default')); |
| 779 | 779 | foreach ($defaultrules as $defaultrule) { |
| 780 | 780 | if ($defaultrule == '0') { |
@@ -787,9 +787,9 @@ discard block |
||
| 787 | 787 | continue; |
| 788 | 788 | } |
| 789 | 789 | $participantlist[] = array( |
| 790 | - 'selectiontype' => 'role', |
|
| 791 | - 'selectionid' => $defaultrule, |
|
| 792 | - 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 790 | + 'selectiontype' => 'role', |
|
| 791 | + 'selectionid' => $defaultrule, |
|
| 792 | + 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 793 | 793 | } |
| 794 | 794 | return $participantlist; |
| 795 | 795 | } |
@@ -828,11 +828,11 @@ discard block |
||
| 828 | 828 | 'all' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 829 | 829 | 'role' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 830 | 830 | 'user' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 831 | - ], |
|
| 831 | + ], |
|
| 832 | 832 | 'type_selected' => 'all', |
| 833 | 833 | 'options' => ['all' => '---------------'], |
| 834 | 834 | 'selected' => 'all', |
| 835 | - ]; |
|
| 835 | + ]; |
|
| 836 | 836 | } |
| 837 | 837 | |
| 838 | 838 | /** |
@@ -1151,7 +1151,7 @@ discard block |
||
| 1151 | 1151 | // Ping again and refresh the cache. |
| 1152 | 1152 | $meetinginfo = (array) bigbluebuttonbn_wrap_xml_load_file( |
| 1153 | 1153 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 1154 | - ); |
|
| 1154 | + ); |
|
| 1155 | 1155 | $cache->set($meetingid, array('creation_time' => time(), 'meeting_info' => json_encode($meetinginfo))); |
| 1156 | 1156 | return $meetinginfo; |
| 1157 | 1157 | } |
@@ -1565,8 +1565,8 @@ discard block |
||
| 1565 | 1565 | } |
| 1566 | 1566 | $id = 'playbacks-'.$recording['recordID']; |
| 1567 | 1567 | $recordingtypes = html_writer::start_tag('div', array('id' => $id, 'data-imported' => $dataimported, |
| 1568 | - 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
| 1569 | - 'title' => $title, $visibility => $visibility)); |
|
| 1568 | + 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
| 1569 | + 'title' => $title, $visibility => $visibility)); |
|
| 1570 | 1570 | foreach ($recording['playbacks'] as $playback) { |
| 1571 | 1571 | $recordingtypes .= bigbluebuttonbn_get_recording_data_row_type($recording, $bbbsession, $playback); |
| 1572 | 1572 | } |
@@ -1601,7 +1601,7 @@ discard block |
||
| 1601 | 1601 | 'data-action' => 'play', |
| 1602 | 1602 | 'data-target' => $playback['type'], |
| 1603 | 1603 | 'data-href' => $href, |
| 1604 | - ); |
|
| 1604 | + ); |
|
| 1605 | 1605 | if (!bigbluebuttonbn_is_bn_server() && !bigbluebuttonbn_is_valid_resource(trim($playback['url']))) { |
| 1606 | 1606 | $linkattributes['class'] = 'btn btn-sm btn-warning'; |
| 1607 | 1607 | $linkattributes['title'] = get_string('view_recording_format_errror_unreachable', 'bigbluebuttonbn'); |
@@ -1783,10 +1783,10 @@ discard block |
||
| 1783 | 1783 | 'id' => $id, |
| 1784 | 1784 | 'onclick' => $onclick, |
| 1785 | 1785 | 'data-action' => $data['action'] |
| 1786 | - ); |
|
| 1786 | + ); |
|
| 1787 | 1787 | if (!isset($recording['imported'])) { |
| 1788 | 1788 | $linkattributes['data-links'] = bigbluebuttonbn_count_recording_imported_instances( |
| 1789 | - $recording['recordID']); |
|
| 1789 | + $recording['recordID']); |
|
| 1790 | 1790 | } |
| 1791 | 1791 | if (isset($data['disabled'])) { |
| 1792 | 1792 | $iconattributes['class'] .= ' fa-' . $data['disabled']; |
@@ -2319,17 +2319,17 @@ discard block |
||
| 2319 | 2319 | function bigbluebuttonbn_get_instance_type_profiles() { |
| 2320 | 2320 | $instanceprofiles = array( |
| 2321 | 2321 | BIGBLUEBUTTONBN_TYPE_ALL => array('id' => BIGBLUEBUTTONBN_TYPE_ALL, |
| 2322 | - 'name' => get_string('instance_type_default', 'bigbluebuttonbn'), |
|
| 2323 | - 'features' => array('all')), |
|
| 2322 | + 'name' => get_string('instance_type_default', 'bigbluebuttonbn'), |
|
| 2323 | + 'features' => array('all')), |
|
| 2324 | 2324 | BIGBLUEBUTTONBN_TYPE_ROOM_ONLY => array('id' => BIGBLUEBUTTONBN_TYPE_ROOM_ONLY, |
| 2325 | - 'name' => get_string('instance_type_room_only', 'bigbluebuttonbn'), |
|
| 2326 | - 'features' => array('showroom', 'welcomemessage', 'voicebridge', 'waitformoderator', 'userlimit', |
|
| 2327 | - 'recording', 'sendnotifications', 'preuploadpresentation', 'permissions', 'schedule', 'groups', |
|
| 2328 | - 'modstandardelshdr', 'availabilityconditionsheader', 'tagshdr', 'competenciessection', |
|
| 2329 | - 'clienttype', 'availabilityconditionsheader')), |
|
| 2325 | + 'name' => get_string('instance_type_room_only', 'bigbluebuttonbn'), |
|
| 2326 | + 'features' => array('showroom', 'welcomemessage', 'voicebridge', 'waitformoderator', 'userlimit', |
|
| 2327 | + 'recording', 'sendnotifications', 'preuploadpresentation', 'permissions', 'schedule', 'groups', |
|
| 2328 | + 'modstandardelshdr', 'availabilityconditionsheader', 'tagshdr', 'competenciessection', |
|
| 2329 | + 'clienttype', 'availabilityconditionsheader')), |
|
| 2330 | 2330 | BIGBLUEBUTTONBN_TYPE_RECORDING_ONLY => array('id' => BIGBLUEBUTTONBN_TYPE_RECORDING_ONLY, |
| 2331 | - 'name' => get_string('instance_type_recording_only', 'bigbluebuttonbn'), |
|
| 2332 | - 'features' => array('showrecordings', 'importrecordings', 'availabilityconditionsheader')) |
|
| 2331 | + 'name' => get_string('instance_type_recording_only', 'bigbluebuttonbn'), |
|
| 2332 | + 'features' => array('showrecordings', 'importrecordings', 'availabilityconditionsheader')) |
|
| 2333 | 2333 | ); |
| 2334 | 2334 | return $instanceprofiles; |
| 2335 | 2335 | } |
@@ -2416,8 +2416,8 @@ discard block |
||
| 2416 | 2416 | $activitytime = ''; |
| 2417 | 2417 | if ($time) { |
| 2418 | 2418 | $activitytime = calendar_day_representation($time).' '. |
| 2419 | - get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2420 | - calendar_time_representation($time); |
|
| 2419 | + get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2420 | + calendar_time_representation($time); |
|
| 2421 | 2421 | } |
| 2422 | 2422 | return $activitytime; |
| 2423 | 2423 | } |
@@ -2736,7 +2736,7 @@ discard block |
||
| 2736 | 2736 | $renderer->render_group_element('participant_moderator_default', |
| 2737 | 2737 | $renderer->render_group_element_configmultiselect('participant_moderator_default', |
| 2738 | 2738 | array_keys($owner), array_merge($owner, $roles)) |
| 2739 | - ); |
|
| 2739 | + ); |
|
| 2740 | 2740 | } |
| 2741 | 2741 | } |
| 2742 | 2742 | |
@@ -2772,7 +2772,7 @@ discard block |
||
| 2772 | 2772 | // Web Client default. |
| 2773 | 2773 | $default = intval((int)\mod_bigbluebuttonbn\locallib\config::get('clienttype_default')); |
| 2774 | 2774 | $choices = array(BIGBLUEBUTTON_CLIENTTYPE_FLASH => get_string('mod_form_block_clienttype_flash', 'bigbluebuttonbn'), |
| 2775 | - BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
| 2775 | + BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
| 2776 | 2776 | $renderer->render_group_element('clienttype_default', |
| 2777 | 2777 | $renderer->render_group_element_configselect('clienttype_default', |
| 2778 | 2778 | $default, $choices)); |
@@ -2883,7 +2883,7 @@ discard block |
||
| 2883 | 2883 | return $output; |
| 2884 | 2884 | } |
| 2885 | 2885 | $output .= $OUTPUT->box_start('box boxalignleft adminerror alert alert-' . $type . ' alert-block fade in', |
| 2886 | - 'bigbluebuttonbn_view_general_warning') . "\n"; |
|
| 2886 | + 'bigbluebuttonbn_view_general_warning') . "\n"; |
|
| 2887 | 2887 | $output .= ' ' . $message . "\n"; |
| 2888 | 2888 | $output .= ' <div class="singlebutton pull-right">' . "\n"; |
| 2889 | 2889 | if (!empty($href)) { |