@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | * Remove this block when restored |
| 65 | 65 | */ |
| 66 | 66 | |
| 67 | - /** @var BIGBLUEBUTTONBN_DEFAULT_SERVER_URL string of default bigbluebutton server url */ |
|
| 67 | + /** @var BIGBLUEBUTTONBN_DEFAULT_SERVER_URL string of default bigbluebutton server url */ |
|
| 68 | 68 | const BIGBLUEBUTTONBN_DEFAULT_SERVER_URL = 'http://test-install.blindsidenetworks.com/bigbluebutton/'; |
| 69 | 69 | /** @var BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET string of default bigbluebutton server shared secret */ |
| 70 | 70 | const BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET = '8cd8ef52e8e101574e400365b55e11a6'; |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | $sql = "SELECT COUNT(*) FROM {bigbluebuttonbn_logs} "; |
| 376 | 376 | $sql .= "WHERE courseid = ? AND bigbluebuttonbnid = ? AND userid = ? AND (log = ? OR log = ?)"; |
| 377 | 377 | $result = $DB->count_records_sql($sql, array($course->id, $bigbluebuttonbn->id, $user->id, |
| 378 | - BIGBLUEBUTTONBN_LOG_EVENT_JOIN, BIGBLUEBUTTONBN_LOG_EVENT_PLAYED)); |
|
| 378 | + BIGBLUEBUTTONBN_LOG_EVENT_JOIN, BIGBLUEBUTTONBN_LOG_EVENT_PLAYED)); |
|
| 379 | 379 | return $result; |
| 380 | 380 | } |
| 381 | 381 | |
@@ -620,12 +620,12 @@ discard block |
||
| 620 | 620 | $str = '<div class="bigbluebuttonbn overview">'."\n"; |
| 621 | 621 | $str .= ' <div class="name">'.get_string('modulename', 'bigbluebuttonbn').': '."\n"; |
| 622 | 622 | $str .= ' <a '.$classes.'href="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bigbluebuttonbn->coursemodule. |
| 623 | - '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
| 623 | + '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
| 624 | 624 | $str .= ' </div>'."\n"; |
| 625 | 625 | $str .= ' <div class="info">'.get_string($start, 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->openingtime). |
| 626 | 626 | '</div>'."\n"; |
| 627 | 627 | $str .= ' <div class="info">'.get_string('ends_at', 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->closingtime) |
| 628 | - .'</div>'."\n"; |
|
| 628 | + .'</div>'."\n"; |
|
| 629 | 629 | $str .= '</div>'."\n"; |
| 630 | 630 | return $str; |
| 631 | 631 | } |
@@ -877,7 +877,7 @@ discard block |
||
| 877 | 877 | 'bigbluebuttonbn', |
| 878 | 878 | $bigbluebuttonbn->id, |
| 879 | 879 | $bigbluebuttonbn->completionexpected |
| 880 | - ); |
|
| 880 | + ); |
|
| 881 | 881 | } |
| 882 | 882 | } |
| 883 | 883 | |
@@ -111,9 +111,9 @@ discard block |
||
| 111 | 111 | $clienttype = BIGBLUEBUTTON_CLIENTTYPE_FLASH |
| 112 | 112 | ) { |
| 113 | 113 | $data = ['meetingID' => $meetingid, |
| 114 | - 'fullName' => $username, |
|
| 115 | - 'password' => $pw, |
|
| 116 | - 'logoutURL' => $logouturl, |
|
| 114 | + 'fullName' => $username, |
|
| 115 | + 'password' => $pw, |
|
| 116 | + 'logoutURL' => $logouturl, |
|
| 117 | 117 | ]; |
| 118 | 118 | // Choose between Adobe Flash or HTML5 Client. |
| 119 | 119 | if ($clienttype == BIGBLUEBUTTON_CLIENTTYPE_HTML5) { |
@@ -171,23 +171,23 @@ discard block |
||
| 171 | 171 | { |
| 172 | 172 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 173 | 173 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 174 | - ); |
|
| 174 | + ); |
|
| 175 | 175 | if ($xml && $xml->returncode == 'SUCCESS' && empty($xml->messageKey)) { |
| 176 | 176 | // Meeting info was returned. |
| 177 | 177 | return array('returncode' => $xml->returncode, |
| 178 | - 'meetingID' => $xml->meetingID, |
|
| 179 | - 'moderatorPW' => $xml->moderatorPW, |
|
| 180 | - 'attendeePW' => $xml->attendeePW, |
|
| 181 | - 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 182 | - 'running' => $xml->running, |
|
| 183 | - 'recording' => $xml->recording, |
|
| 184 | - 'startTime' => $xml->startTime, |
|
| 185 | - 'endTime' => $xml->endTime, |
|
| 186 | - 'participantCount' => $xml->participantCount, |
|
| 187 | - 'moderatorCount' => $xml->moderatorCount, |
|
| 188 | - 'attendees' => $xml->attendees, |
|
| 189 | - 'metadata' => $xml->metadata, |
|
| 190 | - ); |
|
| 178 | + 'meetingID' => $xml->meetingID, |
|
| 179 | + 'moderatorPW' => $xml->moderatorPW, |
|
| 180 | + 'attendeePW' => $xml->attendeePW, |
|
| 181 | + 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 182 | + 'running' => $xml->running, |
|
| 183 | + 'recording' => $xml->recording, |
|
| 184 | + 'startTime' => $xml->startTime, |
|
| 185 | + 'endTime' => $xml->endTime, |
|
| 186 | + 'participantCount' => $xml->participantCount, |
|
| 187 | + 'moderatorCount' => $xml->moderatorCount, |
|
| 188 | + 'attendees' => $xml->attendees, |
|
| 189 | + 'metadata' => $xml->metadata, |
|
| 190 | + ); |
|
| 191 | 191 | } |
| 192 | 192 | if ($xml) { |
| 193 | 193 | // Either failure or success without meeting info. |
@@ -347,7 +347,7 @@ discard block |
||
| 347 | 347 | { |
| 348 | 348 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 349 | 349 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getDefaultConfigXML') |
| 350 | - ); |
|
| 350 | + ); |
|
| 351 | 351 | return $xml; |
| 352 | 352 | } |
| 353 | 353 | |
@@ -456,7 +456,7 @@ discard block |
||
| 456 | 456 | foreach ($ids as $id) { |
| 457 | 457 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 458 | 458 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('deleteRecordings', ['recordID' => $id]) |
| 459 | - ); |
|
| 459 | + ); |
|
| 460 | 460 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 461 | 461 | return false; |
| 462 | 462 | } |
@@ -476,7 +476,7 @@ discard block |
||
| 476 | 476 | foreach ($ids as $id) { |
| 477 | 477 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 478 | 478 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('publishRecordings', ['recordID' => $id, 'publish' => $publish]) |
| 479 | - ); |
|
| 479 | + ); |
|
| 480 | 480 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 481 | 481 | return false; |
| 482 | 482 | } |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | foreach ($ids as $id) { |
| 497 | 497 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 498 | 498 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('updateRecordings', ['recordID' => $id] + (array) $params) |
| 499 | - ); |
|
| 499 | + ); |
|
| 500 | 500 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 501 | 501 | return false; |
| 502 | 502 | } |
@@ -514,7 +514,7 @@ discard block |
||
| 514 | 514 | { |
| 515 | 515 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 516 | 516 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('end', ['meetingID' => $meetingid, 'password' => $modpw]) |
| 517 | - ); |
|
| 517 | + ); |
|
| 518 | 518 | if ($xml) { |
| 519 | 519 | // If the xml packet returned failure it displays the message to the user. |
| 520 | 520 | return array('returncode' => $xml->returncode, 'message' => $xml->message, 'messageKey' => $xml->messageKey); |
@@ -532,7 +532,7 @@ discard block |
||
| 532 | 532 | { |
| 533 | 533 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 534 | 534 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url() |
| 535 | - ); |
|
| 535 | + ); |
|
| 536 | 536 | if ($xml && $xml->returncode == 'SUCCESS') { |
| 537 | 537 | return $xml->version; |
| 538 | 538 | } |
@@ -601,10 +601,10 @@ discard block |
||
| 601 | 601 | } |
| 602 | 602 | $options = array(); |
| 603 | 603 | $options['CURLOPT_HTTPHEADER'] = array( |
| 604 | - 'Content-Type: '.$contenttype, |
|
| 605 | - 'Content-Length: '.strlen($data), |
|
| 606 | - 'Content-Language: en-US', |
|
| 607 | - ); |
|
| 604 | + 'Content-Type: '.$contenttype, |
|
| 605 | + 'Content-Length: '.strlen($data), |
|
| 606 | + 'Content-Language: en-US', |
|
| 607 | + ); |
|
| 608 | 608 | |
| 609 | 609 | return $c->post($url, $data, $options); |
| 610 | 610 | } |
@@ -760,16 +760,16 @@ discard block |
||
| 760 | 760 | 'all' => array( |
| 761 | 761 | 'name' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 762 | 762 | 'children' => [] |
| 763 | - ) |
|
| 764 | - ); |
|
| 763 | + ) |
|
| 764 | + ); |
|
| 765 | 765 | $data['role'] = array( |
| 766 | 766 | 'name' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 767 | 767 | 'children' => bigbluebuttonbn_get_roles_select($context) |
| 768 | - ); |
|
| 768 | + ); |
|
| 769 | 769 | $data['user'] = array( |
| 770 | 770 | 'name' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 771 | 771 | 'children' => bigbluebuttonbn_get_users_select($context) |
| 772 | - ); |
|
| 772 | + ); |
|
| 773 | 773 | return $data; |
| 774 | 774 | } |
| 775 | 775 | |
@@ -814,7 +814,7 @@ discard block |
||
| 814 | 814 | 'selectiontype' => 'all', |
| 815 | 815 | 'selectionid' => 'all', |
| 816 | 816 | 'role' => BIGBLUEBUTTONBN_ROLE_VIEWER |
| 817 | - ); |
|
| 817 | + ); |
|
| 818 | 818 | $defaultrules = explode(',', \mod_bigbluebuttonbn\locallib\config::get('participant_moderator_default')); |
| 819 | 819 | foreach ($defaultrules as $defaultrule) { |
| 820 | 820 | if ($defaultrule == '0') { |
@@ -827,9 +827,9 @@ discard block |
||
| 827 | 827 | continue; |
| 828 | 828 | } |
| 829 | 829 | $participantlist[] = array( |
| 830 | - 'selectiontype' => 'role', |
|
| 831 | - 'selectionid' => $defaultrule, |
|
| 832 | - 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 830 | + 'selectiontype' => 'role', |
|
| 831 | + 'selectionid' => $defaultrule, |
|
| 832 | + 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 833 | 833 | } |
| 834 | 834 | return $participantlist; |
| 835 | 835 | } |
@@ -870,11 +870,11 @@ discard block |
||
| 870 | 870 | 'all' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 871 | 871 | 'role' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 872 | 872 | 'user' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 873 | - ], |
|
| 873 | + ], |
|
| 874 | 874 | 'type_selected' => 'all', |
| 875 | 875 | 'options' => ['all' => '---------------'], |
| 876 | 876 | 'selected' => 'all', |
| 877 | - ]; |
|
| 877 | + ]; |
|
| 878 | 878 | } |
| 879 | 879 | |
| 880 | 880 | /** |
@@ -1231,7 +1231,7 @@ discard block |
||
| 1231 | 1231 | // Ping again and refresh the cache. |
| 1232 | 1232 | $meetinginfo = (array) bigbluebuttonbn_wrap_xml_load_file( |
| 1233 | 1233 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 1234 | - ); |
|
| 1234 | + ); |
|
| 1235 | 1235 | $cache->set($meetingid, array('creation_time' => time(), 'meeting_info' => json_encode($meetinginfo))); |
| 1236 | 1236 | return $meetinginfo; |
| 1237 | 1237 | } |
@@ -1674,8 +1674,8 @@ discard block |
||
| 1674 | 1674 | } |
| 1675 | 1675 | $id = 'playbacks-'.$recording['recordID']; |
| 1676 | 1676 | $recordingtypes = html_writer::start_tag('div', array('id' => $id, 'data-imported' => $dataimported, |
| 1677 | - 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
| 1678 | - 'title' => $title, $visibility => $visibility)); |
|
| 1677 | + 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
| 1678 | + 'title' => $title, $visibility => $visibility)); |
|
| 1679 | 1679 | foreach ($recording['playbacks'] as $playback) { |
| 1680 | 1680 | $recordingtypes .= bigbluebuttonbn_get_recording_data_row_type($recording, $bbbsession, $playback); |
| 1681 | 1681 | } |
@@ -1699,7 +1699,7 @@ discard block |
||
| 1699 | 1699 | } |
| 1700 | 1700 | $text = get_string('view_recording_format_'.$playback['type'], 'bigbluebuttonbn'); |
| 1701 | 1701 | $href = $CFG->wwwroot . '/mod/bigbluebuttonbn/bbb_view.php?action=play&bn=' . $bbbsession['bigbluebuttonbn']->id . |
| 1702 | - '&mid='.$recording['meetingID'] . '&rid=' . $recording['recordID'] . '&rtype=' . $playback['type']; |
|
| 1702 | + '&mid='.$recording['meetingID'] . '&rid=' . $recording['recordID'] . '&rtype=' . $playback['type']; |
|
| 1703 | 1703 | if (!isset($recording['imported']) || !isset($recording['protected']) || $recording['protected'] === 'false') { |
| 1704 | 1704 | $href .= '&href='.urlencode(trim($playback['url'])); |
| 1705 | 1705 | } |
@@ -1710,7 +1710,7 @@ discard block |
||
| 1710 | 1710 | 'data-action' => 'play', |
| 1711 | 1711 | 'data-target' => $playback['type'], |
| 1712 | 1712 | 'data-href' => $href, |
| 1713 | - ); |
|
| 1713 | + ); |
|
| 1714 | 1714 | if (!bigbluebuttonbn_is_bn_server() && !bigbluebuttonbn_is_valid_resource(trim($playback['url']))) { |
| 1715 | 1715 | $linkattributes['class'] = 'btn btn-sm btn-warning'; |
| 1716 | 1716 | $linkattributes['title'] = get_string('view_recording_format_errror_unreachable', 'bigbluebuttonbn'); |
@@ -1875,7 +1875,7 @@ discard block |
||
| 1875 | 1875 | 'id' => $id, |
| 1876 | 1876 | 'onclick' => $onclick, |
| 1877 | 1877 | 'data-action' => $data['action'] |
| 1878 | - ); |
|
| 1878 | + ); |
|
| 1879 | 1879 | if (!isset($recording['imported'])) { |
| 1880 | 1880 | $linkattributes['data-links'] = bigbluebuttonbn_count_recording_imported_instances( |
| 1881 | 1881 | $recording['recordID'] |
@@ -2509,17 +2509,17 @@ discard block |
||
| 2509 | 2509 | function bigbluebuttonbn_get_instance_type_profiles() { |
| 2510 | 2510 | $instanceprofiles = array( |
| 2511 | 2511 | BIGBLUEBUTTONBN_TYPE_ALL => array('id' => BIGBLUEBUTTONBN_TYPE_ALL, |
| 2512 | - 'name' => get_string('instance_type_default', 'bigbluebuttonbn'), |
|
| 2513 | - 'features' => array('all')), |
|
| 2512 | + 'name' => get_string('instance_type_default', 'bigbluebuttonbn'), |
|
| 2513 | + 'features' => array('all')), |
|
| 2514 | 2514 | BIGBLUEBUTTONBN_TYPE_ROOM_ONLY => array('id' => BIGBLUEBUTTONBN_TYPE_ROOM_ONLY, |
| 2515 | - 'name' => get_string('instance_type_room_only', 'bigbluebuttonbn'), |
|
| 2516 | - 'features' => array('showroom', 'welcomemessage', 'voicebridge', 'waitformoderator', 'userlimit', |
|
| 2517 | - 'recording', 'sendnotifications', 'preuploadpresentation', 'permissions', 'schedule', 'groups', |
|
| 2518 | - 'modstandardelshdr', 'availabilityconditionsheader', 'tagshdr', 'competenciessection', |
|
| 2519 | - 'clienttype', 'completionattendance', 'completionengagement')), |
|
| 2515 | + 'name' => get_string('instance_type_room_only', 'bigbluebuttonbn'), |
|
| 2516 | + 'features' => array('showroom', 'welcomemessage', 'voicebridge', 'waitformoderator', 'userlimit', |
|
| 2517 | + 'recording', 'sendnotifications', 'preuploadpresentation', 'permissions', 'schedule', 'groups', |
|
| 2518 | + 'modstandardelshdr', 'availabilityconditionsheader', 'tagshdr', 'competenciessection', |
|
| 2519 | + 'clienttype', 'completionattendance', 'completionengagement')), |
|
| 2520 | 2520 | BIGBLUEBUTTONBN_TYPE_RECORDING_ONLY => array('id' => BIGBLUEBUTTONBN_TYPE_RECORDING_ONLY, |
| 2521 | - 'name' => get_string('instance_type_recording_only', 'bigbluebuttonbn'), |
|
| 2522 | - 'features' => array('showrecordings', 'importrecordings')) |
|
| 2521 | + 'name' => get_string('instance_type_recording_only', 'bigbluebuttonbn'), |
|
| 2522 | + 'features' => array('showrecordings', 'importrecordings')) |
|
| 2523 | 2523 | ); |
| 2524 | 2524 | return $instanceprofiles; |
| 2525 | 2525 | } |
@@ -2606,8 +2606,8 @@ discard block |
||
| 2606 | 2606 | $activitytime = ''; |
| 2607 | 2607 | if ($time) { |
| 2608 | 2608 | $activitytime = calendar_day_representation($time).' '. |
| 2609 | - get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2610 | - calendar_time_representation($time); |
|
| 2609 | + get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2610 | + calendar_time_representation($time); |
|
| 2611 | 2611 | } |
| 2612 | 2612 | return $activitytime; |
| 2613 | 2613 | } |
@@ -2992,7 +2992,7 @@ discard block |
||
| 2992 | 2992 | array_keys($owner), |
| 2993 | 2993 | array_merge($owner, $roles) |
| 2994 | 2994 | ) |
| 2995 | - ); |
|
| 2995 | + ); |
|
| 2996 | 2996 | } |
| 2997 | 2997 | } |
| 2998 | 2998 | |
@@ -3032,7 +3032,7 @@ discard block |
||
| 3032 | 3032 | // Web Client default. |
| 3033 | 3033 | $default = intval((int)\mod_bigbluebuttonbn\locallib\config::get('clienttype_default')); |
| 3034 | 3034 | $choices = array(BIGBLUEBUTTON_CLIENTTYPE_FLASH => get_string('mod_form_block_clienttype_flash', 'bigbluebuttonbn'), |
| 3035 | - BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
| 3035 | + BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
| 3036 | 3036 | $renderer->render_group_element( |
| 3037 | 3037 | 'clienttype_default', |
| 3038 | 3038 | $renderer->render_group_element_configselect( |
@@ -3519,8 +3519,8 @@ discard block |
||
| 3519 | 3519 | array( |
| 3520 | 3520 | 'email' => array('"' . fullname($USER) . '" <' . $USER->email . '>'), |
| 3521 | 3521 | 'context' => $bbbsession['bigbluebuttonbnURL'] |
| 3522 | - ) |
|
| 3523 | - ); |
|
| 3522 | + ) |
|
| 3523 | + ); |
|
| 3524 | 3524 | } |
| 3525 | 3525 | if ((boolean)\mod_bigbluebuttonbn\locallib\config::get('recordingready_enabled')) { |
| 3526 | 3526 | $metadata['bn-recording-ready-url'] = $bbbsession['recordingReadyURL']; |