@@ -36,23 +36,23 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | // Change welcome, allow null. |
| 38 | 38 | $fielddefinition = array('type' => XMLDB_TYPE_TEXT, |
| 39 | - 'precision' => null, |
|
| 40 | - 'unsigned' => null, |
|
| 41 | - 'notnull' => XMLDB_NOTNULL, |
|
| 42 | - 'sequence' => null, |
|
| 43 | - 'default' => null, |
|
| 44 | - 'previous' => 'type'); |
|
| 39 | + 'precision' => null, |
|
| 40 | + 'unsigned' => null, |
|
| 41 | + 'notnull' => XMLDB_NOTNULL, |
|
| 42 | + 'sequence' => null, |
|
| 43 | + 'default' => null, |
|
| 44 | + 'previous' => 'type'); |
|
| 45 | 45 | xmldb_bigbluebuttonbn_add_change_field($dbman, 'bigbluebuttonbn', 'welcome', |
| 46 | 46 | $fielddefinition); |
| 47 | 47 | |
| 48 | 48 | // Change userid definition in bigbluebuttonbn_log. |
| 49 | 49 | $fielddefinition = array('type' => XMLDB_TYPE_INTEGER, |
| 50 | - 'precision' => '10', |
|
| 51 | - 'unsigned' => XMLDB_UNSIGNED, |
|
| 52 | - 'notnull' => XMLDB_NOTNULL, |
|
| 53 | - 'sequence' => null, |
|
| 54 | - 'default' => null, |
|
| 55 | - 'previous' => 'bigbluebuttonbnid'); |
|
| 50 | + 'precision' => '10', |
|
| 51 | + 'unsigned' => XMLDB_UNSIGNED, |
|
| 52 | + 'notnull' => XMLDB_NOTNULL, |
|
| 53 | + 'sequence' => null, |
|
| 54 | + 'default' => null, |
|
| 55 | + 'previous' => 'bigbluebuttonbnid'); |
|
| 56 | 56 | xmldb_bigbluebuttonbn_add_change_field($dbman, 'bigbluebuttonbn_log', 'userid', |
| 57 | 57 | $fielddefinition); |
| 58 | 58 | |
@@ -78,34 +78,34 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | // Add field type. |
| 80 | 80 | $fielddefinition = array('type' => XMLDB_TYPE_INTEGER, |
| 81 | - 'precision' => '2', |
|
| 82 | - 'unsigned' => XMLDB_UNSIGNED, |
|
| 83 | - 'notnull' => XMLDB_NOTNULL, |
|
| 84 | - 'sequence' => null, |
|
| 85 | - 'default' => 0, |
|
| 86 | - 'previous' => 'id'); |
|
| 81 | + 'precision' => '2', |
|
| 82 | + 'unsigned' => XMLDB_UNSIGNED, |
|
| 83 | + 'notnull' => XMLDB_NOTNULL, |
|
| 84 | + 'sequence' => null, |
|
| 85 | + 'default' => 0, |
|
| 86 | + 'previous' => 'id'); |
|
| 87 | 87 | xmldb_bigbluebuttonbn_add_change_field($dbman, 'bigbluebuttonbn', 'type', |
| 88 | 88 | $fielddefinition); |
| 89 | 89 | |
| 90 | 90 | // Add field recordings_html. |
| 91 | 91 | $fielddefinition = array('type' => XMLDB_TYPE_INTEGER, |
| 92 | - 'precision' => '1', |
|
| 93 | - 'unsigned' => XMLDB_UNSIGNED, |
|
| 94 | - 'notnull' => XMLDB_NOTNULL, |
|
| 95 | - 'sequence' => null, |
|
| 96 | - 'default' => 0, |
|
| 97 | - 'previous' => null); |
|
| 92 | + 'precision' => '1', |
|
| 93 | + 'unsigned' => XMLDB_UNSIGNED, |
|
| 94 | + 'notnull' => XMLDB_NOTNULL, |
|
| 95 | + 'sequence' => null, |
|
| 96 | + 'default' => 0, |
|
| 97 | + 'previous' => null); |
|
| 98 | 98 | xmldb_bigbluebuttonbn_add_change_field($dbman, 'bigbluebuttonbn', 'recordings_html', |
| 99 | 99 | $fielddefinition); |
| 100 | 100 | |
| 101 | 101 | // Add field recordings_deleted_activities. |
| 102 | 102 | $fielddefinition = array('type' => XMLDB_TYPE_INTEGER, |
| 103 | - 'precision' => '1', |
|
| 104 | - 'unsigned' => XMLDB_UNSIGNED, |
|
| 105 | - 'notnull' => XMLDB_NOTNULL, |
|
| 106 | - 'sequence' => null, |
|
| 107 | - 'default' => 1, |
|
| 108 | - 'previous' => null); |
|
| 103 | + 'precision' => '1', |
|
| 104 | + 'unsigned' => XMLDB_UNSIGNED, |
|
| 105 | + 'notnull' => XMLDB_NOTNULL, |
|
| 106 | + 'sequence' => null, |
|
| 107 | + 'default' => 1, |
|
| 108 | + 'previous' => null); |
|
| 109 | 109 | xmldb_bigbluebuttonbn_add_change_field($dbman, 'bigbluebuttonbn', 'recordings_deleted_activities', |
| 110 | 110 | $fielddefinition); |
| 111 | 111 | |
@@ -119,12 +119,12 @@ discard block |
||
| 119 | 119 | $table = new xmldb_table($tablename); |
| 120 | 120 | $field = new xmldb_field($fieldname); |
| 121 | 121 | $field->set_attributes($fielddefinition['type'], |
| 122 | - $fielddefinition['precision'], |
|
| 123 | - $fielddefinition['unsigned'], |
|
| 124 | - $fielddefinition['notnull'], |
|
| 125 | - $fielddefinition['sequence'], |
|
| 126 | - $fielddefinition['default'], |
|
| 127 | - $fielddefinition['previous']); |
|
| 122 | + $fielddefinition['precision'], |
|
| 123 | + $fielddefinition['unsigned'], |
|
| 124 | + $fielddefinition['notnull'], |
|
| 125 | + $fielddefinition['sequence'], |
|
| 126 | + $fielddefinition['default'], |
|
| 127 | + $fielddefinition['previous']); |
|
| 128 | 128 | if ($dbman->field_exists($table, $field)) { |
| 129 | 129 | $dbman->change_field($table, $field, true, true); |
| 130 | 130 | |
@@ -167,14 +167,14 @@ discard block |
||
| 167 | 167 | } |
| 168 | 168 | $statuscanjoin = '"can_join": '.($canjoin ? 'true' : 'false'); |
| 169 | 169 | echo $params['callback'].'({"running": '.($meetingrunning ? 'true' : 'false'). |
| 170 | - ',"info": '.json_encode($meetinginfo). |
|
| 171 | - ',"status": {'.'"join_url": "'.$bbbsession['joinURL'].'", '. |
|
| 172 | - '"joinbuttontext": "'.$joinbuttontext.'", '. |
|
| 173 | - '"message": "'.$initialmessage.'", '. |
|
| 174 | - $statuscanjoin.', '. |
|
| 175 | - $statuscanend.', '. |
|
| 176 | - $statuscantag.', '. |
|
| 177 | - '}});'; |
|
| 170 | + ',"info": '.json_encode($meetinginfo). |
|
| 171 | + ',"status": {'.'"join_url": "'.$bbbsession['joinURL'].'", '. |
|
| 172 | + '"joinbuttontext": "'.$joinbuttontext.'", '. |
|
| 173 | + '"message": "'.$initialmessage.'", '. |
|
| 174 | + $statuscanjoin.', '. |
|
| 175 | + $statuscanend.', '. |
|
| 176 | + $statuscantag.', '. |
|
| 177 | + '}});'; |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | function bigbluebuttonbn_broker_meeting_end($bbbsession, $params, $bigbluebuttonbn, $cm) { |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | if (isset($recordings[$params['id']]) && isset($recordings[$params['id']]['imported'])) { |
| 298 | 298 | // Execute publish on imported recording link, if the real recording is published. |
| 299 | 299 | $realrecordings = bigbluebuttonbn_get_recordings_array($recordings[$params['id']]['meetingID'], |
| 300 | - $recordings[$params['id']]['recordID']); |
|
| 300 | + $recordings[$params['id']]['recordID']); |
|
| 301 | 301 | $status = $realrecordings[$params['id']]['published']; |
| 302 | 302 | if ($status === 'true') { |
| 303 | 303 | // Only if the physical recording is published, execute publish on imported recording link. |
@@ -226,12 +226,12 @@ discard block |
||
| 226 | 226 | // ACTIVITY HAS BEEN CLOSED. |
| 227 | 227 | $bigbluebuttonbnactivity = 'ended'; |
| 228 | 228 | $bbbsession['presentation'] = bigbluebuttonbn_get_presentation_array($context, |
| 229 | - $bigbluebuttonbn->presentation); |
|
| 229 | + $bigbluebuttonbn->presentation); |
|
| 230 | 230 | } else { |
| 231 | 231 | // ACTIVITY OPEN. |
| 232 | 232 | $bbbsession['presentation'] = bigbluebuttonbn_get_presentation_array($bbbsession['context'], |
| 233 | - $bigbluebuttonbn->presentation, |
|
| 234 | - $bigbluebuttonbn->id); |
|
| 233 | + $bigbluebuttonbn->presentation, |
|
| 234 | + $bigbluebuttonbn->id); |
|
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | // Initialize session variable used across views. |
@@ -350,9 +350,9 @@ discard block |
||
| 350 | 350 | |
| 351 | 351 | // Get recordings. |
| 352 | 352 | $recordings = bigbluebuttonbn_get_recordings($bbbsession['course']->id, |
| 353 | - $showroom ? $bbbsession['bigbluebuttonbn']->id : null, |
|
| 354 | - $showroom, |
|
| 355 | - $bbbsession['bigbluebuttonbn']->recordings_deleted_activities); |
|
| 353 | + $showroom ? $bbbsession['bigbluebuttonbn']->id : null, |
|
| 354 | + $showroom, |
|
| 355 | + $bbbsession['bigbluebuttonbn']->recordings_deleted_activities); |
|
| 356 | 356 | |
| 357 | 357 | if (!isset($recordings) || empty($recordings) || array_key_exists('messageKey', $recordings)) { |
| 358 | 358 | // There are no recordings to be shown. |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | // JavaScript variables for recordings. |
| 365 | 365 | $jsvars += array( |
| 366 | 366 | 'recordings_html' => $bbbsession['bigbluebuttonbn']->recordings_html == '1', |
| 367 | - ); |
|
| 367 | + ); |
|
| 368 | 368 | |
| 369 | 369 | // If there are meetings with recordings load the data to the table. |
| 370 | 370 | if ($bbbsession['bigbluebuttonbn']->recordings_html) { |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | $jsvars += array( |
| 377 | 377 | 'columns' => bigbluebuttonbn_get_recording_columns($bbbsession), |
| 378 | 378 | 'data' => bigbluebuttonbn_get_recording_data($bbbsession, $recordings), |
| 379 | - ); |
|
| 379 | + ); |
|
| 380 | 380 | |
| 381 | 381 | // JavaScript dependences for recordings with YUI. |
| 382 | 382 | $jsdependences += array('datatable', 'datatable-sort', 'datatable-paginator', 'datatype-number'); |
@@ -392,10 +392,10 @@ discard block |
||
| 392 | 392 | |
| 393 | 393 | $button = html_writer::tag('input', '', |
| 394 | 394 | array('type' => 'button', |
| 395 | - 'value' => get_string('view_recording_button_import', 'bigbluebuttonbn'), |
|
| 396 | - 'class' => 'btn btn-secondary', |
|
| 397 | - 'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/import_view.php?bn='. |
|
| 398 | - $bbbsession['bigbluebuttonbn']->id.'\'')); |
|
| 395 | + 'value' => get_string('view_recording_button_import', 'bigbluebuttonbn'), |
|
| 396 | + 'class' => 'btn btn-secondary', |
|
| 397 | + 'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/import_view.php?bn='. |
|
| 398 | + $bbbsession['bigbluebuttonbn']->id.'\'')); |
|
| 399 | 399 | $output .= html_writer::start_tag('br'); |
| 400 | 400 | $output .= html_writer::tag('span', $button, array('id' => 'import_recording_links_button')); |
| 401 | 401 | $output .= html_writer::tag('span', '', array('id' => 'import_recording_links_table')); |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | return '<h4>'.get_string('view_section_title_presentation', 'bigbluebuttonbn').'</h4>'. |
| 445 | 445 | ''.$OUTPUT->action_icon($bbbsession['presentation']['url'], $icon, null, array(), false).''. |
| 446 | 446 | ''.$OUTPUT->action_link($bbbsession['presentation']['url'], |
| 447 | - $bbbsession['presentation']['name'], null, $attributes).'<br><br>'; |
|
| 447 | + $bbbsession['presentation']['name'], null, $attributes).'<br><br>'; |
|
| 448 | 448 | } |
| 449 | 449 | |
| 450 | 450 | return ''; |
@@ -80,9 +80,9 @@ discard block |
||
| 80 | 80 | // BigBlueButton API Calls. |
| 81 | 81 | function bigbluebuttonbn_get_join_url($meetingid, $username, $pw, $logouturl, $configtoken = null, $userid = null) { |
| 82 | 82 | $data = ['meetingID' => $meetingid, |
| 83 | - 'fullName' => $username, |
|
| 84 | - 'password' => $pw, |
|
| 85 | - 'logoutURL' => $logouturl, |
|
| 83 | + 'fullName' => $username, |
|
| 84 | + 'password' => $pw, |
|
| 85 | + 'logoutURL' => $logouturl, |
|
| 86 | 86 | ]; |
| 87 | 87 | |
| 88 | 88 | if (!is_null($configtoken)) { |
@@ -98,11 +98,11 @@ discard block |
||
| 98 | 98 | function bigbluebuttonbn_get_create_meeting_url($name, $meetingid, $attendeepw, $moderatorpw, $welcome, |
| 99 | 99 | $logouturl, $record = 'false', $duration = 0, $voicebridge = 0, $maxparticipants = 0, $metadata = array()) { |
| 100 | 100 | $data = ['meetingID' => $meetingid, |
| 101 | - 'name' => $name, |
|
| 102 | - 'attendeePW' => $attendeepw, |
|
| 103 | - 'moderatorPW' => $moderatorpw, |
|
| 104 | - 'logoutURL' => $logouturl, |
|
| 105 | - 'record' => $record, |
|
| 101 | + 'name' => $name, |
|
| 102 | + 'attendeePW' => $attendeepw, |
|
| 103 | + 'moderatorPW' => $moderatorpw, |
|
| 104 | + 'logoutURL' => $logouturl, |
|
| 105 | + 'record' => $record, |
|
| 106 | 106 | ]; |
| 107 | 107 | |
| 108 | 108 | $voicebridge = intval($voicebridge); |
@@ -234,24 +234,24 @@ discard block |
||
| 234 | 234 | function bigbluebuttonbn_get_meeting_info_array($meetingid) { |
| 235 | 235 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 236 | 236 | bigbluebuttonbn_bigbluebutton_action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 237 | - ); |
|
| 237 | + ); |
|
| 238 | 238 | |
| 239 | 239 | if ($xml && $xml->returncode == 'SUCCESS' && empty($xml->messageKey)) { |
| 240 | 240 | // Meeting info was returned. |
| 241 | 241 | return array('returncode' => $xml->returncode, |
| 242 | - 'meetingID' => $xml->meetingID, |
|
| 243 | - 'moderatorPW' => $xml->moderatorPW, |
|
| 244 | - 'attendeePW' => $xml->attendeePW, |
|
| 245 | - 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 246 | - 'running' => $xml->running, |
|
| 247 | - 'recording' => $xml->recording, |
|
| 248 | - 'startTime' => $xml->startTime, |
|
| 249 | - 'endTime' => $xml->endTime, |
|
| 250 | - 'participantCount' => $xml->participantCount, |
|
| 251 | - 'moderatorCount' => $xml->moderatorCount, |
|
| 252 | - 'attendees' => $xml->attendees, |
|
| 253 | - 'metadata' => $xml->metadata, |
|
| 254 | - ); |
|
| 242 | + 'meetingID' => $xml->meetingID, |
|
| 243 | + 'moderatorPW' => $xml->moderatorPW, |
|
| 244 | + 'attendeePW' => $xml->attendeePW, |
|
| 245 | + 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 246 | + 'running' => $xml->running, |
|
| 247 | + 'recording' => $xml->recording, |
|
| 248 | + 'startTime' => $xml->startTime, |
|
| 249 | + 'endTime' => $xml->endTime, |
|
| 250 | + 'participantCount' => $xml->participantCount, |
|
| 251 | + 'moderatorCount' => $xml->moderatorCount, |
|
| 252 | + 'attendees' => $xml->attendees, |
|
| 253 | + 'metadata' => $xml->metadata, |
|
| 254 | + ); |
|
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | if ($xml) { |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | // Do getRecordings is executed using a method GET (supported by all versions of BBB). |
| 288 | 288 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 289 | 289 | bigbluebuttonbn_bigbluebutton_action_url('getRecordings', ['meetingID' => implode(',', $mids)]) |
| 290 | - ); |
|
| 290 | + ); |
|
| 291 | 291 | if ($xml && $xml->returncode == 'SUCCESS' && isset($xml->recordings)) { |
| 292 | 292 | // If there were meetings already created. |
| 293 | 293 | foreach ($xml->recordings->recording as $recording) { |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | function bigbluebuttonbn_get_default_config_xml() { |
| 359 | 359 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 360 | 360 | bigbluebuttonbn_bigbluebutton_action_url('getDefaultConfigXML') |
| 361 | - ); |
|
| 361 | + ); |
|
| 362 | 362 | |
| 363 | 363 | return $xml; |
| 364 | 364 | } |
@@ -425,7 +425,7 @@ discard block |
||
| 425 | 425 | foreach ($ids as $id) { |
| 426 | 426 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 427 | 427 | bigbluebuttonbn_bigbluebutton_action_url('deleteRecordings', ['recordID' => $id]) |
| 428 | - ); |
|
| 428 | + ); |
|
| 429 | 429 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 430 | 430 | return false; |
| 431 | 431 | } |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | foreach ($ids as $id) { |
| 444 | 444 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 445 | 445 | bigbluebuttonbn_bigbluebutton_action_url('publishRecordings', ['recordID' => $id, 'publish' => $publish]) |
| 446 | - ); |
|
| 446 | + ); |
|
| 447 | 447 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 448 | 448 | return false; |
| 449 | 449 | } |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | function bigbluebuttonbn_end_meeting($meetingid, $modpw) { |
| 460 | 460 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 461 | 461 | bigbluebuttonbn_bigbluebutton_action_url('end', ['meetingID' => $meetingid, 'password' => $modpw]) |
| 462 | - ); |
|
| 462 | + ); |
|
| 463 | 463 | |
| 464 | 464 | if ($xml) { |
| 465 | 465 | // If the xml packet returned failure it displays the message to the user. |
@@ -476,7 +476,7 @@ discard block |
||
| 476 | 476 | function bigbluebuttonbn_is_meeting_running($meetingid) { |
| 477 | 477 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 478 | 478 | bigbluebuttonbn_bigbluebutton_action_url('isMeetingRunning', ['meetingID' => $meetingid]) |
| 479 | - ); |
|
| 479 | + ); |
|
| 480 | 480 | |
| 481 | 481 | if ($xml && $xml->returncode == 'SUCCESS') { |
| 482 | 482 | return ($xml->running == 'true') ? true : false; |
@@ -552,10 +552,10 @@ discard block |
||
| 552 | 552 | |
| 553 | 553 | $options = array(); |
| 554 | 554 | $options['CURLOPT_HTTPHEADER'] = array( |
| 555 | - 'Content-Type: '.$contenttype, |
|
| 556 | - 'Content-Length: '.strlen($data), |
|
| 557 | - 'Content-Language: en-US', |
|
| 558 | - ); |
|
| 555 | + 'Content-Type: '.$contenttype, |
|
| 556 | + 'Content-Length: '.strlen($data), |
|
| 557 | + 'Content-Language: en-US', |
|
| 558 | + ); |
|
| 559 | 559 | |
| 560 | 560 | return $c->post($url, $data, $options); |
| 561 | 561 | } |
@@ -621,8 +621,8 @@ discard block |
||
| 621 | 621 | $participantlist = json_decode($bigbluebuttonbn->participants); |
| 622 | 622 | foreach ($participantlist as $participant) { |
| 623 | 623 | $participantlistarray[] = array('selectiontype' => $participant->selectiontype, |
| 624 | - 'selectionid' => $participant->selectionid, |
|
| 625 | - 'role' => $participant->role, ); |
|
| 624 | + 'selectionid' => $participant->selectionid, |
|
| 625 | + 'role' => $participant->role, ); |
|
| 626 | 626 | } |
| 627 | 627 | |
| 628 | 628 | return $participantlistarray; |
@@ -633,8 +633,8 @@ discard block |
||
| 633 | 633 | |
| 634 | 634 | $participantlistarray = array(); |
| 635 | 635 | $participantlistarray[] = array('selectiontype' => 'all', |
| 636 | - 'selectionid' => 'all', |
|
| 637 | - 'role' => BIGBLUEBUTTONBN_ROLE_VIEWER, ); |
|
| 636 | + 'selectionid' => 'all', |
|
| 637 | + 'role' => BIGBLUEBUTTONBN_ROLE_VIEWER, ); |
|
| 638 | 638 | |
| 639 | 639 | $moderatordefaults = explode(',', bigbluebuttonbn_get_cfg_moderator_default()); |
| 640 | 640 | foreach ($moderatordefaults as $moderatordefault) { |
@@ -643,8 +643,8 @@ discard block |
||
| 643 | 643 | foreach ($users as $user) { |
| 644 | 644 | if ($user->id == $USER->id) { |
| 645 | 645 | $participantlistarray[] = array('selectiontype' => 'user', |
| 646 | - 'selectionid' => $USER->id, |
|
| 647 | - 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR, ); |
|
| 646 | + 'selectionid' => $USER->id, |
|
| 647 | + 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR, ); |
|
| 648 | 648 | break; |
| 649 | 649 | } |
| 650 | 650 | } |
@@ -652,8 +652,8 @@ discard block |
||
| 652 | 652 | } |
| 653 | 653 | |
| 654 | 654 | $participantlistarray[] = array('selectiontype' => 'role', |
| 655 | - 'selectionid' => $moderatordefault, |
|
| 656 | - 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR, ); |
|
| 655 | + 'selectionid' => $moderatordefault, |
|
| 656 | + 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR, ); |
|
| 657 | 657 | } |
| 658 | 658 | |
| 659 | 659 | return $participantlistarray; |
@@ -767,8 +767,8 @@ discard block |
||
| 767 | 767 | } |
| 768 | 768 | |
| 769 | 769 | $parray = array('url' => $purl, 'name' => $pname, |
| 770 | - 'icon' => $picon, |
|
| 771 | - 'mimetype_description' => $pmimetypedescrip); |
|
| 770 | + 'icon' => $picon, |
|
| 771 | + 'mimetype_description' => $pmimetypedescrip); |
|
| 772 | 772 | |
| 773 | 773 | return $parray; |
| 774 | 774 | } |
@@ -885,7 +885,7 @@ discard block |
||
| 885 | 885 | // Ping again and refresh the cache. |
| 886 | 886 | $meetinginfo = (array) bigbluebuttonbn_wrap_xml_load_file( |
| 887 | 887 | bigbluebuttonbn_bigbluebutton_action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 888 | - ); |
|
| 888 | + ); |
|
| 889 | 889 | $cache->set($meetingid, array('creation_time' => time(), 'meeting_info' => json_encode($meetinginfo))); |
| 890 | 890 | |
| 891 | 891 | return $meetinginfo; |
@@ -1848,24 +1848,24 @@ discard block |
||
| 1848 | 1848 | */ |
| 1849 | 1849 | function bigbluebuttonbn_get_cfg_options() { |
| 1850 | 1850 | return [ |
| 1851 | - 'voicebridge_editable' => bigbluebuttonbn_get_cfg_voicebridge_editable(), |
|
| 1852 | - 'recording_default' => bigbluebuttonbn_get_cfg_recording_default(), |
|
| 1853 | - 'recording_editable' => bigbluebuttonbn_get_cfg_recording_editable(), |
|
| 1854 | - 'recording_tagging_default' => bigbluebuttonbn_get_cfg_recording_tagging_default(), |
|
| 1855 | - 'recording_tagging_editable' => bigbluebuttonbn_get_cfg_recording_tagging_editable(), |
|
| 1856 | - 'waitformoderator_default' => bigbluebuttonbn_get_cfg_waitformoderator_default(), |
|
| 1857 | - 'waitformoderator_editable' => bigbluebuttonbn_get_cfg_waitformoderator_editable(), |
|
| 1858 | - 'userlimit_default' => bigbluebuttonbn_get_cfg_userlimit_default(), |
|
| 1859 | - 'userlimit_editable' => bigbluebuttonbn_get_cfg_userlimit_editable(), |
|
| 1860 | - 'preuploadpresentation_enabled' => bigbluebuttonbn_get_cfg_preuploadpresentation_enabled(), |
|
| 1861 | - 'sendnotifications_enabled' => bigbluebuttonbn_get_cfg_sendnotifications_enabled(), |
|
| 1862 | - 'recordings_html_default' => bigbluebuttonbn_get_cfg_recordings_html_default(), |
|
| 1863 | - 'recordings_html_editable' => bigbluebuttonbn_get_cfg_recordings_html_editable(), |
|
| 1864 | - 'recordings_deleted_activities_default' => bigbluebuttonbn_get_cfg_recordings_deleted_activities_default(), |
|
| 1865 | - 'recordings_deleted_activities_editable' => bigbluebuttonbn_get_cfg_recordings_deleted_activities_editable(), |
|
| 1866 | - 'recording_icons_enabled' => bigbluebuttonbn_get_cfg_recording_icons_enabled(), |
|
| 1867 | - 'instance_type_enabled' => bigbluebuttonbn_recordings_enabled(), |
|
| 1868 | - 'instance_type_default' => BIGBLUEBUTTONBN_TYPE_ALL, |
|
| 1851 | + 'voicebridge_editable' => bigbluebuttonbn_get_cfg_voicebridge_editable(), |
|
| 1852 | + 'recording_default' => bigbluebuttonbn_get_cfg_recording_default(), |
|
| 1853 | + 'recording_editable' => bigbluebuttonbn_get_cfg_recording_editable(), |
|
| 1854 | + 'recording_tagging_default' => bigbluebuttonbn_get_cfg_recording_tagging_default(), |
|
| 1855 | + 'recording_tagging_editable' => bigbluebuttonbn_get_cfg_recording_tagging_editable(), |
|
| 1856 | + 'waitformoderator_default' => bigbluebuttonbn_get_cfg_waitformoderator_default(), |
|
| 1857 | + 'waitformoderator_editable' => bigbluebuttonbn_get_cfg_waitformoderator_editable(), |
|
| 1858 | + 'userlimit_default' => bigbluebuttonbn_get_cfg_userlimit_default(), |
|
| 1859 | + 'userlimit_editable' => bigbluebuttonbn_get_cfg_userlimit_editable(), |
|
| 1860 | + 'preuploadpresentation_enabled' => bigbluebuttonbn_get_cfg_preuploadpresentation_enabled(), |
|
| 1861 | + 'sendnotifications_enabled' => bigbluebuttonbn_get_cfg_sendnotifications_enabled(), |
|
| 1862 | + 'recordings_html_default' => bigbluebuttonbn_get_cfg_recordings_html_default(), |
|
| 1863 | + 'recordings_html_editable' => bigbluebuttonbn_get_cfg_recordings_html_editable(), |
|
| 1864 | + 'recordings_deleted_activities_default' => bigbluebuttonbn_get_cfg_recordings_deleted_activities_default(), |
|
| 1865 | + 'recordings_deleted_activities_editable' => bigbluebuttonbn_get_cfg_recordings_deleted_activities_editable(), |
|
| 1866 | + 'recording_icons_enabled' => bigbluebuttonbn_get_cfg_recording_icons_enabled(), |
|
| 1867 | + 'instance_type_enabled' => bigbluebuttonbn_recordings_enabled(), |
|
| 1868 | + 'instance_type_default' => BIGBLUEBUTTONBN_TYPE_ALL, |
|
| 1869 | 1869 | ]; |
| 1870 | 1870 | } |
| 1871 | 1871 | |
@@ -2050,8 +2050,8 @@ discard block |
||
| 2050 | 2050 | $activitytime = ''; |
| 2051 | 2051 | if ($time) { |
| 2052 | 2052 | $activitytime = calendar_day_representation($time).' '. |
| 2053 | - get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2054 | - calendar_time_representation($time); |
|
| 2053 | + get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2054 | + calendar_time_representation($time); |
|
| 2055 | 2055 | } |
| 2056 | 2056 | |
| 2057 | 2057 | return $activitytime; |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | 'strings' => $strings, 'pix_icon_delete_url' => $pixicondeleteurl, 'roles' => $roles, |
| 89 | 89 | 'users' => $users, 'participant_selection' => $participantselection, |
| 90 | 90 | 'participant_list' => $participantlist, |
| 91 | - ]); |
|
| 91 | + ]); |
|
| 92 | 92 | |
| 93 | 93 | // Add block 'Schedule'. |
| 94 | 94 | bigbluebuttonbn_mform_add_block_schedule($mform, ['activity' => $currentactivity]); |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | $field['description_key'], $cfg['recordings_html_default']); |
| 255 | 255 | |
| 256 | 256 | $field = ['type' => 'hidden', 'name' => 'recordings_deleted_activities', 'data_type' => PARAM_INT, |
| 257 | - 'description_key' => null]; |
|
| 257 | + 'description_key' => null]; |
|
| 258 | 258 | if ($cfg['recordings_deleted_activities_editable']) { |
| 259 | 259 | $field['type'] = 'checkbox'; |
| 260 | 260 | $field['description_key'] = 'mod_form_field_recordings_deleted_activities'; |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | html_writer::select($participantselection['type_options'], 'bigbluebuttonbn_participant_selection_type', |
| 310 | 310 | $participantselection['type_selected'], array(), |
| 311 | 311 | array('id' => 'bigbluebuttonbn_participant_selection_type', |
| 312 | - 'onchange' => 'M.mod_bigbluebuttonbn.mod_form_participant_selection_set(); return 0;')).' '. |
|
| 312 | + 'onchange' => 'M.mod_bigbluebuttonbn.mod_form_participant_selection_set(); return 0;')).' '. |
|
| 313 | 313 | html_writer::select($participantselection['options'], 'bigbluebuttonbn_participant_selection', |
| 314 | 314 | $participantselection['selected'], array(), |
| 315 | 315 | array('id' => 'bigbluebuttonbn_participant_selection', 'disabled' => 'disabled')).' '. |
@@ -354,9 +354,9 @@ discard block |
||
| 354 | 354 | $col2 = new html_table_cell(); |
| 355 | 355 | $options = [ |
| 356 | 356 | BIGBLUEBUTTONBN_ROLE_VIEWER => get_string('mod_form_field_participant_bbb_role_'. |
| 357 | - BIGBLUEBUTTONBN_ROLE_VIEWER, 'bigbluebuttonbn'), |
|
| 357 | + BIGBLUEBUTTONBN_ROLE_VIEWER, 'bigbluebuttonbn'), |
|
| 358 | 358 | BIGBLUEBUTTONBN_ROLE_MODERATOR => get_string('mod_form_field_participant_bbb_role_'. |
| 359 | - BIGBLUEBUTTONBN_ROLE_MODERATOR, 'bigbluebuttonbn'), |
|
| 359 | + BIGBLUEBUTTONBN_ROLE_MODERATOR, 'bigbluebuttonbn'), |
|
| 360 | 360 | ]; |
| 361 | 361 | $optionselected = $participant['role']; |
| 362 | 362 | $col2->text = html_writer::tag('i', ' '. |
@@ -365,8 +365,8 @@ discard block |
||
| 365 | 365 | 'participant_list_role_'.$participant['selectiontype'].'-'.$participant['selectionid'], |
| 366 | 366 | $optionselected, array(), |
| 367 | 367 | array('id' => 'participant_list_role_'.$participant['selectiontype'].'-'.$participant['selectionid'], |
| 368 | - 'onchange' => 'M.mod_bigbluebuttonbn.mod_form_participant_list_role_update(\''. |
|
| 369 | - $participant['selectiontype'].'\', \''.$participant['selectionid'].'\'); return 0;', |
|
| 368 | + 'onchange' => 'M.mod_bigbluebuttonbn.mod_form_participant_list_role_update(\''. |
|
| 369 | + $participant['selectiontype'].'\', \''.$participant['selectionid'].'\'); return 0;', |
|
| 370 | 370 | ) |
| 371 | 371 | ) |
| 372 | 372 | ); |
@@ -436,23 +436,23 @@ discard block |
||
| 436 | 436 | |
| 437 | 437 | public function bigbluebuttonbn_get_participant_selection_strings() { |
| 438 | 438 | return [ |
| 439 | - 'as' => get_string('mod_form_field_participant_list_text_as', 'bigbluebuttonbn'), |
|
| 440 | - 'viewer' => get_string('mod_form_field_participant_bbb_role_viewer', 'bigbluebuttonbn'), |
|
| 441 | - 'moderator' => get_string('mod_form_field_participant_bbb_role_moderator', 'bigbluebuttonbn'), |
|
| 442 | - 'remove' => get_string('mod_form_field_participant_list_action_remove', 'bigbluebuttonbn'), |
|
| 439 | + 'as' => get_string('mod_form_field_participant_list_text_as', 'bigbluebuttonbn'), |
|
| 440 | + 'viewer' => get_string('mod_form_field_participant_bbb_role_viewer', 'bigbluebuttonbn'), |
|
| 441 | + 'moderator' => get_string('mod_form_field_participant_bbb_role_moderator', 'bigbluebuttonbn'), |
|
| 442 | + 'remove' => get_string('mod_form_field_participant_list_action_remove', 'bigbluebuttonbn'), |
|
| 443 | 443 | ]; |
| 444 | 444 | } |
| 445 | 445 | |
| 446 | 446 | public function bigbluebuttonbn_get_participant_selection_data() { |
| 447 | 447 | return [ |
| 448 | - 'type_options' => [ |
|
| 449 | - 'all' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
|
| 450 | - 'role' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
|
| 451 | - 'user' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
|
| 452 | - ], |
|
| 453 | - 'type_selected' => 'all', |
|
| 454 | - 'options' => ['all' => '---------------'], |
|
| 455 | - 'selected' => 'all', |
|
| 448 | + 'type_options' => [ |
|
| 449 | + 'all' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
|
| 450 | + 'role' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
|
| 451 | + 'user' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
|
| 452 | + ], |
|
| 453 | + 'type_selected' => 'all', |
|
| 454 | + 'options' => ['all' => '---------------'], |
|
| 455 | + 'selected' => 'all', |
|
| 456 | 456 | ]; |
| 457 | 457 | } |
| 458 | 458 | } |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | 'bbb-recording-name' => $bbbrecordingname, |
| 117 | 117 | 'bbb-recording-description' => $bbbrecordingdescription, |
| 118 | 118 | 'bbb-recording-tags' => $bbbrecordingtags, |
| 119 | - ); |
|
| 119 | + ); |
|
| 120 | 120 | |
| 121 | 121 | if (bigbluebuttonbn_server_offers_bn_capabilities()) { |
| 122 | 122 | if (bigbluebuttonbn_get_cfg_recordingready_enabled()) { |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | $metadata, |
| 153 | 153 | $bbbsession['presentation']['name'], |
| 154 | 154 | $bbbsession['presentation']['url'] |
| 155 | - ); |
|
| 155 | + ); |
|
| 156 | 156 | |
| 157 | 157 | if (!$response) { |
| 158 | 158 | // If the server is unreachable, then prompts the user of the necessary action. |
@@ -95,7 +95,7 @@ |
||
| 95 | 95 | $output .= html_writer::start_tag('br'); |
| 96 | 96 | $output .= html_writer::tag('input', '', |
| 97 | 97 | array('type' => 'button', 'value' => get_string('view_recording_button_return', 'bigbluebuttonbn'), |
| 98 | - 'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$cm->id.'\'')); |
|
| 98 | + 'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$cm->id.'\'')); |
|
| 99 | 99 | |
| 100 | 100 | $jsvars = array( |
| 101 | 101 | 'bn' => $bn, |
@@ -232,9 +232,9 @@ discard block |
||
| 232 | 232 | global $DB; |
| 233 | 233 | |
| 234 | 234 | $completed = $DB->count_records('bigbluebuttonbn_logs', array('courseid' => $course->id, |
| 235 | - 'bigbluebuttonbnid' => $bigbluebuttonbn->id, |
|
| 236 | - 'userid' => $user->id, |
|
| 237 | - 'log' => 'Join', ), '*'); |
|
| 235 | + 'bigbluebuttonbnid' => $bigbluebuttonbn->id, |
|
| 236 | + 'userid' => $user->id, |
|
| 237 | + 'log' => 'Join', ), '*'); |
|
| 238 | 238 | |
| 239 | 239 | if ($completed > 0) { |
| 240 | 240 | return fullname($user).' '.get_string('view_message_has_joined', 'bigbluebuttonbn').' '. |
@@ -254,9 +254,9 @@ discard block |
||
| 254 | 254 | function bigbluebuttonbn_user_complete($course, $user, $mod, $bigbluebuttonbn) { |
| 255 | 255 | global $DB; |
| 256 | 256 | $completed = $DB->count_recorda('bigbluebuttonbn_logs', array('courseid' => $course->id, |
| 257 | - 'bigbluebuttonbnid' => $bigbluebuttonbn->id, |
|
| 258 | - 'userid' => $user->id, |
|
| 259 | - 'log' => 'Join', ), '*', IGNORE_MULTIPLE); |
|
| 257 | + 'bigbluebuttonbnid' => $bigbluebuttonbn->id, |
|
| 258 | + 'userid' => $user->id, |
|
| 259 | + 'log' => 'Join', ), '*', IGNORE_MULTIPLE); |
|
| 260 | 260 | |
| 261 | 261 | return $completed > 0; |
| 262 | 262 | } |
@@ -329,12 +329,12 @@ discard block |
||
| 329 | 329 | $str = '<div class="bigbluebuttonbn overview">'."\n"; |
| 330 | 330 | $str .= ' <div class="name">'.get_string('modulename', 'bigbluebuttonbn').': '."\n"; |
| 331 | 331 | $str .= ' <a '.$classes.'href="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bigbluebuttonbn->coursemodule. |
| 332 | - '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
| 332 | + '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
| 333 | 333 | $str .= ' </div>'."\n"; |
| 334 | 334 | $str .= ' <div class="info">'.get_string($start, 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->openingtime). |
| 335 | 335 | '</div>'."\n"; |
| 336 | 336 | $str .= ' <div class="info">'.get_string('ends_at', 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->closingtime) |
| 337 | - .'</div>'."\n"; |
|
| 337 | + .'</div>'."\n"; |
|
| 338 | 338 | $str .= '</div>'."\n"; |
| 339 | 339 | |
| 340 | 340 | return $str; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * can be used to identify the recording in the list of recordings. |
| 96 | 96 | **/ |
| 97 | 97 | |
| 98 | - /* |
|
| 98 | + /* |
|
| 99 | 99 | * When the value is set to 1 (checked) the bigbluebuttonbn rooms or |
| 100 | 100 | * activities will have the 'recording tagging' capability enabled by |
| 101 | 101 | * default. |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | * recordings from a different activity even from a different course. |
| 120 | 120 | **/ |
| 121 | 121 | |
| 122 | - /* |
|
| 122 | + /* |
|
| 123 | 123 | * When the value is set to 1 (checked) the bigbluebuttonbn rooms or |
| 124 | 124 | * activities will have the 'import recordings' capability enabled. |
| 125 | 125 | */ |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | * 'Join session' button enabled |
| 141 | 141 | **/ |
| 142 | 142 | |
| 143 | - /* |
|
| 143 | + /* |
|
| 144 | 144 | * When the value is set to 1 (checked) the bigbluebuttonbn rooms or |
| 145 | 145 | * activities will have the 'wait for moderator' capability enabled by |
| 146 | 146 | * default. |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | * 6. CONFIGURATION FOR "STATIC VOICE BRIDGE" FEATURE |
| 175 | 175 | * |
| 176 | 176 | **/ |
| 177 | - /* |
|
| 177 | + /* |
|
| 178 | 178 | * A conference voice bridge number can be permanently assigned to a room |
| 179 | 179 | * or activity. |
| 180 | 180 | */ |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | * 7. CONFIGURATION FOR "PRE-UPLOAD PRESENTATION" FEATURE |
| 185 | 185 | * |
| 186 | 186 | **/ |
| 187 | - /* |
|
| 187 | + /* |
|
| 188 | 188 | * Since version 0.8, BigBluebutton has an implementation for allowing |
| 189 | 189 | * preuploading presentation. When this feature is enabled, users creating or |
| 190 | 190 | * editing a room or activity can upload a PDF or Office document to the |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | * applied to each room or activity, or globally. |
| 202 | 202 | **/ |
| 203 | 203 | |
| 204 | - /* |
|
| 204 | + /* |
|
| 205 | 205 | * The number of users allowed in a session by default when a new room or |
| 206 | 206 | * conference is added. If the number is set to 0, no limit is established. |
| 207 | 207 | * $CFG->bigbluebuttonbn['userlimit_default'] = 0; |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | * By default only the owner is assigned. |
| 223 | 223 | **/ |
| 224 | 224 | |
| 225 | - /* |
|
| 225 | + /* |
|
| 226 | 226 | * The values for this parameter can be 'owner' and/or any of the roles defined in |
| 227 | 227 | * Moodle (including the custom parameters). The value used will be the key for the role. |
| 228 | 228 | * [owner|manager|coursecreator|editingteacher|teacher|student|guest|user|frontpage|ANY_CUSTOM_ROLE] |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | * 10. CONFIGURATION FOR "NOTIFICATION SENDING" FEATURE |
| 234 | 234 | * |
| 235 | 235 | **/ |
| 236 | - /* |
|
| 236 | + /* |
|
| 237 | 237 | * When the value is set to 1 (checked) the 'notification sending' |
| 238 | 238 | * capability can be used by the user creating or editing the room or |
| 239 | 239 | * activity. |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | * 11. CONFIGURATION FOR "RECORDING READY" FEATURE |
| 248 | 248 | * |
| 249 | 249 | **/ |
| 250 | - /* |
|
| 250 | + /* |
|
| 251 | 251 | * When the value is set to 1 (checked) the 'notify users when recording ready' |
| 252 | 252 | * capability is enabled, meaning that a message will be sent to all enrolled |
| 253 | 253 | * users in a course when a recording is ready |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | * 13. GENERAL CONFIGURATION FOR RECORDINGS UI |
| 271 | 271 | * |
| 272 | 272 | **/ |
| 273 | - /* |
|
| 273 | + /* |
|
| 274 | 274 | * When the value is set to 1 (checked) the bigbluebuttonbn resources |
| 275 | 275 | * will show the recodings in an html table by default. |
| 276 | 276 | * $CFG->bigbluebuttonbn['recordings_html_default'] = 0; |