@@ -309,8 +309,8 @@ discard block |
||
| 309 | 309 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
| 310 | 310 | $field['description_key'], 0, ['maxlength' => 4, 'size' => 6], |
| 311 | 311 | ['message' => get_string('mod_form_field_voicebridge_format_error', 'bigbluebuttonbn'), |
| 312 | - 'type' => 'numeric', 'rule' => '####', 'validator' => 'server'] |
|
| 313 | - ); |
|
| 312 | + 'type' => 'numeric', 'rule' => '####', 'validator' => 'server'] |
|
| 313 | + ); |
|
| 314 | 314 | } else { |
| 315 | 315 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
| 316 | 316 | $field['description_key'], 0, ['maxlength' => 4, 'size' => 6]); |
@@ -380,7 +380,7 @@ discard block |
||
| 380 | 380 | private function bigbluebuttonbn_mform_add_block_room_recordings(&$mform, $cfg) { |
| 381 | 381 | $recordingsettings = false; |
| 382 | 382 | $field = ['type' => 'hidden', 'name' => 'recordings_html', 'data_type' => PARAM_INT, |
| 383 | - 'description_key' => null]; |
|
| 383 | + 'description_key' => null]; |
|
| 384 | 384 | if ($cfg['recordings_html_editable']) { |
| 385 | 385 | $field['type'] = 'checkbox'; |
| 386 | 386 | $field['description_key'] = 'mod_form_field_recordings_html'; |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
| 390 | 390 | $field['description_key'], $cfg['recordings_html_default']); |
| 391 | 391 | $field = ['type' => 'hidden', 'name' => 'recordings_deleted', 'data_type' => PARAM_INT, |
| 392 | - 'description_key' => null]; |
|
| 392 | + 'description_key' => null]; |
|
| 393 | 393 | if ($cfg['recordings_deleted_editable']) { |
| 394 | 394 | $field['type'] = 'checkbox'; |
| 395 | 395 | $field['description_key'] = 'mod_form_field_recordings_deleted'; |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
| 399 | 399 | $field['description_key'], $cfg['recordings_deleted_default']); |
| 400 | 400 | $field = ['type' => 'hidden', 'name' => 'recordings_imported', 'data_type' => PARAM_INT, |
| 401 | - 'description_key' => null]; |
|
| 401 | + 'description_key' => null]; |
|
| 402 | 402 | if ($cfg['importrecordings_enabled'] && $cfg['recordings_imported_editable']) { |
| 403 | 403 | $field['type'] = 'checkbox'; |
| 404 | 404 | $field['description_key'] = 'mod_form_field_recordings_imported'; |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
| 408 | 408 | $field['description_key'], $cfg['recordings_imported_default']); |
| 409 | 409 | $field = ['type' => 'hidden', 'name' => 'recordings_preview', 'data_type' => PARAM_INT, |
| 410 | - 'description_key' => null]; |
|
| 410 | + 'description_key' => null]; |
|
| 411 | 411 | if ($cfg['recordings_preview_editable']) { |
| 412 | 412 | $field['type'] = 'checkbox'; |
| 413 | 413 | $field['description_key'] = 'mod_form_field_recordings_preview'; |
@@ -484,7 +484,7 @@ discard block |
||
| 484 | 484 | $htmlselectiontype = html_writer::select($participantselection['type_options'], |
| 485 | 485 | 'bigbluebuttonbn_participant_selection_type', $participantselection['type_selected'], array(), |
| 486 | 486 | array('id' => 'bigbluebuttonbn_participant_selection_type', |
| 487 | - 'onchange' => 'M.mod_bigbluebuttonbn.modform.participantSelectionSet(); return 0;')); |
|
| 487 | + 'onchange' => 'M.mod_bigbluebuttonbn.modform.participantSelectionSet(); return 0;')); |
|
| 488 | 488 | $htmlselectionoptions = html_writer::select($participantselection['options'], 'bigbluebuttonbn_participant_selection', |
| 489 | 489 | $participantselection['selected'], array(), |
| 490 | 490 | array('id' => 'bigbluebuttonbn_participant_selection', 'disabled' => 'disabled')); |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | 'type' => 'button', 'class' => 'btn btn-secondary', |
| 493 | 493 | 'value' => get_string('mod_form_field_participant_list_action_add', 'bigbluebuttonbn'), |
| 494 | 494 | 'onclick' => 'M.mod_bigbluebuttonbn.modform.participantAdd(); return 0;' |
| 495 | - )); |
|
| 495 | + )); |
|
| 496 | 496 | $htmladdparticipant = html_writer::tag('div', |
| 497 | 497 | $htmlselectiontype . ' ' . $htmlselectionoptions . ' ' . $htmlselectioninput, null); |
| 498 | 498 | $mform->addElement('html', "\n\n"); |
@@ -534,9 +534,9 @@ discard block |
||
| 534 | 534 | $field['type'] = 'select'; |
| 535 | 535 | $field['data_type'] = PARAM_TEXT; |
| 536 | 536 | $field['description_key'] = 'mod_form_field_block_clienttype'; |
| 537 | - $choices = array(BIGBLUEBUTTON_CLIENTTYPE_FLASH => get_string('mod_form_block_clienttype_flash', 'bigbluebuttonbn'), |
|
| 538 | - BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
| 539 | - $mform->addElement('header', 'clienttypeselection', get_string('mod_form_block_clienttype', 'bigbluebuttonbn')); |
|
| 537 | + $choices = array(BIGBLUEBUTTON_CLIENTTYPE_FLASH => get_string('mod_form_block_clienttype_flash', 'bigbluebuttonbn'), |
|
| 538 | + BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
| 539 | + $mform->addElement('header', 'clienttypeselection', get_string('mod_form_block_clienttype', 'bigbluebuttonbn')); |
|
| 540 | 540 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
| 541 | 541 | $field['description_key'], $cfg['clienttype_default'], $choices); |
| 542 | 542 | return; |
@@ -59,11 +59,11 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | public static function _get_metadata(collection $collection) { |
| 61 | 61 | |
| 62 | - // The table bigbluebuttonbn stores only the room properties. |
|
| 63 | - // However, there is a chance that some personal information is stored as metadata. |
|
| 64 | - // This would be done in the column 'participants' where rules can be set to define BBB roles. |
|
| 65 | - // It is fair to say that only the userid is stored, which is useless if user is removed. |
|
| 66 | - // But if this is a concern a refactoring on the way the rules are stored will be required. |
|
| 62 | + // The table bigbluebuttonbn stores only the room properties. |
|
| 63 | + // However, there is a chance that some personal information is stored as metadata. |
|
| 64 | + // This would be done in the column 'participants' where rules can be set to define BBB roles. |
|
| 65 | + // It is fair to say that only the userid is stored, which is useless if user is removed. |
|
| 66 | + // But if this is a concern a refactoring on the way the rules are stored will be required. |
|
| 67 | 67 | $collection->add_database_table('bigbluebuttonbn', [ |
| 68 | 68 | 'participants' => 'privacy:metadata:bigbluebuttonbn:participants', |
| 69 | 69 | ], 'privacy:metadata:bigbluebuttonbn'); |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | 'meetingid' => $record->meetingid, |
| 208 | 208 | 'log' => $record->log, |
| 209 | 209 | 'meta' => $record->meta, |
| 210 | - ]; |
|
| 210 | + ]; |
|
| 211 | 211 | return $carry; |
| 212 | 212 | }, |
| 213 | 213 | function($instanceid, $data) use ($user, $instanceidstocmids) { |
@@ -83,7 +83,7 @@ |
||
| 83 | 83 | 'objectid' => $this->objectid, |
| 84 | 84 | 'contextinstanceid' => $this->contextinstanceid, |
| 85 | 85 | 'other' => $this->other |
| 86 | - ); |
|
| 86 | + ); |
|
| 87 | 87 | $string = $this->description; |
| 88 | 88 | foreach ($vars as $key => $value) { |
| 89 | 89 | $string = str_replace("##" . $key, $value, $string); |
@@ -309,10 +309,10 @@ discard block |
||
| 309 | 309 | */ |
| 310 | 310 | function bigbluebutton_bbb_view_create_meeting_data(&$bbbsession) { |
| 311 | 311 | $data = ['meetingID' => $bbbsession['meetingid'], |
| 312 | - 'name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
| 313 | - 'attendeePW' => $bbbsession['viewerPW'], |
|
| 314 | - 'moderatorPW' => $bbbsession['modPW'], |
|
| 315 | - 'logoutURL' => $bbbsession['logoutURL'], |
|
| 312 | + 'name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
| 313 | + 'attendeePW' => $bbbsession['viewerPW'], |
|
| 314 | + 'moderatorPW' => $bbbsession['modPW'], |
|
| 315 | + 'logoutURL' => $bbbsession['logoutURL'], |
|
| 316 | 316 | ]; |
| 317 | 317 | $data['record'] = bigbluebutton_bbb_view_create_meeting_data_record($bbbsession['record']); |
| 318 | 318 | // Check if auto_start_record is enable. |
@@ -334,7 +334,7 @@ discard block |
||
| 334 | 334 | '%duration%', |
| 335 | 335 | (string) $durationtime, |
| 336 | 336 | get_string('bbbdurationwarning', 'bigbluebuttonbn') |
| 337 | - ); |
|
| 337 | + ); |
|
| 338 | 338 | } |
| 339 | 339 | $voicebridge = intval($bbbsession['voicebridge']); |
| 340 | 340 | if ($voicebridge > 0 && $voicebridge < 79999) { |
@@ -385,22 +385,22 @@ discard block |
||
| 385 | 385 | function bigbluebutton_bbb_view_create_meeting_metadata(&$bbbsession) { |
| 386 | 386 | global $USER; |
| 387 | 387 | $metadata = ['bbb-origin' => $bbbsession['origin'], |
| 388 | - 'bbb-origin-version' => $bbbsession['originVersion'], |
|
| 389 | - 'bbb-origin-server-name' => $bbbsession['originServerName'], |
|
| 390 | - 'bbb-origin-server-common-name' => $bbbsession['originServerCommonName'], |
|
| 391 | - 'bbb-origin-tag' => $bbbsession['originTag'], |
|
| 392 | - 'bbb-context' => $bbbsession['course']->fullname, |
|
| 393 | - 'bbb-recording-name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
| 394 | - 'bbb-recording-description' => bigbluebuttonbn_html2text($bbbsession['meetingdescription'], 64), |
|
| 395 | - 'bbb-recording-tags' => bigbluebuttonbn_get_tags($bbbsession['cm']->id), // Same as $id. |
|
| 388 | + 'bbb-origin-version' => $bbbsession['originVersion'], |
|
| 389 | + 'bbb-origin-server-name' => $bbbsession['originServerName'], |
|
| 390 | + 'bbb-origin-server-common-name' => $bbbsession['originServerCommonName'], |
|
| 391 | + 'bbb-origin-tag' => $bbbsession['originTag'], |
|
| 392 | + 'bbb-context' => $bbbsession['course']->fullname, |
|
| 393 | + 'bbb-recording-name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
| 394 | + 'bbb-recording-description' => bigbluebuttonbn_html2text($bbbsession['meetingdescription'], 64), |
|
| 395 | + 'bbb-recording-tags' => bigbluebuttonbn_get_tags($bbbsession['cm']->id), // Same as $id. |
|
| 396 | 396 | ]; |
| 397 | 397 | if ((boolean)\mod_bigbluebuttonbn\locallib\config::get('recordingstatus_enabled')) { |
| 398 | 398 | $metadata["bn-recording-status"] = json_encode( |
| 399 | 399 | array( |
| 400 | 400 | 'email' => array('"' . fullname($USER) . '" <' . $USER->email . '>'), |
| 401 | 401 | 'context' => $bbbsession['bigbluebuttonbnURL'] |
| 402 | - ) |
|
| 403 | - ); |
|
| 402 | + ) |
|
| 403 | + ); |
|
| 404 | 404 | } |
| 405 | 405 | if ((boolean)\mod_bigbluebuttonbn\locallib\config::get('recordingready_enabled')) { |
| 406 | 406 | $metadata['bn-recording-ready-url'] = $bbbsession['recordingReadyURL']; |
@@ -172,43 +172,43 @@ |
||
| 172 | 172 | */ |
| 173 | 173 | public static function get_options() { |
| 174 | 174 | return array( |
| 175 | - 'version_major' => self::get_moodle_version_major(), |
|
| 176 | - 'voicebridge_editable' => self::get('voicebridge_editable'), |
|
| 177 | - 'importrecordings_enabled' => self::get('importrecordings_enabled'), |
|
| 178 | - 'importrecordings_from_deleted_enabled' => self::get('importrecordings_from_deleted_enabled'), |
|
| 179 | - 'waitformoderator_default' => self::get('waitformoderator_default'), |
|
| 180 | - 'waitformoderator_editable' => self::get('waitformoderator_editable'), |
|
| 181 | - 'userlimit_default' => self::get('userlimit_default'), |
|
| 182 | - 'userlimit_editable' => self::get('userlimit_editable'), |
|
| 183 | - 'preuploadpresentation_enabled' => self::get('preuploadpresentation_enabled'), |
|
| 184 | - 'sendnotifications_enabled' => self::get('sendnotifications_enabled'), |
|
| 185 | - 'recordings_enabled' => self::get('recordings_enabled'), |
|
| 186 | - 'recordings_html_default' => self::get('recordings_html_default'), |
|
| 187 | - 'recordings_html_editable' => self::get('recordings_html_editable'), |
|
| 188 | - 'recordings_deleted_default' => self::get('recordings_deleted_default'), |
|
| 189 | - 'recordings_deleted_editable' => self::get('recordings_deleted_editable'), |
|
| 190 | - 'recordings_imported_default' => self::get('recordings_imported_default'), |
|
| 191 | - 'recordings_imported_editable' => self::get('recordings_imported_editable'), |
|
| 192 | - 'recordings_preview_default' => self::get('recordings_preview_default'), |
|
| 193 | - 'recordings_preview_editable' => self::get('recordings_preview_editable'), |
|
| 194 | - 'recordings_validate_url' => self::get('recordings_validate_url'), |
|
| 195 | - 'recording_default' => self::get('recording_default'), |
|
| 196 | - 'recording_editable' => self::get('recording_editable'), |
|
| 197 | - 'recording_icons_enabled' => self::get('recording_icons_enabled'), |
|
| 198 | - 'recording_all_from_start_default' => self::get('recording_all_from_start_default'), |
|
| 199 | - 'recording_all_from_start_editable' => self::get('recording_all_from_start_editable'), |
|
| 200 | - 'recording_hide_button_default' => self::get('recording_hide_button_default'), |
|
| 201 | - 'recording_hide_button_editable' => self::get('recording_hide_button_editable'), |
|
| 202 | - 'general_warning_message' => self::get('general_warning_message'), |
|
| 203 | - 'general_warning_box_type' => self::get('general_warning_box_type'), |
|
| 204 | - 'general_warning_button_text' => self::get('general_warning_button_text'), |
|
| 205 | - 'general_warning_button_href' => self::get('general_warning_button_href'), |
|
| 206 | - 'general_warning_button_class' => self::get('general_warning_button_class'), |
|
| 207 | - 'clienttype_enabled' => self::get('clienttype_enabled'), |
|
| 208 | - 'clienttype_editable' => self::get('clienttype_editable'), |
|
| 209 | - 'clienttype_default' => self::get('clienttype_default'), |
|
| 210 | - 'muteonstart_editable' => self::get('muteonstart_editable'), |
|
| 211 | - 'muteonstart_default' => self::get('muteonstart_default'), |
|
| 212 | - ); |
|
| 175 | + 'version_major' => self::get_moodle_version_major(), |
|
| 176 | + 'voicebridge_editable' => self::get('voicebridge_editable'), |
|
| 177 | + 'importrecordings_enabled' => self::get('importrecordings_enabled'), |
|
| 178 | + 'importrecordings_from_deleted_enabled' => self::get('importrecordings_from_deleted_enabled'), |
|
| 179 | + 'waitformoderator_default' => self::get('waitformoderator_default'), |
|
| 180 | + 'waitformoderator_editable' => self::get('waitformoderator_editable'), |
|
| 181 | + 'userlimit_default' => self::get('userlimit_default'), |
|
| 182 | + 'userlimit_editable' => self::get('userlimit_editable'), |
|
| 183 | + 'preuploadpresentation_enabled' => self::get('preuploadpresentation_enabled'), |
|
| 184 | + 'sendnotifications_enabled' => self::get('sendnotifications_enabled'), |
|
| 185 | + 'recordings_enabled' => self::get('recordings_enabled'), |
|
| 186 | + 'recordings_html_default' => self::get('recordings_html_default'), |
|
| 187 | + 'recordings_html_editable' => self::get('recordings_html_editable'), |
|
| 188 | + 'recordings_deleted_default' => self::get('recordings_deleted_default'), |
|
| 189 | + 'recordings_deleted_editable' => self::get('recordings_deleted_editable'), |
|
| 190 | + 'recordings_imported_default' => self::get('recordings_imported_default'), |
|
| 191 | + 'recordings_imported_editable' => self::get('recordings_imported_editable'), |
|
| 192 | + 'recordings_preview_default' => self::get('recordings_preview_default'), |
|
| 193 | + 'recordings_preview_editable' => self::get('recordings_preview_editable'), |
|
| 194 | + 'recordings_validate_url' => self::get('recordings_validate_url'), |
|
| 195 | + 'recording_default' => self::get('recording_default'), |
|
| 196 | + 'recording_editable' => self::get('recording_editable'), |
|
| 197 | + 'recording_icons_enabled' => self::get('recording_icons_enabled'), |
|
| 198 | + 'recording_all_from_start_default' => self::get('recording_all_from_start_default'), |
|
| 199 | + 'recording_all_from_start_editable' => self::get('recording_all_from_start_editable'), |
|
| 200 | + 'recording_hide_button_default' => self::get('recording_hide_button_default'), |
|
| 201 | + 'recording_hide_button_editable' => self::get('recording_hide_button_editable'), |
|
| 202 | + 'general_warning_message' => self::get('general_warning_message'), |
|
| 203 | + 'general_warning_box_type' => self::get('general_warning_box_type'), |
|
| 204 | + 'general_warning_button_text' => self::get('general_warning_button_text'), |
|
| 205 | + 'general_warning_button_href' => self::get('general_warning_button_href'), |
|
| 206 | + 'general_warning_button_class' => self::get('general_warning_button_class'), |
|
| 207 | + 'clienttype_enabled' => self::get('clienttype_enabled'), |
|
| 208 | + 'clienttype_editable' => self::get('clienttype_editable'), |
|
| 209 | + 'clienttype_default' => self::get('clienttype_default'), |
|
| 210 | + 'muteonstart_editable' => self::get('muteonstart_editable'), |
|
| 211 | + 'muteonstart_default' => self::get('muteonstart_default'), |
|
| 212 | + ); |
|
| 213 | 213 | } |
| 214 | 214 | } |
@@ -92,7 +92,7 @@ |
||
| 92 | 92 | !isset($CFG->bigbluebuttonbn['recordings_preview_default']) || |
| 93 | 93 | !isset($CFG->bigbluebuttonbn['recordings_preview_editable']) || |
| 94 | 94 | !isset($CFG->bigbluebuttonbn['recordings_validate_url']) |
| 95 | - ); |
|
| 95 | + ); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | /** |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | * recordings from a different activity even from a different course. |
| 104 | 104 | **/ |
| 105 | 105 | |
| 106 | - /* |
|
| 106 | + /* |
|
| 107 | 107 | * When the value is set to 1 (checked) the bigbluebuttonbn rooms or |
| 108 | 108 | * activities will have the 'import recordings' capability enabled. |
| 109 | 109 | * $CFG->bigbluebuttonbn['importrecordings_enabled'] = 0; |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | * 'Join session' button enabled |
| 125 | 125 | **/ |
| 126 | 126 | |
| 127 | - /* |
|
| 127 | + /* |
|
| 128 | 128 | * When the value is set to 1 (checked) the bigbluebuttonbn rooms or |
| 129 | 129 | * activities will have the 'wait for moderator' capability enabled by |
| 130 | 130 | * default. |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | * $CFG->bigbluebuttonbn['recordings_preview_editable'] = 0; |
| 277 | 277 | */ |
| 278 | 278 | |
| 279 | - /* When the value is set to 1 (checked) the playback URLs will be validated |
|
| 279 | + /* When the value is set to 1 (checked) the playback URLs will be validated |
|
| 280 | 280 | * before the user access it. |
| 281 | 281 | * $CFG->bigbluebuttonbn['recordings_validate_url'] = 1; |
| 282 | 282 | */ |
@@ -366,27 +366,27 @@ discard block |
||
| 366 | 366 | * $CFG->bigbluebuttonbn['general_warning_message'] = "Would you like to record your BigBlueButton sessions for later viewing? "; |
| 367 | 367 | */ |
| 368 | 368 | |
| 369 | - /* |
|
| 369 | + /* |
|
| 370 | 370 | * The warning box is always shown to administrators, but it is also possible to define other roles |
| 371 | 371 | * to whom the it will be shown. The roles are based on the shortnames defined by Moodle: |
| 372 | 372 | * 'manager,coursecreator,editingteacher,teacher,student,guest,user,frontpage' |
| 373 | 373 | * $CFG->bigbluebuttonbn['general_warning_roles'] = 'editingteacher,teacher'; |
| 374 | 374 | */ |
| 375 | 375 | |
| 376 | - /* |
|
| 376 | + /* |
|
| 377 | 377 | * As the general_warning_message is shown in a box, its type can be defined with general_warning_type |
| 378 | 378 | * The default type is 'info' which is normaly rendered in blue when using a bootstrap theme. |
| 379 | 379 | * All the modifiers for boxed in bootstrap can be used [info|success|warning|danger]. |
| 380 | 380 | * $CFG->bigbluebuttonbn['general_warning_box_type'] = 'info'; |
| 381 | 381 | */ |
| 382 | 382 | |
| 383 | - /* |
|
| 383 | + /* |
|
| 384 | 384 | * Additionally, when general_warning_button_href value is different than "", a button |
| 385 | 385 | * can also be shown right after the message. |
| 386 | 386 | * $CFG->bigbluebuttonbn['general_warning_button_href'] = "http://blindsidenetworks.com/"; |
| 387 | 387 | */ |
| 388 | 388 | |
| 389 | - /* |
|
| 389 | + /* |
|
| 390 | 390 | * Finally, the text and class for the button can be modified |
| 391 | 391 | * $CFG->bigbluebuttonbn['general_warning_button_text'] = "Upgrade your site"; |
| 392 | 392 | * $CFG->bigbluebuttonbn['general_warning_button_class'] = "btn btn-primary"; |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | $sql = "SELECT COUNT(*) FROM {bigbluebuttonbn_logs} "; |
| 272 | 272 | $sql .= "WHERE courseid = ? AND bigbluebuttonbnid = ? AND userid = ? AND (log = ? OR log = ?)"; |
| 273 | 273 | $result = $DB->count_records_sql($sql, array($course->id, $bigbluebuttonbn->id, $user->id, |
| 274 | - BIGBLUEBUTTONBN_LOG_EVENT_JOIN, BIGBLUEBUTTONBN_LOG_EVENT_PLAYED)); |
|
| 274 | + BIGBLUEBUTTONBN_LOG_EVENT_JOIN, BIGBLUEBUTTONBN_LOG_EVENT_PLAYED)); |
|
| 275 | 275 | return $result; |
| 276 | 276 | } |
| 277 | 277 | |
@@ -500,7 +500,7 @@ discard block |
||
| 500 | 500 | $str = '<div class="bigbluebuttonbn overview">'."\n"; |
| 501 | 501 | $str .= ' <div class="name">'.get_string('modulename', 'bigbluebuttonbn').': '."\n"; |
| 502 | 502 | $str .= ' <a '.$classes.'href="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bigbluebuttonbn->coursemodule. |
| 503 | - '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
| 503 | + '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
| 504 | 504 | $str .= ' </div>'."\n"; |
| 505 | 505 | $str .= ' <div class="info">'.get_string($start, 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->openingtime). |
| 506 | 506 | '</div>'."\n"; |
@@ -717,7 +717,7 @@ discard block |
||
| 717 | 717 | $bigbluebuttonbn->coursemodule, |
| 718 | 718 | 'bigbluebuttonbn', |
| 719 | 719 | $bigbluebuttonbn->id, $bigbluebuttonbn->completionexpected |
| 720 | - ); |
|
| 720 | + ); |
|
| 721 | 721 | } |
| 722 | 722 | } |
| 723 | 723 | |
@@ -103,9 +103,9 @@ discard block |
||
| 103 | 103 | function bigbluebuttonbn_get_join_url($meetingid, $username, $pw, $logouturl, $configtoken = null, |
| 104 | 104 | $userid = null, $clienttype = BIGBLUEBUTTON_CLIENTTYPE_FLASH) { |
| 105 | 105 | $data = ['meetingID' => $meetingid, |
| 106 | - 'fullName' => $username, |
|
| 107 | - 'password' => $pw, |
|
| 108 | - 'logoutURL' => $logouturl, |
|
| 106 | + 'fullName' => $username, |
|
| 107 | + 'password' => $pw, |
|
| 108 | + 'logoutURL' => $logouturl, |
|
| 109 | 109 | ]; |
| 110 | 110 | // Choose between Adobe Flash or HTML5 Client. |
| 111 | 111 | if ( $clienttype == BIGBLUEBUTTON_CLIENTTYPE_HTML5 ) { |
@@ -161,23 +161,23 @@ discard block |
||
| 161 | 161 | function bigbluebuttonbn_get_meeting_info_array($meetingid) { |
| 162 | 162 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 163 | 163 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 164 | - ); |
|
| 164 | + ); |
|
| 165 | 165 | if ($xml && $xml->returncode == 'SUCCESS' && empty($xml->messageKey)) { |
| 166 | 166 | // Meeting info was returned. |
| 167 | 167 | return array('returncode' => $xml->returncode, |
| 168 | - 'meetingID' => $xml->meetingID, |
|
| 169 | - 'moderatorPW' => $xml->moderatorPW, |
|
| 170 | - 'attendeePW' => $xml->attendeePW, |
|
| 171 | - 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 172 | - 'running' => $xml->running, |
|
| 173 | - 'recording' => $xml->recording, |
|
| 174 | - 'startTime' => $xml->startTime, |
|
| 175 | - 'endTime' => $xml->endTime, |
|
| 176 | - 'participantCount' => $xml->participantCount, |
|
| 177 | - 'moderatorCount' => $xml->moderatorCount, |
|
| 178 | - 'attendees' => $xml->attendees, |
|
| 179 | - 'metadata' => $xml->metadata, |
|
| 180 | - ); |
|
| 168 | + 'meetingID' => $xml->meetingID, |
|
| 169 | + 'moderatorPW' => $xml->moderatorPW, |
|
| 170 | + 'attendeePW' => $xml->attendeePW, |
|
| 171 | + 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 172 | + 'running' => $xml->running, |
|
| 173 | + 'recording' => $xml->recording, |
|
| 174 | + 'startTime' => $xml->startTime, |
|
| 175 | + 'endTime' => $xml->endTime, |
|
| 176 | + 'participantCount' => $xml->participantCount, |
|
| 177 | + 'moderatorCount' => $xml->moderatorCount, |
|
| 178 | + 'attendees' => $xml->attendees, |
|
| 179 | + 'metadata' => $xml->metadata, |
|
| 180 | + ); |
|
| 181 | 181 | } |
| 182 | 182 | if ($xml) { |
| 183 | 183 | // Either failure or success without meeting info. |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | function bigbluebuttonbn_get_default_config_xml() { |
| 334 | 334 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 335 | 335 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getDefaultConfigXML') |
| 336 | - ); |
|
| 336 | + ); |
|
| 337 | 337 | return $xml; |
| 338 | 338 | } |
| 339 | 339 | |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | foreach ($ids as $id) { |
| 438 | 438 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 439 | 439 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('deleteRecordings', ['recordID' => $id]) |
| 440 | - ); |
|
| 440 | + ); |
|
| 441 | 441 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 442 | 442 | return false; |
| 443 | 443 | } |
@@ -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('publishRecordings', ['recordID' => $id, 'publish' => $publish]) |
| 459 | - ); |
|
| 459 | + ); |
|
| 460 | 460 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 461 | 461 | return false; |
| 462 | 462 | } |
@@ -475,7 +475,7 @@ discard block |
||
| 475 | 475 | foreach ($ids as $id) { |
| 476 | 476 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 477 | 477 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('updateRecordings', ['recordID' => $id] + (array) $params) |
| 478 | - ); |
|
| 478 | + ); |
|
| 479 | 479 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 480 | 480 | return false; |
| 481 | 481 | } |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | function bigbluebuttonbn_end_meeting($meetingid, $modpw) { |
| 493 | 493 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 494 | 494 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('end', ['meetingID' => $meetingid, 'password' => $modpw]) |
| 495 | - ); |
|
| 495 | + ); |
|
| 496 | 496 | if ($xml) { |
| 497 | 497 | // If the xml packet returned failure it displays the message to the user. |
| 498 | 498 | return array('returncode' => $xml->returncode, 'message' => $xml->message, 'messageKey' => $xml->messageKey); |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | function bigbluebuttonbn_get_server_version() { |
| 510 | 510 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 511 | 511 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url() |
| 512 | - ); |
|
| 512 | + ); |
|
| 513 | 513 | if ($xml && $xml->returncode == 'SUCCESS') { |
| 514 | 514 | return $xml->version; |
| 515 | 515 | } |
@@ -578,10 +578,10 @@ discard block |
||
| 578 | 578 | } |
| 579 | 579 | $options = array(); |
| 580 | 580 | $options['CURLOPT_HTTPHEADER'] = array( |
| 581 | - 'Content-Type: '.$contenttype, |
|
| 582 | - 'Content-Length: '.strlen($data), |
|
| 583 | - 'Content-Language: en-US', |
|
| 584 | - ); |
|
| 581 | + 'Content-Type: '.$contenttype, |
|
| 582 | + 'Content-Length: '.strlen($data), |
|
| 583 | + 'Content-Language: en-US', |
|
| 584 | + ); |
|
| 585 | 585 | |
| 586 | 586 | return $c->post($url, $data, $options); |
| 587 | 587 | } |
@@ -770,12 +770,12 @@ discard block |
||
| 770 | 770 | 'all' => array( |
| 771 | 771 | 'name' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 772 | 772 | 'children' => [] |
| 773 | - ) |
|
| 774 | - ); |
|
| 773 | + ) |
|
| 774 | + ); |
|
| 775 | 775 | $data['role'] = array( |
| 776 | 776 | 'name' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 777 | 777 | 'children' => bigbluebuttonbn_get_roles_select($context, true) |
| 778 | - ); |
|
| 778 | + ); |
|
| 779 | 779 | $data['user'] = array( |
| 780 | 780 | 'name' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 781 | 781 | 'children' => bigbluebuttonbn_get_users_select($context, $bbactivity), |
@@ -822,7 +822,7 @@ discard block |
||
| 822 | 822 | 'selectiontype' => 'all', |
| 823 | 823 | 'selectionid' => 'all', |
| 824 | 824 | 'role' => BIGBLUEBUTTONBN_ROLE_VIEWER |
| 825 | - ); |
|
| 825 | + ); |
|
| 826 | 826 | $defaultrules = explode(',', \mod_bigbluebuttonbn\locallib\config::get('participant_moderator_default')); |
| 827 | 827 | foreach ($defaultrules as $defaultrule) { |
| 828 | 828 | if ($defaultrule == '0') { |
@@ -835,9 +835,9 @@ discard block |
||
| 835 | 835 | continue; |
| 836 | 836 | } |
| 837 | 837 | $participantlist[] = array( |
| 838 | - 'selectiontype' => 'role', |
|
| 839 | - 'selectionid' => $defaultrule, |
|
| 840 | - 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 838 | + 'selectiontype' => 'role', |
|
| 839 | + 'selectionid' => $defaultrule, |
|
| 840 | + 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 841 | 841 | } |
| 842 | 842 | return $participantlist; |
| 843 | 843 | } |
@@ -876,11 +876,11 @@ discard block |
||
| 876 | 876 | 'all' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 877 | 877 | 'role' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 878 | 878 | 'user' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 879 | - ], |
|
| 879 | + ], |
|
| 880 | 880 | 'type_selected' => 'all', |
| 881 | 881 | 'options' => ['all' => '---------------'], |
| 882 | 882 | 'selected' => 'all', |
| 883 | - ]; |
|
| 883 | + ]; |
|
| 884 | 884 | } |
| 885 | 885 | |
| 886 | 886 | /** |
@@ -1199,7 +1199,7 @@ discard block |
||
| 1199 | 1199 | // Ping again and refresh the cache. |
| 1200 | 1200 | $meetinginfo = (array) bigbluebuttonbn_wrap_xml_load_file( |
| 1201 | 1201 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 1202 | - ); |
|
| 1202 | + ); |
|
| 1203 | 1203 | $cache->set($meetingid, array('creation_time' => time(), 'meeting_info' => json_encode($meetinginfo))); |
| 1204 | 1204 | return $meetinginfo; |
| 1205 | 1205 | } |
@@ -1612,8 +1612,8 @@ discard block |
||
| 1612 | 1612 | } |
| 1613 | 1613 | $id = 'playbacks-'.$recording['recordID']; |
| 1614 | 1614 | $recordingtypes = html_writer::start_tag('div', array('id' => $id, 'data-imported' => $dataimported, |
| 1615 | - 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
| 1616 | - 'title' => $title, $visibility => $visibility)); |
|
| 1615 | + 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
| 1616 | + 'title' => $title, $visibility => $visibility)); |
|
| 1617 | 1617 | foreach ($recording['playbacks'] as $playback) { |
| 1618 | 1618 | $recordingtypes .= bigbluebuttonbn_get_recording_data_row_type($recording, $bbbsession, $playback); |
| 1619 | 1619 | } |
@@ -1648,7 +1648,7 @@ discard block |
||
| 1648 | 1648 | 'data-action' => 'play', |
| 1649 | 1649 | 'data-target' => $playback['type'], |
| 1650 | 1650 | 'data-href' => $href, |
| 1651 | - ); |
|
| 1651 | + ); |
|
| 1652 | 1652 | if ($CFG->bigbluebuttonbn_recordings_validate_url && !bigbluebuttonbn_is_bn_server() |
| 1653 | 1653 | && !bigbluebuttonbn_is_valid_resource(trim($playback['url']))) { |
| 1654 | 1654 | $linkattributes['class'] = 'btn btn-sm btn-warning'; |
@@ -1831,10 +1831,10 @@ discard block |
||
| 1831 | 1831 | 'id' => $id, |
| 1832 | 1832 | 'onclick' => $onclick, |
| 1833 | 1833 | 'data-action' => $data['action'] |
| 1834 | - ); |
|
| 1834 | + ); |
|
| 1835 | 1835 | if (!isset($recording['imported'])) { |
| 1836 | 1836 | $linkattributes['data-links'] = bigbluebuttonbn_count_recording_imported_instances( |
| 1837 | - $recording['recordID']); |
|
| 1837 | + $recording['recordID']); |
|
| 1838 | 1838 | } |
| 1839 | 1839 | if (isset($data['disabled'])) { |
| 1840 | 1840 | $iconattributes['class'] .= ' fa-' . $data['disabled']; |
@@ -2353,17 +2353,17 @@ discard block |
||
| 2353 | 2353 | function bigbluebuttonbn_get_instance_type_profiles() { |
| 2354 | 2354 | $instanceprofiles = array( |
| 2355 | 2355 | BIGBLUEBUTTONBN_TYPE_ALL => array('id' => BIGBLUEBUTTONBN_TYPE_ALL, |
| 2356 | - 'name' => get_string('instance_type_default', 'bigbluebuttonbn'), |
|
| 2357 | - 'features' => array('all')), |
|
| 2356 | + 'name' => get_string('instance_type_default', 'bigbluebuttonbn'), |
|
| 2357 | + 'features' => array('all')), |
|
| 2358 | 2358 | BIGBLUEBUTTONBN_TYPE_ROOM_ONLY => array('id' => BIGBLUEBUTTONBN_TYPE_ROOM_ONLY, |
| 2359 | - 'name' => get_string('instance_type_room_only', 'bigbluebuttonbn'), |
|
| 2360 | - 'features' => array('showroom', 'welcomemessage', 'voicebridge', 'waitformoderator', 'userlimit', |
|
| 2361 | - 'recording', 'sendnotifications', 'preuploadpresentation', 'permissions', 'schedule', 'groups', |
|
| 2362 | - 'modstandardelshdr', 'availabilityconditionsheader', 'tagshdr', 'competenciessection', |
|
| 2363 | - 'clienttype', 'availabilityconditionsheader')), |
|
| 2359 | + 'name' => get_string('instance_type_room_only', 'bigbluebuttonbn'), |
|
| 2360 | + 'features' => array('showroom', 'welcomemessage', 'voicebridge', 'waitformoderator', 'userlimit', |
|
| 2361 | + 'recording', 'sendnotifications', 'preuploadpresentation', 'permissions', 'schedule', 'groups', |
|
| 2362 | + 'modstandardelshdr', 'availabilityconditionsheader', 'tagshdr', 'competenciessection', |
|
| 2363 | + 'clienttype', 'availabilityconditionsheader')), |
|
| 2364 | 2364 | BIGBLUEBUTTONBN_TYPE_RECORDING_ONLY => array('id' => BIGBLUEBUTTONBN_TYPE_RECORDING_ONLY, |
| 2365 | - 'name' => get_string('instance_type_recording_only', 'bigbluebuttonbn'), |
|
| 2366 | - 'features' => array('showrecordings', 'importrecordings', 'availabilityconditionsheader')) |
|
| 2365 | + 'name' => get_string('instance_type_recording_only', 'bigbluebuttonbn'), |
|
| 2366 | + 'features' => array('showrecordings', 'importrecordings', 'availabilityconditionsheader')) |
|
| 2367 | 2367 | ); |
| 2368 | 2368 | return $instanceprofiles; |
| 2369 | 2369 | } |
@@ -2452,8 +2452,8 @@ discard block |
||
| 2452 | 2452 | $activitytime = ''; |
| 2453 | 2453 | if ($time) { |
| 2454 | 2454 | $activitytime = calendar_day_representation($time).' '. |
| 2455 | - get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2456 | - calendar_time_representation($time); |
|
| 2455 | + get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2456 | + calendar_time_representation($time); |
|
| 2457 | 2457 | } |
| 2458 | 2458 | return $activitytime; |
| 2459 | 2459 | } |
@@ -2776,7 +2776,7 @@ discard block |
||
| 2776 | 2776 | 'participant_moderator_default', |
| 2777 | 2777 | array_keys($owner), |
| 2778 | 2778 | $owner + $roles) // CONTRIB-7966: don't use array_merge here so it does not reindex the array. |
| 2779 | - ); |
|
| 2779 | + ); |
|
| 2780 | 2780 | } |
| 2781 | 2781 | } |
| 2782 | 2782 | |
@@ -2812,7 +2812,7 @@ discard block |
||
| 2812 | 2812 | // Web Client default. |
| 2813 | 2813 | $default = intval((int)\mod_bigbluebuttonbn\locallib\config::get('clienttype_default')); |
| 2814 | 2814 | $choices = array(BIGBLUEBUTTON_CLIENTTYPE_FLASH => get_string('mod_form_block_clienttype_flash', 'bigbluebuttonbn'), |
| 2815 | - BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
| 2815 | + BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
| 2816 | 2816 | $renderer->render_group_element('clienttype_default', |
| 2817 | 2817 | $renderer->render_group_element_configselect('clienttype_default', |
| 2818 | 2818 | $default, $choices)); |
@@ -2923,7 +2923,7 @@ discard block |
||
| 2923 | 2923 | return $output; |
| 2924 | 2924 | } |
| 2925 | 2925 | $output .= $OUTPUT->box_start('box boxalignleft adminerror alert alert-' . $type . ' alert-block fade in', |
| 2926 | - 'bigbluebuttonbn_view_general_warning') . "\n"; |
|
| 2926 | + 'bigbluebuttonbn_view_general_warning') . "\n"; |
|
| 2927 | 2927 | $output .= ' ' . $message . "\n"; |
| 2928 | 2928 | $output .= ' <div class="singlebutton pull-right">' . "\n"; |
| 2929 | 2929 | if (!empty($href)) { |