@@ -120,29 +120,29 @@ |
||
| 120 | 120 | */ |
| 121 | 121 | public static function get_options() { |
| 122 | 122 | return [ |
| 123 | - 'version_major' => self::get_moodle_version_major(), |
|
| 124 | - 'voicebridge_editable' => self::get('voicebridge_editable'), |
|
| 125 | - 'waitformoderator_default' => self::get('waitformoderator_default'), |
|
| 126 | - 'waitformoderator_editable' => self::get('waitformoderator_editable'), |
|
| 127 | - 'userlimit_default' => self::get('userlimit_default'), |
|
| 128 | - 'userlimit_editable' => self::get('userlimit_editable'), |
|
| 129 | - 'preuploadpresentation_enabled' => self::get('preuploadpresentation_enabled'), |
|
| 130 | - 'sendnotifications_enabled' => self::get('sendnotifications_enabled'), |
|
| 131 | - 'recordings_enabled' => self::get('recordings_enabled'), |
|
| 132 | - 'recordings_html_default' => self::get('recordings_html_default'), |
|
| 133 | - 'recordings_html_editable' => self::get('recordings_html_editable'), |
|
| 134 | - 'recordings_deleted_default' => self::get('recordings_deleted_default'), |
|
| 135 | - 'recordings_deleted_editable' => self::get('recordings_deleted_editable'), |
|
| 136 | - 'recordings_imported_default' => self::get('recordings_imported_default'), |
|
| 137 | - 'recordings_imported_editable' => self::get('recordings_imported_editable'), |
|
| 138 | - 'recording_default' => self::get('recording_default'), |
|
| 139 | - 'recording_editable' => self::get('recording_editable'), |
|
| 140 | - 'recording_icons_enabled' => self::get('recording_icons_enabled'), |
|
| 141 | - 'general_warning_message' => self::get('general_warning_message'), |
|
| 142 | - 'general_warning_box_type' => self::get('general_warning_box_type'), |
|
| 143 | - 'general_warning_button_text' => self::get('general_warning_button_text'), |
|
| 144 | - 'general_warning_button_href' => self::get('general_warning_button_href'), |
|
| 145 | - 'general_warning_button_class' => self::get('general_warning_button_class'), |
|
| 146 | - ]; |
|
| 123 | + 'version_major' => self::get_moodle_version_major(), |
|
| 124 | + 'voicebridge_editable' => self::get('voicebridge_editable'), |
|
| 125 | + 'waitformoderator_default' => self::get('waitformoderator_default'), |
|
| 126 | + 'waitformoderator_editable' => self::get('waitformoderator_editable'), |
|
| 127 | + 'userlimit_default' => self::get('userlimit_default'), |
|
| 128 | + 'userlimit_editable' => self::get('userlimit_editable'), |
|
| 129 | + 'preuploadpresentation_enabled' => self::get('preuploadpresentation_enabled'), |
|
| 130 | + 'sendnotifications_enabled' => self::get('sendnotifications_enabled'), |
|
| 131 | + 'recordings_enabled' => self::get('recordings_enabled'), |
|
| 132 | + 'recordings_html_default' => self::get('recordings_html_default'), |
|
| 133 | + 'recordings_html_editable' => self::get('recordings_html_editable'), |
|
| 134 | + 'recordings_deleted_default' => self::get('recordings_deleted_default'), |
|
| 135 | + 'recordings_deleted_editable' => self::get('recordings_deleted_editable'), |
|
| 136 | + 'recordings_imported_default' => self::get('recordings_imported_default'), |
|
| 137 | + 'recordings_imported_editable' => self::get('recordings_imported_editable'), |
|
| 138 | + 'recording_default' => self::get('recording_default'), |
|
| 139 | + 'recording_editable' => self::get('recording_editable'), |
|
| 140 | + 'recording_icons_enabled' => self::get('recording_icons_enabled'), |
|
| 141 | + 'general_warning_message' => self::get('general_warning_message'), |
|
| 142 | + 'general_warning_box_type' => self::get('general_warning_box_type'), |
|
| 143 | + 'general_warning_button_text' => self::get('general_warning_button_text'), |
|
| 144 | + 'general_warning_button_href' => self::get('general_warning_button_href'), |
|
| 145 | + 'general_warning_button_class' => self::get('general_warning_button_class'), |
|
| 146 | + ]; |
|
| 147 | 147 | } |
| 148 | 148 | } |
@@ -198,10 +198,10 @@ discard block |
||
| 198 | 198 | */ |
| 199 | 199 | function bigbluebutton_bbb_view_create_meeting_data(&$bbbsession) { |
| 200 | 200 | $data = ['meetingID' => $bbbsession['meetingid'], |
| 201 | - 'name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
| 202 | - 'attendeePW' => $bbbsession['viewerPW'], |
|
| 203 | - 'moderatorPW' => $bbbsession['modPW'], |
|
| 204 | - 'logoutURL' => $bbbsession['logoutURL'], |
|
| 201 | + 'name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
| 202 | + 'attendeePW' => $bbbsession['viewerPW'], |
|
| 203 | + 'moderatorPW' => $bbbsession['modPW'], |
|
| 204 | + 'logoutURL' => $bbbsession['logoutURL'], |
|
| 205 | 205 | ]; |
| 206 | 206 | $data['record'] = bigbluebutton_bbb_view_create_meeting_data_record($bbbsession['record']); |
| 207 | 207 | $data['welcome'] = trim($bbbsession['welcome']); |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | '%duration%', |
| 215 | 215 | (string) $durationtime, |
| 216 | 216 | get_string('bbbdurationwarning', 'bigbluebuttonbn') |
| 217 | - ); |
|
| 217 | + ); |
|
| 218 | 218 | } |
| 219 | 219 | $voicebridge = intval($bbbsession['voicebridge']); |
| 220 | 220 | if ($voicebridge > 0 && $voicebridge < 79999) { |
@@ -253,22 +253,22 @@ discard block |
||
| 253 | 253 | function bigbluebutton_bbb_view_create_meeting_metadata(&$bbbsession) { |
| 254 | 254 | global $USER; |
| 255 | 255 | $metadata = ['bbb-origin' => $bbbsession['origin'], |
| 256 | - 'bbb-origin-version' => $bbbsession['originVersion'], |
|
| 257 | - 'bbb-origin-server-name' => $bbbsession['originServerName'], |
|
| 258 | - 'bbb-origin-server-common-name' => $bbbsession['originServerCommonName'], |
|
| 259 | - 'bbb-origin-tag' => $bbbsession['originTag'], |
|
| 260 | - 'bbb-context' => $bbbsession['course']->fullname, |
|
| 261 | - 'bbb-recording-name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
| 262 | - 'bbb-recording-description' => bigbluebuttonbn_html2text($bbbsession['meetingdescription'], 64), |
|
| 263 | - 'bbb-recording-tags' => bigbluebuttonbn_get_tags($bbbsession['cm']->id), // Same as $id. |
|
| 256 | + 'bbb-origin-version' => $bbbsession['originVersion'], |
|
| 257 | + 'bbb-origin-server-name' => $bbbsession['originServerName'], |
|
| 258 | + 'bbb-origin-server-common-name' => $bbbsession['originServerCommonName'], |
|
| 259 | + 'bbb-origin-tag' => $bbbsession['originTag'], |
|
| 260 | + 'bbb-context' => $bbbsession['course']->fullname, |
|
| 261 | + 'bbb-recording-name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
| 262 | + 'bbb-recording-description' => bigbluebuttonbn_html2text($bbbsession['meetingdescription'], 64), |
|
| 263 | + 'bbb-recording-tags' => bigbluebuttonbn_get_tags($bbbsession['cm']->id), // Same as $id. |
|
| 264 | 264 | ]; |
| 265 | 265 | if ((boolean)\mod_bigbluebuttonbn\locallib\config::get('recordingstatus_enabled')) { |
| 266 | 266 | $metadata["bn-recording-status"] = json_encode( |
| 267 | 267 | array( |
| 268 | 268 | 'email' => array('"' . fullname($USER) . '" <' . $USER->email . '>'), |
| 269 | 269 | 'context' => $bbbsession['bigbluebuttonbnURL'] |
| 270 | - ) |
|
| 271 | - ); |
|
| 270 | + ) |
|
| 271 | + ); |
|
| 272 | 272 | } |
| 273 | 273 | if ((boolean)\mod_bigbluebuttonbn\locallib\config::get('recordingready_enabled')) { |
| 274 | 274 | $metadata['bn-recording-ready-url'] = $bbbsession['recordingReadyURL']; |
@@ -366,26 +366,26 @@ discard block |
||
| 366 | 366 | return array( |
| 367 | 367 | 'status' => false, |
| 368 | 368 | 'message' => get_string('view_recording_publish_link_deleted', 'bigbluebuttonbn') |
| 369 | - ); |
|
| 369 | + ); |
|
| 370 | 370 | } |
| 371 | 371 | if ($realrecordings[$params['id']]['published'] !== 'true') { |
| 372 | 372 | return array( |
| 373 | 373 | 'status' => false, |
| 374 | 374 | 'message' => get_string('view_recording_publish_link_not_published', 'bigbluebuttonbn') |
| 375 | - ); |
|
| 375 | + ); |
|
| 376 | 376 | } |
| 377 | 377 | return array( |
| 378 | 378 | 'status' => bigbluebuttonbn_publish_recording_imported( |
| 379 | 379 | $recordings[$params['id']]['imported'], true |
| 380 | 380 | ) |
| 381 | - ); |
|
| 381 | + ); |
|
| 382 | 382 | } |
| 383 | 383 | // As the recordingid was not identified as imported recording link, execute actual publish. |
| 384 | 384 | return array( |
| 385 | 385 | 'status' => bigbluebuttonbn_publish_recordings( |
| 386 | 386 | $params['id'], 'true' |
| 387 | 387 | ) |
| 388 | - ); |
|
| 388 | + ); |
|
| 389 | 389 | } |
| 390 | 390 | |
| 391 | 391 | /** |
@@ -401,26 +401,26 @@ discard block |
||
| 401 | 401 | return array( |
| 402 | 402 | 'status' => false, |
| 403 | 403 | 'message' => get_string('view_recording_unprotect_link_deleted', 'bigbluebuttonbn') |
| 404 | - ); |
|
| 404 | + ); |
|
| 405 | 405 | } |
| 406 | 406 | if ($realrecordings[$params['id']]['protected'] === 'true') { |
| 407 | 407 | return array( |
| 408 | 408 | 'status' => false, |
| 409 | 409 | 'message' => get_string('view_recording_unprotect_link_not_unprotected', 'bigbluebuttonbn') |
| 410 | - ); |
|
| 410 | + ); |
|
| 411 | 411 | } |
| 412 | 412 | return array( |
| 413 | 413 | 'status' => bigbluebuttonbn_protect_recording_imported( |
| 414 | 414 | $recordings[$params['id']]['imported'], false |
| 415 | 415 | ) |
| 416 | - ); |
|
| 416 | + ); |
|
| 417 | 417 | } |
| 418 | 418 | // As the recordingid was not identified as imported recording link, execute actual uprotect. |
| 419 | 419 | return array( |
| 420 | 420 | 'status' => bigbluebuttonbn_update_recordings( |
| 421 | 421 | $params['id'], array('protect' => 'false') |
| 422 | 422 | ) |
| 423 | - ); |
|
| 423 | + ); |
|
| 424 | 424 | } |
| 425 | 425 | |
| 426 | 426 | /** |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | 'status' => bigbluebuttonbn_publish_recording_imported( |
| 435 | 435 | $recordings[$params['id']]['imported'], false |
| 436 | 436 | ) |
| 437 | - ); |
|
| 437 | + ); |
|
| 438 | 438 | } |
| 439 | 439 | // As the recordingid was not identified as imported recording link, execute unpublish on a real recording. |
| 440 | 440 | // First: Unpublish imported links associated to the recording. |
@@ -452,7 +452,7 @@ discard block |
||
| 452 | 452 | 'status' => bigbluebuttonbn_publish_recordings( |
| 453 | 453 | $params['id'], 'false' |
| 454 | 454 | ) |
| 455 | - ); |
|
| 455 | + ); |
|
| 456 | 456 | } |
| 457 | 457 | |
| 458 | 458 | /** |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | 'status' => bigbluebuttonbn_protect_recording_imported( |
| 467 | 467 | $recordings[$params['id']]['imported'], true |
| 468 | 468 | ) |
| 469 | - ); |
|
| 469 | + ); |
|
| 470 | 470 | } |
| 471 | 471 | // As the recordingid was not identified as imported recording link, execute protect on a real recording. |
| 472 | 472 | // First: Protect imported links associated to the recording. |
@@ -484,7 +484,7 @@ discard block |
||
| 484 | 484 | 'status' => bigbluebuttonbn_update_recordings( |
| 485 | 485 | $params['id'], array('protect' => 'true') |
| 486 | 486 | ) |
| 487 | - ); |
|
| 487 | + ); |
|
| 488 | 488 | } |
| 489 | 489 | |
| 490 | 490 | /** |
@@ -498,7 +498,7 @@ discard block |
||
| 498 | 498 | 'status' => bigbluebuttonbn_delete_recording_imported( |
| 499 | 499 | $recordings[$params['id']]['imported'] |
| 500 | 500 | ) |
| 501 | - ); |
|
| 501 | + ); |
|
| 502 | 502 | } |
| 503 | 503 | // As the recordingid was not identified as imported recording link, execute delete on a real recording. |
| 504 | 504 | // First: Delete imported links associated to the recording. |
@@ -514,7 +514,7 @@ discard block |
||
| 514 | 514 | 'status' => bigbluebuttonbn_delete_recordings( |
| 515 | 515 | $params['id'] |
| 516 | 516 | ) |
| 517 | - ); |
|
| 517 | + ); |
|
| 518 | 518 | } |
| 519 | 519 | |
| 520 | 520 | /** |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | 'status' => bigbluebuttonbn_update_recording_imported( |
| 528 | 528 | $recordings[$params['id']]['imported'], json_decode($params['meta'], true) |
| 529 | 529 | ) |
| 530 | - ); |
|
| 530 | + ); |
|
| 531 | 531 | } |
| 532 | 532 | |
| 533 | 533 | // As the recordingid was not identified as imported recording link, execute update on a real recording. |
@@ -537,7 +537,7 @@ discard block |
||
| 537 | 537 | 'status' => bigbluebuttonbn_update_recordings( |
| 538 | 538 | $params['id'], json_decode($params['meta']) |
| 539 | 539 | ) |
| 540 | - ); |
|
| 540 | + ); |
|
| 541 | 541 | } |
| 542 | 542 | |
| 543 | 543 | /** |
@@ -682,10 +682,10 @@ discard block |
||
| 682 | 682 | $params['recording_import'] = ['id' => 'The recordingID must be specified.']; |
| 683 | 683 | $params['recording_ready'] = [ |
| 684 | 684 | 'signed_parameters' => 'A JWT encoded string must be included as [signed_parameters].' |
| 685 | - ]; |
|
| 685 | + ]; |
|
| 686 | 686 | $params['live_session_events'] = [ |
| 687 | 687 | 'signed_parameters' => 'A JWT encoded string must be included as [signed_parameters].' |
| 688 | - ]; |
|
| 688 | + ]; |
|
| 689 | 689 | return $params; |
| 690 | 690 | } |
| 691 | 691 | |
@@ -77,8 +77,8 @@ |
||
| 77 | 77 | $body .= html_writer::start_tag('br'); |
| 78 | 78 | $body .= html_writer::tag('input', '', |
| 79 | 79 | array('type' => 'button', 'class' => 'btn btn-secondary', |
| 80 | - 'value' => get_string('view_recording_button_return', 'bigbluebuttonbn'), |
|
| 81 | - 'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$cm->id.'\'')); |
|
| 80 | + 'value' => get_string('view_recording_button_return', 'bigbluebuttonbn'), |
|
| 81 | + 'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$cm->id.'\'')); |
|
| 82 | 82 | // JavaScript for locales. |
| 83 | 83 | $PAGE->requires->strings_for_js(array_keys(bigbluebuttonbn_get_strings_for_js()), 'bigbluebuttonbn'); |
| 84 | 84 | // Require JavaScript modules. |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | 'alt' => $contents, |
| 105 | 105 | 'title' => $contents, |
| 106 | 106 | 'src' => $jsvars['pix_icon_delete'] |
| 107 | - ); |
|
| 107 | + ); |
|
| 108 | 108 | $jsvars['pix_icon_delete'] = html_writer::tag('img', '', $options); |
| 109 | 109 | } |
| 110 | 110 | $PAGE->requires->yui_module('moodle-mod_bigbluebuttonbn-modform', |
@@ -224,8 +224,8 @@ discard block |
||
| 224 | 224 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
| 225 | 225 | $field['description_key'], 0, ['maxlength' => 4, 'size' => 6], |
| 226 | 226 | ['message' => get_string('mod_form_field_voicebridge_format_error', 'bigbluebuttonbn'), |
| 227 | - 'type' => 'numeric', 'rule' => '####', 'validator' => 'server'] |
|
| 228 | - ); |
|
| 227 | + 'type' => 'numeric', 'rule' => '####', 'validator' => 'server'] |
|
| 228 | + ); |
|
| 229 | 229 | } else { |
| 230 | 230 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
| 231 | 231 | $field['description_key'], 0, ['maxlength' => 4, 'size' => 6]); |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | */ |
| 264 | 264 | private function bigbluebuttonbn_mform_add_block_room_recordings(&$mform, $cfg) { |
| 265 | 265 | $field = ['type' => 'hidden', 'name' => 'recordings_html', 'data_type' => PARAM_INT, |
| 266 | - 'description_key' => null]; |
|
| 266 | + 'description_key' => null]; |
|
| 267 | 267 | if ($cfg['recordings_html_editable']) { |
| 268 | 268 | $field['type'] = 'checkbox'; |
| 269 | 269 | $field['description_key'] = 'mod_form_field_recordings_html'; |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
| 272 | 272 | $field['description_key'], $cfg['recordings_html_default']); |
| 273 | 273 | $field = ['type' => 'hidden', 'name' => 'recordings_deleted', 'data_type' => PARAM_INT, |
| 274 | - 'description_key' => null]; |
|
| 274 | + 'description_key' => null]; |
|
| 275 | 275 | if ($cfg['recordings_deleted_editable']) { |
| 276 | 276 | $field['type'] = 'checkbox'; |
| 277 | 277 | $field['description_key'] = 'mod_form_field_recordings_deleted'; |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
| 280 | 280 | $field['description_key'], $cfg['recordings_deleted_default']); |
| 281 | 281 | $field = ['type' => 'hidden', 'name' => 'recordings_imported', 'data_type' => PARAM_INT, |
| 282 | - 'description_key' => null]; |
|
| 282 | + 'description_key' => null]; |
|
| 283 | 283 | if ($cfg['recordings_imported_editable']) { |
| 284 | 284 | $field['type'] = 'checkbox'; |
| 285 | 285 | $field['description_key'] = 'mod_form_field_recordings_imported'; |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | $htmlselectiontype = html_writer::select($participantselection['type_options'], |
| 350 | 350 | 'bigbluebuttonbn_participant_selection_type', $participantselection['type_selected'], array(), |
| 351 | 351 | array('id' => 'bigbluebuttonbn_participant_selection_type', |
| 352 | - 'onchange' => 'M.mod_bigbluebuttonbn.modform.participantSelectionSet(); return 0;')); |
|
| 352 | + 'onchange' => 'M.mod_bigbluebuttonbn.modform.participantSelectionSet(); return 0;')); |
|
| 353 | 353 | $htmlselectionoptions = html_writer::select($participantselection['options'], 'bigbluebuttonbn_participant_selection', |
| 354 | 354 | $participantselection['selected'], array(), |
| 355 | 355 | array('id' => 'bigbluebuttonbn_participant_selection', 'disabled' => 'disabled')); |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | 'type' => 'button', 'class' => 'btn btn-secondary', |
| 358 | 358 | 'value' => get_string('mod_form_field_participant_list_action_add', 'bigbluebuttonbn'), |
| 359 | 359 | 'onclick' => 'M.mod_bigbluebuttonbn.modform.participantAdd(); return 0;' |
| 360 | - )); |
|
| 360 | + )); |
|
| 361 | 361 | $htmladdparticipant = html_writer::tag('div', |
| 362 | 362 | $htmlselectiontype . ' ' . $htmlselectionoptions . ' ' . $htmlselectioninput, null); |
| 363 | 363 | $mform->addElement('html', "\n\n"); |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | * Remove this block when restored |
| 69 | 69 | */ |
| 70 | 70 | |
| 71 | - /** @var BIGBLUEBUTTONBN_DEFAULT_SERVER_URL string of default bigbluebutton server url */ |
|
| 71 | + /** @var BIGBLUEBUTTONBN_DEFAULT_SERVER_URL string of default bigbluebutton server url */ |
|
| 72 | 72 | const BIGBLUEBUTTONBN_DEFAULT_SERVER_URL = 'http://test-install.blindsidenetworks.com/bigbluebutton/'; |
| 73 | 73 | /** @var BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET string of default bigbluebutton server shared secret */ |
| 74 | 74 | const BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET = '8cd8ef52e8e101574e400365b55e11a6'; |
@@ -345,12 +345,12 @@ discard block |
||
| 345 | 345 | $str = '<div class="bigbluebuttonbn overview">'."\n"; |
| 346 | 346 | $str .= ' <div class="name">'.get_string('modulename', 'bigbluebuttonbn').': '."\n"; |
| 347 | 347 | $str .= ' <a '.$classes.'href="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bigbluebuttonbn->coursemodule. |
| 348 | - '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
| 348 | + '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
| 349 | 349 | $str .= ' </div>'."\n"; |
| 350 | 350 | $str .= ' <div class="info">'.get_string($start, 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->openingtime). |
| 351 | 351 | '</div>'."\n"; |
| 352 | 352 | $str .= ' <div class="info">'.get_string('ends_at', 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->closingtime) |
| 353 | - .'</div>'."\n"; |
|
| 353 | + .'</div>'."\n"; |
|
| 354 | 354 | $str .= '</div>'."\n"; |
| 355 | 355 | return $str; |
| 356 | 356 | } |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | return $output; |
| 411 | 411 | } |
| 412 | 412 | $output .= $OUTPUT->box_start('box boxalignleft adminerror alert alert-' . $type . ' alert-block fade in', |
| 413 | - 'bigbluebuttonbn_view_general_warning')."\n"; |
|
| 413 | + 'bigbluebuttonbn_view_general_warning')."\n"; |
|
| 414 | 414 | $output .= ' '.$message."\n"; |
| 415 | 415 | $output .= ' <div class="singlebutton">'."\n"; |
| 416 | 416 | if (!empty($href)) { |
@@ -507,12 +507,12 @@ discard block |
||
| 507 | 507 | $recordings = bigbluebuttonbn_get_recordings( |
| 508 | 508 | $bbbsession['course']->id, $bigbluebuttonbnid, $enabledfeatures['showroom'], |
| 509 | 509 | $bbbsession['bigbluebuttonbn']->recordings_deleted |
| 510 | - ); |
|
| 510 | + ); |
|
| 511 | 511 | if ($enabledfeatures['importrecordings']) { |
| 512 | 512 | // Get recording links. |
| 513 | 513 | $recordingsimported = bigbluebuttonbn_get_recordings_imported_array( |
| 514 | 514 | $bbbsession['course']->id, $bigbluebuttonbnid, $enabledfeatures['showroom'] |
| 515 | - ); |
|
| 515 | + ); |
|
| 516 | 516 | /* Perform aritmetic addition instead of merge so the imported recordings corresponding to existent |
| 517 | 517 | * recordings are not included. */ |
| 518 | 518 | $recordings += $recordingsimported; |
@@ -526,7 +526,7 @@ discard block |
||
| 526 | 526 | // JavaScript variables for recordings. |
| 527 | 527 | $jsvars += array( |
| 528 | 528 | 'recordings_html' => $bbbsession['bigbluebuttonbn']->recordings_html == '1', |
| 529 | - ); |
|
| 529 | + ); |
|
| 530 | 530 | // If there are meetings with recordings load the data to the table. |
| 531 | 531 | if ($bbbsession['bigbluebuttonbn']->recordings_html) { |
| 532 | 532 | // Render a plain html table. |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | $jsvars += array( |
| 537 | 537 | 'columns' => bigbluebuttonbn_get_recording_columns($bbbsession), |
| 538 | 538 | 'data' => bigbluebuttonbn_get_recording_data($bbbsession, $recordings), |
| 539 | - ); |
|
| 539 | + ); |
|
| 540 | 540 | // Render a YUI table. |
| 541 | 541 | return html_writer::div('', '', array('id' => 'bigbluebuttonbn_yui_table')); |
| 542 | 542 | } |
@@ -556,10 +556,10 @@ discard block |
||
| 556 | 556 | } |
| 557 | 557 | $button = html_writer::tag('input', '', |
| 558 | 558 | array('type' => 'button', |
| 559 | - 'value' => get_string('view_recording_button_import', 'bigbluebuttonbn'), |
|
| 560 | - 'class' => 'btn btn-secondary', |
|
| 561 | - 'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/import_view.php?bn='. |
|
| 562 | - $bbbsession['bigbluebuttonbn']->id.'\'')); |
|
| 559 | + 'value' => get_string('view_recording_button_import', 'bigbluebuttonbn'), |
|
| 560 | + 'class' => 'btn btn-secondary', |
|
| 561 | + 'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/import_view.php?bn='. |
|
| 562 | + $bbbsession['bigbluebuttonbn']->id.'\'')); |
|
| 563 | 563 | $output = html_writer::start_tag('br'); |
| 564 | 564 | $output .= html_writer::tag('span', $button, array('id' => 'import_recording_links_button')); |
| 565 | 565 | $output .= html_writer::tag('span', '', array('id' => 'import_recording_links_table')); |
@@ -119,9 +119,9 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | function bigbluebuttonbn_get_join_url($meetingid, $username, $pw, $logouturl, $configtoken = null, $userid = null) { |
| 121 | 121 | $data = ['meetingID' => $meetingid, |
| 122 | - 'fullName' => $username, |
|
| 123 | - 'password' => $pw, |
|
| 124 | - 'logoutURL' => $logouturl, |
|
| 122 | + 'fullName' => $username, |
|
| 123 | + 'password' => $pw, |
|
| 124 | + 'logoutURL' => $logouturl, |
|
| 125 | 125 | ]; |
| 126 | 126 | if (!is_null($configtoken)) { |
| 127 | 127 | $data['configToken'] = $configtoken; |
@@ -173,23 +173,23 @@ discard block |
||
| 173 | 173 | function bigbluebuttonbn_get_meeting_info_array($meetingid) { |
| 174 | 174 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 175 | 175 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 176 | - ); |
|
| 176 | + ); |
|
| 177 | 177 | if ($xml && $xml->returncode == 'SUCCESS' && empty($xml->messageKey)) { |
| 178 | 178 | // Meeting info was returned. |
| 179 | 179 | return array('returncode' => $xml->returncode, |
| 180 | - 'meetingID' => $xml->meetingID, |
|
| 181 | - 'moderatorPW' => $xml->moderatorPW, |
|
| 182 | - 'attendeePW' => $xml->attendeePW, |
|
| 183 | - 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 184 | - 'running' => $xml->running, |
|
| 185 | - 'recording' => $xml->recording, |
|
| 186 | - 'startTime' => $xml->startTime, |
|
| 187 | - 'endTime' => $xml->endTime, |
|
| 188 | - 'participantCount' => $xml->participantCount, |
|
| 189 | - 'moderatorCount' => $xml->moderatorCount, |
|
| 190 | - 'attendees' => $xml->attendees, |
|
| 191 | - 'metadata' => $xml->metadata, |
|
| 192 | - ); |
|
| 180 | + 'meetingID' => $xml->meetingID, |
|
| 181 | + 'moderatorPW' => $xml->moderatorPW, |
|
| 182 | + 'attendeePW' => $xml->attendeePW, |
|
| 183 | + 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 184 | + 'running' => $xml->running, |
|
| 185 | + 'recording' => $xml->recording, |
|
| 186 | + 'startTime' => $xml->startTime, |
|
| 187 | + 'endTime' => $xml->endTime, |
|
| 188 | + 'participantCount' => $xml->participantCount, |
|
| 189 | + 'moderatorCount' => $xml->moderatorCount, |
|
| 190 | + 'attendees' => $xml->attendees, |
|
| 191 | + 'metadata' => $xml->metadata, |
|
| 192 | + ); |
|
| 193 | 193 | } |
| 194 | 194 | if ($xml) { |
| 195 | 195 | // Either failure or success without meeting info. |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | function bigbluebuttonbn_get_default_config_xml() { |
| 326 | 326 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 327 | 327 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getDefaultConfigXML') |
| 328 | - ); |
|
| 328 | + ); |
|
| 329 | 329 | return $xml; |
| 330 | 330 | } |
| 331 | 331 | |
@@ -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('deleteRecordings', ['recordID' => $id]) |
| 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('publishRecordings', ['recordID' => $id, 'publish' => $publish]) |
| 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('updateRecordings', ['recordID' => $id] + (array) $params) |
| 456 | - ); |
|
| 456 | + ); |
|
| 457 | 457 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 458 | 458 | return false; |
| 459 | 459 | } |
@@ -470,7 +470,7 @@ discard block |
||
| 470 | 470 | function bigbluebuttonbn_end_meeting($meetingid, $modpw) { |
| 471 | 471 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 472 | 472 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('end', ['meetingID' => $meetingid, 'password' => $modpw]) |
| 473 | - ); |
|
| 473 | + ); |
|
| 474 | 474 | if ($xml) { |
| 475 | 475 | // If the xml packet returned failure it displays the message to the user. |
| 476 | 476 | return array('returncode' => $xml->returncode, 'message' => $xml->message, 'messageKey' => $xml->messageKey); |
@@ -490,7 +490,7 @@ discard block |
||
| 490 | 490 | */ |
| 491 | 491 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 492 | 492 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 493 | - ); |
|
| 493 | + ); |
|
| 494 | 494 | return ($xml && $xml->returncode == 'SUCCESS'); |
| 495 | 495 | } |
| 496 | 496 | |
@@ -502,7 +502,7 @@ discard block |
||
| 502 | 502 | function bigbluebuttonbn_get_server_version() { |
| 503 | 503 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 504 | 504 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url() |
| 505 | - ); |
|
| 505 | + ); |
|
| 506 | 506 | if ($xml && $xml->returncode == 'SUCCESS') { |
| 507 | 507 | return $xml->version; |
| 508 | 508 | } |
@@ -570,10 +570,10 @@ discard block |
||
| 570 | 570 | |
| 571 | 571 | $options = array(); |
| 572 | 572 | $options['CURLOPT_HTTPHEADER'] = array( |
| 573 | - 'Content-Type: '.$contenttype, |
|
| 574 | - 'Content-Length: '.strlen($data), |
|
| 575 | - 'Content-Language: en-US', |
|
| 576 | - ); |
|
| 573 | + 'Content-Type: '.$contenttype, |
|
| 574 | + 'Content-Length: '.strlen($data), |
|
| 575 | + 'Content-Language: en-US', |
|
| 576 | + ); |
|
| 577 | 577 | |
| 578 | 578 | return $c->post($url, $data, $options); |
| 579 | 579 | } |
@@ -716,16 +716,16 @@ discard block |
||
| 716 | 716 | 'all' => array( |
| 717 | 717 | 'name' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 718 | 718 | 'children' => [] |
| 719 | - ) |
|
| 720 | - ); |
|
| 719 | + ) |
|
| 720 | + ); |
|
| 721 | 721 | $data['role'] = array( |
| 722 | 722 | 'name' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 723 | 723 | 'children' => bigbluebuttonbn_get_roles_select($context) |
| 724 | - ); |
|
| 724 | + ); |
|
| 725 | 725 | $data['user'] = array( |
| 726 | 726 | 'name' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 727 | 727 | 'children' => bigbluebuttonbn_get_users_select($context) |
| 728 | - ); |
|
| 728 | + ); |
|
| 729 | 729 | return $data; |
| 730 | 730 | } |
| 731 | 731 | |
@@ -770,9 +770,9 @@ discard block |
||
| 770 | 770 | continue; |
| 771 | 771 | } |
| 772 | 772 | $participantlistarray[] = array( |
| 773 | - 'selectiontype' => 'role', |
|
| 774 | - 'selectionid' => $moderatordefault, |
|
| 775 | - 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 773 | + 'selectiontype' => 'role', |
|
| 774 | + 'selectionid' => $moderatordefault, |
|
| 775 | + 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 776 | 776 | } |
| 777 | 777 | return $participantlistarray; |
| 778 | 778 | } |
@@ -815,11 +815,11 @@ discard block |
||
| 815 | 815 | 'all' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 816 | 816 | 'role' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 817 | 817 | 'user' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 818 | - ], |
|
| 818 | + ], |
|
| 819 | 819 | 'type_selected' => 'all', |
| 820 | 820 | 'options' => ['all' => '---------------'], |
| 821 | 821 | 'selected' => 'all', |
| 822 | - ]; |
|
| 822 | + ]; |
|
| 823 | 823 | } |
| 824 | 824 | |
| 825 | 825 | /** |
@@ -1096,7 +1096,7 @@ discard block |
||
| 1096 | 1096 | $eventproperties['other'] = $options['other']; |
| 1097 | 1097 | } |
| 1098 | 1098 | $event = call_user_func_array('\mod_bigbluebuttonbn\event\bigbluebuttonbn_'.$eventtype.'::create', |
| 1099 | - array($eventproperties)); |
|
| 1099 | + array($eventproperties)); |
|
| 1100 | 1100 | $event->trigger(); |
| 1101 | 1101 | } |
| 1102 | 1102 | |
@@ -1140,7 +1140,7 @@ discard block |
||
| 1140 | 1140 | // Ping again and refresh the cache. |
| 1141 | 1141 | $meetinginfo = (array) bigbluebuttonbn_wrap_xml_load_file( |
| 1142 | 1142 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 1143 | - ); |
|
| 1143 | + ); |
|
| 1144 | 1144 | $cache->set($meetingid, array('creation_time' => time(), 'meeting_info' => json_encode($meetinginfo))); |
| 1145 | 1145 | return $meetinginfo; |
| 1146 | 1146 | } |
@@ -1510,8 +1510,8 @@ discard block |
||
| 1510 | 1510 | } |
| 1511 | 1511 | $id = 'playbacks-'.$recording['recordID']; |
| 1512 | 1512 | $recordingtypes = html_writer::start_tag('div', array('id' => $id, 'data-imported' => $dataimported, |
| 1513 | - 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
| 1514 | - 'title' => $title, $visibility => $visibility)); |
|
| 1513 | + 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
| 1514 | + 'title' => $title, $visibility => $visibility)); |
|
| 1515 | 1515 | foreach ($recording['playbacks'] as $playback) { |
| 1516 | 1516 | $recordingtypes .= bigbluebuttonbn_get_recording_data_row_type($recording, $bigbluebuttonbnid, $playback).' '; |
| 1517 | 1517 | } |
@@ -1533,7 +1533,7 @@ discard block |
||
| 1533 | 1533 | $title = get_string('view_recording_format_'.$playback['type'], 'bigbluebuttonbn'); |
| 1534 | 1534 | $onclick = 'M.mod_bigbluebuttonbn.recordings.recordingPlay(this);'; |
| 1535 | 1535 | $href = $CFG->wwwroot.'/mod/bigbluebuttonbn/bbb_view.php?action=play&bn='.$bigbluebuttonbnid. |
| 1536 | - '&mid='.$recording['meetingID'].'&rid='.$recording['recordID'].'&rtype='.$playback['type']; |
|
| 1536 | + '&mid='.$recording['meetingID'].'&rid='.$recording['recordID'].'&rtype='.$playback['type']; |
|
| 1537 | 1537 | if (!isset($recording['imported']) || !isset($recording['protected']) || $recording['protected'] === 'false') { |
| 1538 | 1538 | $href .= '&href='.urlencode(trim($playback['url'])); |
| 1539 | 1539 | } |
@@ -1545,7 +1545,7 @@ discard block |
||
| 1545 | 1545 | 'data-target' => $playback['type'], |
| 1546 | 1546 | 'data-href' => $href, |
| 1547 | 1547 | 'class' => 'btn btn-sm btn-default' |
| 1548 | - ); |
|
| 1548 | + ); |
|
| 1549 | 1549 | return $OUTPUT->action_link('#', $title, null, $linkattributes); |
| 1550 | 1550 | } |
| 1551 | 1551 | |
@@ -1659,10 +1659,10 @@ discard block |
||
| 1659 | 1659 | 'id' => $id, |
| 1660 | 1660 | 'onclick' => $onclick, |
| 1661 | 1661 | 'data-action' => $data['action'] |
| 1662 | - ); |
|
| 1662 | + ); |
|
| 1663 | 1663 | if (!isset($recording['imported'])) { |
| 1664 | 1664 | $linkattributes['data-links'] = bigbluebuttonbn_count_recording_imported_instances( |
| 1665 | - $recording['recordID']); |
|
| 1665 | + $recording['recordID']); |
|
| 1666 | 1666 | } |
| 1667 | 1667 | if (isset($data['disabled'])) { |
| 1668 | 1668 | $iconattributes['class'] .= ' fa-' . $data['disabled']; |
@@ -2200,8 +2200,8 @@ discard block |
||
| 2200 | 2200 | $activitytime = ''; |
| 2201 | 2201 | if ($time) { |
| 2202 | 2202 | $activitytime = calendar_day_representation($time).' '. |
| 2203 | - get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2204 | - calendar_time_representation($time); |
|
| 2203 | + get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2204 | + calendar_time_representation($time); |
|
| 2205 | 2205 | } |
| 2206 | 2206 | return $activitytime; |
| 2207 | 2207 | } |
@@ -2486,7 +2486,7 @@ discard block |
||
| 2486 | 2486 | $renderer->render_group_element('participant_moderator_default', |
| 2487 | 2487 | $renderer->render_group_element_configmultiselect('participant_moderator_default', |
| 2488 | 2488 | array_keys($owner), array_merge($owner, $roles)) |
| 2489 | - ); |
|
| 2489 | + ); |
|
| 2490 | 2490 | } |
| 2491 | 2491 | } |
| 2492 | 2492 | |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | * recordings from a different activity even from a different course. |
| 99 | 99 | **/ |
| 100 | 100 | |
| 101 | - /* |
|
| 101 | + /* |
|
| 102 | 102 | * When the value is set to 1 (checked) the bigbluebuttonbn rooms or |
| 103 | 103 | * activities will have the 'import recordings' capability enabled. |
| 104 | 104 | * $CFG->bigbluebuttonbn['importrecordings_enabled'] = 0; |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | * 'Join session' button enabled |
| 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 'wait for moderator' capability enabled by |
| 125 | 125 | * default. |
@@ -298,27 +298,27 @@ discard block |
||
| 298 | 298 | * $CFG->bigbluebuttonbn['general_warning_message'] = "Would you like to record your BigBlueButton sessions for later viewing? "; |
| 299 | 299 | */ |
| 300 | 300 | |
| 301 | - /* |
|
| 301 | + /* |
|
| 302 | 302 | * The warning box is always shown to administrators, but it is also possible to define other roles |
| 303 | 303 | * to whom the it will be shown. The roles are based on the shortnames defined by Moodle: |
| 304 | 304 | * 'manager,coursecreator,editingteacher,teacher,student,guest,user,frontpage' |
| 305 | 305 | * $CFG->bigbluebuttonbn['general_warning_roles'] = 'editingteacher,teacher'; |
| 306 | 306 | */ |
| 307 | 307 | |
| 308 | - /* |
|
| 308 | + /* |
|
| 309 | 309 | * As the general_warning_message is shown in a box, its type can be defined with general_warning_type |
| 310 | 310 | * The default type is 'info' which is normaly rendered in blue when using a bootstrap theme. |
| 311 | 311 | * All the modifiers for boxed in bootstrap can be used [info|success|warning|danger]. |
| 312 | 312 | * $CFG->bigbluebuttonbn['general_warning_box_type'] = 'info'; |
| 313 | 313 | */ |
| 314 | 314 | |
| 315 | - /* |
|
| 315 | + /* |
|
| 316 | 316 | * Additionally, when general_warning_button_href value is different than "", a button |
| 317 | 317 | * can also be shown right after the message. |
| 318 | 318 | * $CFG->bigbluebuttonbn['general_warning_button_href'] = "http://blindsidenetworks.com/"; |
| 319 | 319 | */ |
| 320 | 320 | |
| 321 | - /* |
|
| 321 | + /* |
|
| 322 | 322 | * Finally, the text and class for the button can be modified |
| 323 | 323 | * $CFG->bigbluebuttonbn['general_warning_button_text'] = "Upgrade your site"; |
| 324 | 324 | * $CFG->bigbluebuttonbn['general_warning_button_class'] = "btn btn-primary"; |