@@ -434,12 +434,12 @@ discard block |
||
| 434 | 434 | $recordings = bigbluebuttonbn_get_recordings( |
| 435 | 435 | $bbbsession['course']->id, $bigbluebuttonbnid, $enabledfeatures['showroom'], |
| 436 | 436 | $bbbsession['bigbluebuttonbn']->recordings_deleted |
| 437 | - ); |
|
| 437 | + ); |
|
| 438 | 438 | if ($enabledfeatures['importrecordings']) { |
| 439 | 439 | // Get recording links. |
| 440 | 440 | $recordingsimported = bigbluebuttonbn_get_recordings_imported_array( |
| 441 | 441 | $bbbsession['course']->id, $bigbluebuttonbnid, $enabledfeatures['showroom'] |
| 442 | - ); |
|
| 442 | + ); |
|
| 443 | 443 | /* Perform aritmetic addition instead of merge so the imported recordings corresponding to existent |
| 444 | 444 | * recordings are not included. */ |
| 445 | 445 | $recordings += $recordingsimported; |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | // JavaScript variables for recordings. |
| 454 | 454 | $jsvars += array( |
| 455 | 455 | 'recordings_html' => $bbbsession['bigbluebuttonbn']->recordings_html == '1', |
| 456 | - ); |
|
| 456 | + ); |
|
| 457 | 457 | // If there are meetings with recordings load the data to the table. |
| 458 | 458 | if ($bbbsession['bigbluebuttonbn']->recordings_html) { |
| 459 | 459 | // Render a plain html table. |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | $jsvars += array( |
| 464 | 464 | 'columns' => bigbluebuttonbn_get_recording_columns($bbbsession), |
| 465 | 465 | 'data' => bigbluebuttonbn_get_recording_data($bbbsession, $recordings), |
| 466 | - ); |
|
| 466 | + ); |
|
| 467 | 467 | // Render a YUI table. |
| 468 | 468 | return html_writer::div('', '', array('id' => 'bigbluebuttonbn_recordings_table')); |
| 469 | 469 | } |
@@ -483,10 +483,10 @@ discard block |
||
| 483 | 483 | } |
| 484 | 484 | $button = html_writer::tag('input', '', |
| 485 | 485 | array('type' => 'button', |
| 486 | - 'value' => get_string('view_recording_button_import', 'bigbluebuttonbn'), |
|
| 487 | - 'class' => 'btn btn-secondary', |
|
| 488 | - 'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/import_view.php?bn='. |
|
| 489 | - $bbbsession['bigbluebuttonbn']->id.'\'')); |
|
| 486 | + 'value' => get_string('view_recording_button_import', 'bigbluebuttonbn'), |
|
| 487 | + 'class' => 'btn btn-secondary', |
|
| 488 | + 'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/import_view.php?bn='. |
|
| 489 | + $bbbsession['bigbluebuttonbn']->id.'\'')); |
|
| 490 | 490 | $output = html_writer::empty_tag('br'); |
| 491 | 491 | $output .= html_writer::tag('span', $button, array('id' => 'import_recording_links_button')); |
| 492 | 492 | $output .= html_writer::tag('span', '', array('id' => 'import_recording_links_table')); |
@@ -565,5 +565,5 @@ discard block |
||
| 565 | 565 | (string)\mod_bigbluebuttonbn\locallib\config::get('general_warning_button_href'), |
| 566 | 566 | (string)\mod_bigbluebuttonbn\locallib\config::get('general_warning_button_text'), |
| 567 | 567 | (string)\mod_bigbluebuttonbn\locallib\config::get('general_warning_button_class') |
| 568 | - ); |
|
| 568 | + ); |
|
| 569 | 569 | } |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | 'objectid' => $this->objectid, |
| 81 | 81 | 'contextinstanceid' => $this->contextinstanceid, |
| 82 | 82 | 'other' => $this->other |
| 83 | - ); |
|
| 83 | + ); |
|
| 84 | 84 | $string = $this->description; |
| 85 | 85 | foreach ($vars as $key => $value) { |
| 86 | 86 | $string = str_replace("##" . $key, $value, $string); |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | * Remove this block when restored |
| 62 | 62 | */ |
| 63 | 63 | |
| 64 | - /** @var BIGBLUEBUTTONBN_DEFAULT_SERVER_URL string of default bigbluebutton server url */ |
|
| 64 | + /** @var BIGBLUEBUTTONBN_DEFAULT_SERVER_URL string of default bigbluebutton server url */ |
|
| 65 | 65 | const BIGBLUEBUTTONBN_DEFAULT_SERVER_URL = 'http://test-install.blindsidenetworks.com/bigbluebutton/'; |
| 66 | 66 | /** @var BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET string of default bigbluebutton server shared secret */ |
| 67 | 67 | const BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET = '8cd8ef52e8e101574e400365b55e11a6'; |
@@ -339,12 +339,12 @@ discard block |
||
| 339 | 339 | $str = '<div class="bigbluebuttonbn overview">'."\n"; |
| 340 | 340 | $str .= ' <div class="name">'.get_string('modulename', 'bigbluebuttonbn').': '."\n"; |
| 341 | 341 | $str .= ' <a '.$classes.'href="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bigbluebuttonbn->coursemodule. |
| 342 | - '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
| 342 | + '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
| 343 | 343 | $str .= ' </div>'."\n"; |
| 344 | 344 | $str .= ' <div class="info">'.get_string($start, 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->openingtime). |
| 345 | 345 | '</div>'."\n"; |
| 346 | 346 | $str .= ' <div class="info">'.get_string('ends_at', 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->closingtime) |
| 347 | - .'</div>'."\n"; |
|
| 347 | + .'</div>'."\n"; |
|
| 348 | 348 | $str .= '</div>'."\n"; |
| 349 | 349 | return $str; |
| 350 | 350 | } |
@@ -529,7 +529,7 @@ discard block |
||
| 529 | 529 | $bigbluebuttonbn->coursemodule, |
| 530 | 530 | 'bigbluebuttonbn', |
| 531 | 531 | $bigbluebuttonbn->id, $bigbluebuttonbn->completionexpected |
| 532 | - ); |
|
| 532 | + ); |
|
| 533 | 533 | } |
| 534 | 534 | } |
| 535 | 535 | /** |
@@ -89,9 +89,9 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | function bigbluebuttonbn_get_join_url($meetingid, $username, $pw, $logouturl, $configtoken = null, $userid = null) { |
| 91 | 91 | $data = ['meetingID' => $meetingid, |
| 92 | - 'fullName' => $username, |
|
| 93 | - 'password' => $pw, |
|
| 94 | - 'logoutURL' => $logouturl, |
|
| 92 | + 'fullName' => $username, |
|
| 93 | + 'password' => $pw, |
|
| 94 | + 'logoutURL' => $logouturl, |
|
| 95 | 95 | ]; |
| 96 | 96 | if (!is_null($configtoken)) { |
| 97 | 97 | $data['configToken'] = $configtoken; |
@@ -143,23 +143,23 @@ discard block |
||
| 143 | 143 | function bigbluebuttonbn_get_meeting_info_array($meetingid) { |
| 144 | 144 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 145 | 145 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 146 | - ); |
|
| 146 | + ); |
|
| 147 | 147 | if ($xml && $xml->returncode == 'SUCCESS' && empty($xml->messageKey)) { |
| 148 | 148 | // Meeting info was returned. |
| 149 | 149 | return array('returncode' => $xml->returncode, |
| 150 | - 'meetingID' => $xml->meetingID, |
|
| 151 | - 'moderatorPW' => $xml->moderatorPW, |
|
| 152 | - 'attendeePW' => $xml->attendeePW, |
|
| 153 | - 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 154 | - 'running' => $xml->running, |
|
| 155 | - 'recording' => $xml->recording, |
|
| 156 | - 'startTime' => $xml->startTime, |
|
| 157 | - 'endTime' => $xml->endTime, |
|
| 158 | - 'participantCount' => $xml->participantCount, |
|
| 159 | - 'moderatorCount' => $xml->moderatorCount, |
|
| 160 | - 'attendees' => $xml->attendees, |
|
| 161 | - 'metadata' => $xml->metadata, |
|
| 162 | - ); |
|
| 150 | + 'meetingID' => $xml->meetingID, |
|
| 151 | + 'moderatorPW' => $xml->moderatorPW, |
|
| 152 | + 'attendeePW' => $xml->attendeePW, |
|
| 153 | + 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 154 | + 'running' => $xml->running, |
|
| 155 | + 'recording' => $xml->recording, |
|
| 156 | + 'startTime' => $xml->startTime, |
|
| 157 | + 'endTime' => $xml->endTime, |
|
| 158 | + 'participantCount' => $xml->participantCount, |
|
| 159 | + 'moderatorCount' => $xml->moderatorCount, |
|
| 160 | + 'attendees' => $xml->attendees, |
|
| 161 | + 'metadata' => $xml->metadata, |
|
| 162 | + ); |
|
| 163 | 163 | } |
| 164 | 164 | if ($xml) { |
| 165 | 165 | // Either failure or success without meeting info. |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | function bigbluebuttonbn_get_default_config_xml() { |
| 296 | 296 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 297 | 297 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getDefaultConfigXML') |
| 298 | - ); |
|
| 298 | + ); |
|
| 299 | 299 | return $xml; |
| 300 | 300 | } |
| 301 | 301 | |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | foreach ($ids as $id) { |
| 397 | 397 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 398 | 398 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('deleteRecordings', ['recordID' => $id]) |
| 399 | - ); |
|
| 399 | + ); |
|
| 400 | 400 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 401 | 401 | return false; |
| 402 | 402 | } |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | foreach ($ids as $id) { |
| 416 | 416 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 417 | 417 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('publishRecordings', ['recordID' => $id, 'publish' => $publish]) |
| 418 | - ); |
|
| 418 | + ); |
|
| 419 | 419 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 420 | 420 | return false; |
| 421 | 421 | } |
@@ -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('updateRecordings', ['recordID' => $id] + (array) $params) |
| 437 | - ); |
|
| 437 | + ); |
|
| 438 | 438 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 439 | 439 | return false; |
| 440 | 440 | } |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | function bigbluebuttonbn_end_meeting($meetingid, $modpw) { |
| 452 | 452 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 453 | 453 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('end', ['meetingID' => $meetingid, 'password' => $modpw]) |
| 454 | - ); |
|
| 454 | + ); |
|
| 455 | 455 | if ($xml) { |
| 456 | 456 | // If the xml packet returned failure it displays the message to the user. |
| 457 | 457 | return array('returncode' => $xml->returncode, 'message' => $xml->message, 'messageKey' => $xml->messageKey); |
@@ -471,7 +471,7 @@ discard block |
||
| 471 | 471 | */ |
| 472 | 472 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 473 | 473 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 474 | - ); |
|
| 474 | + ); |
|
| 475 | 475 | return ($xml && $xml->returncode == 'SUCCESS'); |
| 476 | 476 | } |
| 477 | 477 | |
@@ -483,7 +483,7 @@ discard block |
||
| 483 | 483 | function bigbluebuttonbn_get_server_version() { |
| 484 | 484 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 485 | 485 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url() |
| 486 | - ); |
|
| 486 | + ); |
|
| 487 | 487 | if ($xml && $xml->returncode == 'SUCCESS') { |
| 488 | 488 | return $xml->version; |
| 489 | 489 | } |
@@ -551,10 +551,10 @@ discard block |
||
| 551 | 551 | |
| 552 | 552 | $options = array(); |
| 553 | 553 | $options['CURLOPT_HTTPHEADER'] = array( |
| 554 | - 'Content-Type: '.$contenttype, |
|
| 555 | - 'Content-Length: '.strlen($data), |
|
| 556 | - 'Content-Language: en-US', |
|
| 557 | - ); |
|
| 554 | + 'Content-Type: '.$contenttype, |
|
| 555 | + 'Content-Length: '.strlen($data), |
|
| 556 | + 'Content-Language: en-US', |
|
| 557 | + ); |
|
| 558 | 558 | |
| 559 | 559 | return $c->post($url, $data, $options); |
| 560 | 560 | } |
@@ -697,16 +697,16 @@ discard block |
||
| 697 | 697 | 'all' => array( |
| 698 | 698 | 'name' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 699 | 699 | 'children' => [] |
| 700 | - ) |
|
| 701 | - ); |
|
| 700 | + ) |
|
| 701 | + ); |
|
| 702 | 702 | $data['role'] = array( |
| 703 | 703 | 'name' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 704 | 704 | 'children' => bigbluebuttonbn_get_roles_select($context) |
| 705 | - ); |
|
| 705 | + ); |
|
| 706 | 706 | $data['user'] = array( |
| 707 | 707 | 'name' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 708 | 708 | 'children' => bigbluebuttonbn_get_users_select($context) |
| 709 | - ); |
|
| 709 | + ); |
|
| 710 | 710 | return $data; |
| 711 | 711 | } |
| 712 | 712 | |
@@ -751,9 +751,9 @@ discard block |
||
| 751 | 751 | continue; |
| 752 | 752 | } |
| 753 | 753 | $participantlistarray[] = array( |
| 754 | - 'selectiontype' => 'role', |
|
| 755 | - 'selectionid' => $moderatordefault, |
|
| 756 | - 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 754 | + 'selectiontype' => 'role', |
|
| 755 | + 'selectionid' => $moderatordefault, |
|
| 756 | + 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 757 | 757 | } |
| 758 | 758 | return $participantlistarray; |
| 759 | 759 | } |
@@ -796,11 +796,11 @@ discard block |
||
| 796 | 796 | 'all' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 797 | 797 | 'role' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 798 | 798 | 'user' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 799 | - ], |
|
| 799 | + ], |
|
| 800 | 800 | 'type_selected' => 'all', |
| 801 | 801 | 'options' => ['all' => '---------------'], |
| 802 | 802 | 'selected' => 'all', |
| 803 | - ]; |
|
| 803 | + ]; |
|
| 804 | 804 | } |
| 805 | 805 | |
| 806 | 806 | /** |
@@ -1080,7 +1080,7 @@ discard block |
||
| 1080 | 1080 | // Ping again and refresh the cache. |
| 1081 | 1081 | $meetinginfo = (array) bigbluebuttonbn_wrap_xml_load_file( |
| 1082 | 1082 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 1083 | - ); |
|
| 1083 | + ); |
|
| 1084 | 1084 | $cache->set($meetingid, array('creation_time' => time(), 'meeting_info' => json_encode($meetinginfo))); |
| 1085 | 1085 | return $meetinginfo; |
| 1086 | 1086 | } |
@@ -1450,8 +1450,8 @@ discard block |
||
| 1450 | 1450 | } |
| 1451 | 1451 | $id = 'playbacks-'.$recording['recordID']; |
| 1452 | 1452 | $recordingtypes = html_writer::start_tag('div', array('id' => $id, 'data-imported' => $dataimported, |
| 1453 | - 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
| 1454 | - 'title' => $title, $visibility => $visibility)); |
|
| 1453 | + 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
| 1454 | + 'title' => $title, $visibility => $visibility)); |
|
| 1455 | 1455 | foreach ($recording['playbacks'] as $playback) { |
| 1456 | 1456 | $recordingtypes .= bigbluebuttonbn_get_recording_data_row_type($recording, $bbbsession, $playback); |
| 1457 | 1457 | } |
@@ -1476,7 +1476,7 @@ discard block |
||
| 1476 | 1476 | $title = get_string('view_recording_format_'.$playback['type'], 'bigbluebuttonbn'); |
| 1477 | 1477 | $onclick = 'M.mod_bigbluebuttonbn.recordings.recordingPlay(this);'; |
| 1478 | 1478 | $href = $CFG->wwwroot . '/mod/bigbluebuttonbn/bbb_view.php?action=play&bn=' . $bbbsession['bigbluebuttonbn']->id . |
| 1479 | - '&mid='.$recording['meetingID'] . '&rid=' . $recording['recordID'] . '&rtype=' . $playback['type']; |
|
| 1479 | + '&mid='.$recording['meetingID'] . '&rid=' . $recording['recordID'] . '&rtype=' . $playback['type']; |
|
| 1480 | 1480 | if (!isset($recording['imported']) || !isset($recording['protected']) || $recording['protected'] === 'false') { |
| 1481 | 1481 | $href .= '&href='.urlencode(trim($playback['url'])); |
| 1482 | 1482 | } |
@@ -1488,7 +1488,7 @@ discard block |
||
| 1488 | 1488 | 'data-target' => $playback['type'], |
| 1489 | 1489 | 'data-href' => $href, |
| 1490 | 1490 | 'class' => 'btn btn-sm btn-default' |
| 1491 | - ); |
|
| 1491 | + ); |
|
| 1492 | 1492 | return $OUTPUT->action_link('#', $title, null, $linkattributes) . ' '; |
| 1493 | 1493 | } |
| 1494 | 1494 | |
@@ -1602,10 +1602,10 @@ discard block |
||
| 1602 | 1602 | 'id' => $id, |
| 1603 | 1603 | 'onclick' => $onclick, |
| 1604 | 1604 | 'data-action' => $data['action'] |
| 1605 | - ); |
|
| 1605 | + ); |
|
| 1606 | 1606 | if (!isset($recording['imported'])) { |
| 1607 | 1607 | $linkattributes['data-links'] = bigbluebuttonbn_count_recording_imported_instances( |
| 1608 | - $recording['recordID']); |
|
| 1608 | + $recording['recordID']); |
|
| 1609 | 1609 | } |
| 1610 | 1610 | if (isset($data['disabled'])) { |
| 1611 | 1611 | $iconattributes['class'] .= ' fa-' . $data['disabled']; |
@@ -2146,8 +2146,8 @@ discard block |
||
| 2146 | 2146 | $activitytime = ''; |
| 2147 | 2147 | if ($time) { |
| 2148 | 2148 | $activitytime = calendar_day_representation($time).' '. |
| 2149 | - get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2150 | - calendar_time_representation($time); |
|
| 2149 | + get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2150 | + calendar_time_representation($time); |
|
| 2151 | 2151 | } |
| 2152 | 2152 | return $activitytime; |
| 2153 | 2153 | } |
@@ -2447,7 +2447,7 @@ discard block |
||
| 2447 | 2447 | $renderer->render_group_element('participant_moderator_default', |
| 2448 | 2448 | $renderer->render_group_element_configmultiselect('participant_moderator_default', |
| 2449 | 2449 | array_keys($owner), array_merge($owner, $roles)) |
| 2450 | - ); |
|
| 2450 | + ); |
|
| 2451 | 2451 | } |
| 2452 | 2452 | } |
| 2453 | 2453 | |
@@ -2547,7 +2547,7 @@ discard block |
||
| 2547 | 2547 | return $output; |
| 2548 | 2548 | } |
| 2549 | 2549 | $output .= $OUTPUT->box_start('box boxalignleft adminerror alert alert-' . $type . ' alert-block fade in', |
| 2550 | - 'bigbluebuttonbn_view_general_warning') . "\n"; |
|
| 2550 | + 'bigbluebuttonbn_view_general_warning') . "\n"; |
|
| 2551 | 2551 | $output .= ' ' . $message . "\n"; |
| 2552 | 2552 | $output .= ' <div class="singlebutton pull-right">' . "\n"; |
| 2553 | 2553 | if (!empty($href)) { |