@@ -80,7 +80,7 @@ |
||
80 | 80 | 'objectid' => $this->objectid, |
81 | 81 | 'contextinstanceid' => $this->contextinstanceid, |
82 | 82 | 'other' => $this->other |
83 | - ); |
|
83 | + ); |
|
84 | 84 | $string = $this->description; |
85 | 85 | foreach ($vars as $key => $value) { |
86 | 86 | $string = str_replace("##" . $key, $value, $string); |
@@ -61,11 +61,11 @@ discard block |
||
61 | 61 | */ |
62 | 62 | public static function _get_metadata(collection $collection) { |
63 | 63 | |
64 | - // The table bigbluebuttonbn stores only the room properties. |
|
65 | - // However, there is a chance that some personal information is stored as metadata. |
|
66 | - // This would be done in the column 'participants' where rules can be set to define BBB roles. |
|
67 | - // It is fair to say that only the userid is stored, which is useless if user is removed. |
|
68 | - // But if this is a concern a refactoring on the way the rules are stored will be required. |
|
64 | + // The table bigbluebuttonbn stores only the room properties. |
|
65 | + // However, there is a chance that some personal information is stored as metadata. |
|
66 | + // This would be done in the column 'participants' where rules can be set to define BBB roles. |
|
67 | + // It is fair to say that only the userid is stored, which is useless if user is removed. |
|
68 | + // But if this is a concern a refactoring on the way the rules are stored will be required. |
|
69 | 69 | $collection->add_database_table('bigbluebuttonbn', [ |
70 | 70 | 'participants' => 'privacy:metadata:bigbluebuttonbn:participants', |
71 | 71 | ], 'privacy:metadata:bigbluebuttonbn'); |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | 'meetingid' => $record->meetingid, |
209 | 209 | 'log' => $record->log, |
210 | 210 | 'meta' => $record->meta, |
211 | - ]; |
|
211 | + ]; |
|
212 | 212 | return $carry; |
213 | 213 | }, |
214 | 214 | function($instanceid, $data) use ($user, $instanceidstocmids) { |
@@ -219,8 +219,8 @@ discard block |
||
219 | 219 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
220 | 220 | $field['description_key'], 0, ['maxlength' => 4, 'size' => 6], |
221 | 221 | ['message' => get_string('mod_form_field_voicebridge_format_error', 'bigbluebuttonbn'), |
222 | - 'type' => 'numeric', 'rule' => '####', 'validator' => 'server'] |
|
223 | - ); |
|
222 | + 'type' => 'numeric', 'rule' => '####', 'validator' => 'server'] |
|
223 | + ); |
|
224 | 224 | } else { |
225 | 225 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
226 | 226 | $field['description_key'], 0, ['maxlength' => 4, 'size' => 6]); |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | private function bigbluebuttonbn_mform_add_block_room_recordings(&$mform, $cfg) { |
291 | 291 | $recordingsettings = false; |
292 | 292 | $field = ['type' => 'hidden', 'name' => 'recordings_html', 'data_type' => PARAM_INT, |
293 | - 'description_key' => null]; |
|
293 | + 'description_key' => null]; |
|
294 | 294 | if ($cfg['recordings_html_editable']) { |
295 | 295 | $field['type'] = 'checkbox'; |
296 | 296 | $field['description_key'] = 'mod_form_field_recordings_html'; |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
300 | 300 | $field['description_key'], $cfg['recordings_html_default']); |
301 | 301 | $field = ['type' => 'hidden', 'name' => 'recordings_deleted', 'data_type' => PARAM_INT, |
302 | - 'description_key' => null]; |
|
302 | + 'description_key' => null]; |
|
303 | 303 | if ($cfg['recordings_deleted_editable']) { |
304 | 304 | $field['type'] = 'checkbox'; |
305 | 305 | $field['description_key'] = 'mod_form_field_recordings_deleted'; |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
309 | 309 | $field['description_key'], $cfg['recordings_deleted_default']); |
310 | 310 | $field = ['type' => 'hidden', 'name' => 'recordings_imported', 'data_type' => PARAM_INT, |
311 | - 'description_key' => null]; |
|
311 | + 'description_key' => null]; |
|
312 | 312 | if ($cfg['importrecordings_enabled'] && $cfg['recordings_imported_editable']) { |
313 | 313 | $field['type'] = 'checkbox'; |
314 | 314 | $field['description_key'] = 'mod_form_field_recordings_imported'; |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
318 | 318 | $field['description_key'], $cfg['recordings_imported_default']); |
319 | 319 | $field = ['type' => 'hidden', 'name' => 'recordings_preview', 'data_type' => PARAM_INT, |
320 | - 'description_key' => null]; |
|
320 | + 'description_key' => null]; |
|
321 | 321 | if ($cfg['recordings_preview_editable']) { |
322 | 322 | $field['type'] = 'checkbox'; |
323 | 323 | $field['description_key'] = 'mod_form_field_recordings_preview'; |
@@ -394,7 +394,7 @@ discard block |
||
394 | 394 | $htmlselectiontype = html_writer::select($participantselection['type_options'], |
395 | 395 | 'bigbluebuttonbn_participant_selection_type', $participantselection['type_selected'], array(), |
396 | 396 | array('id' => 'bigbluebuttonbn_participant_selection_type', |
397 | - 'onchange' => 'M.mod_bigbluebuttonbn.modform.participantSelectionSet(); return 0;')); |
|
397 | + 'onchange' => 'M.mod_bigbluebuttonbn.modform.participantSelectionSet(); return 0;')); |
|
398 | 398 | $htmlselectionoptions = html_writer::select($participantselection['options'], 'bigbluebuttonbn_participant_selection', |
399 | 399 | $participantselection['selected'], array(), |
400 | 400 | array('id' => 'bigbluebuttonbn_participant_selection', 'disabled' => 'disabled')); |
@@ -402,7 +402,7 @@ discard block |
||
402 | 402 | 'type' => 'button', 'class' => 'btn btn-secondary', |
403 | 403 | 'value' => get_string('mod_form_field_participant_list_action_add', 'bigbluebuttonbn'), |
404 | 404 | 'onclick' => 'M.mod_bigbluebuttonbn.modform.participantAdd(); return 0;' |
405 | - )); |
|
405 | + )); |
|
406 | 406 | $htmladdparticipant = html_writer::tag('div', |
407 | 407 | $htmlselectiontype . ' ' . $htmlselectionoptions . ' ' . $htmlselectioninput, null); |
408 | 408 | $mform->addElement('html', "\n\n"); |
@@ -444,9 +444,9 @@ discard block |
||
444 | 444 | $field['type'] = 'select'; |
445 | 445 | $field['data_type'] = PARAM_TEXT; |
446 | 446 | $field['description_key'] = 'mod_form_field_block_clienttype'; |
447 | - $choices = array(BIGBLUEBUTTON_CLIENTTYPE_FLASH => get_string('mod_form_block_clienttype_flash', 'bigbluebuttonbn'), |
|
448 | - BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
449 | - $mform->addElement('header', 'clienttypeselection', get_string('mod_form_block_clienttype', 'bigbluebuttonbn')); |
|
447 | + $choices = array(BIGBLUEBUTTON_CLIENTTYPE_FLASH => get_string('mod_form_block_clienttype_flash', 'bigbluebuttonbn'), |
|
448 | + BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
449 | + $mform->addElement('header', 'clienttypeselection', get_string('mod_form_block_clienttype', 'bigbluebuttonbn')); |
|
450 | 450 | $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'], |
451 | 451 | $field['description_key'], $cfg['clienttype_default'], $choices); |
452 | 452 | return; |
@@ -309,10 +309,10 @@ discard block |
||
309 | 309 | */ |
310 | 310 | function bigbluebuttonbn_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'] = bigbluebuttonbn_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) { |
@@ -171,44 +171,44 @@ |
||
171 | 171 | */ |
172 | 172 | public static function get_options() { |
173 | 173 | return array( |
174 | - 'version_major' => self::get_moodle_version_major(), |
|
175 | - 'voicebridge_editable' => self::get('voicebridge_editable'), |
|
176 | - 'importrecordings_enabled' => self::get('importrecordings_enabled'), |
|
177 | - 'importrecordings_from_deleted_enabled' => self::get('importrecordings_from_deleted_enabled'), |
|
178 | - 'waitformoderator_default' => self::get('waitformoderator_default'), |
|
179 | - 'waitformoderator_editable' => self::get('waitformoderator_editable'), |
|
180 | - 'userlimit_default' => self::get('userlimit_default'), |
|
181 | - 'userlimit_editable' => self::get('userlimit_editable'), |
|
182 | - 'preuploadpresentation_enabled' => self::get('preuploadpresentation_enabled'), |
|
183 | - 'sendnotifications_enabled' => self::get('sendnotifications_enabled'), |
|
184 | - 'recordings_enabled' => self::get('recordings_enabled'), |
|
185 | - 'meetingevents_enabled' => self::get('meetingevents_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 | - ); |
|
174 | + 'version_major' => self::get_moodle_version_major(), |
|
175 | + 'voicebridge_editable' => self::get('voicebridge_editable'), |
|
176 | + 'importrecordings_enabled' => self::get('importrecordings_enabled'), |
|
177 | + 'importrecordings_from_deleted_enabled' => self::get('importrecordings_from_deleted_enabled'), |
|
178 | + 'waitformoderator_default' => self::get('waitformoderator_default'), |
|
179 | + 'waitformoderator_editable' => self::get('waitformoderator_editable'), |
|
180 | + 'userlimit_default' => self::get('userlimit_default'), |
|
181 | + 'userlimit_editable' => self::get('userlimit_editable'), |
|
182 | + 'preuploadpresentation_enabled' => self::get('preuploadpresentation_enabled'), |
|
183 | + 'sendnotifications_enabled' => self::get('sendnotifications_enabled'), |
|
184 | + 'recordings_enabled' => self::get('recordings_enabled'), |
|
185 | + 'meetingevents_enabled' => self::get('meetingevents_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"; |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | $sql = "SELECT COUNT(*) FROM {bigbluebuttonbn_logs} "; |
361 | 361 | $sql .= "WHERE courseid = ? AND bigbluebuttonbnid = ? AND userid = ? AND (log = ? OR log = ?)"; |
362 | 362 | $result = $DB->count_records_sql($sql, array($course->id, $bigbluebuttonbn->id, $user->id, |
363 | - BIGBLUEBUTTONBN_LOG_EVENT_JOIN, BIGBLUEBUTTONBN_LOG_EVENT_PLAYED)); |
|
363 | + BIGBLUEBUTTONBN_LOG_EVENT_JOIN, BIGBLUEBUTTONBN_LOG_EVENT_PLAYED)); |
|
364 | 364 | return $result; |
365 | 365 | } |
366 | 366 | |
@@ -593,7 +593,7 @@ discard block |
||
593 | 593 | $str = '<div class="bigbluebuttonbn overview">'."\n"; |
594 | 594 | $str .= ' <div class="name">'.get_string('modulename', 'bigbluebuttonbn').': '."\n"; |
595 | 595 | $str .= ' <a '.$classes.'href="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bigbluebuttonbn->coursemodule. |
596 | - '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
596 | + '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
597 | 597 | $str .= ' </div>'."\n"; |
598 | 598 | $str .= ' <div class="info">'.get_string($start, 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->openingtime). |
599 | 599 | '</div>'."\n"; |
@@ -846,7 +846,7 @@ discard block |
||
846 | 846 | 'bigbluebuttonbn', |
847 | 847 | $bigbluebuttonbn->id, |
848 | 848 | $bigbluebuttonbn->completionexpected |
849 | - ); |
|
849 | + ); |
|
850 | 850 | } |
851 | 851 | } |
852 | 852 |
@@ -796,7 +796,7 @@ discard block |
||
796 | 796 | $data['role'] = array( |
797 | 797 | 'name' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
798 | 798 | 'children' => bigbluebuttonbn_get_roles_select($context, true) |
799 | - ); |
|
799 | + ); |
|
800 | 800 | $data['user'] = array( |
801 | 801 | 'name' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
802 | 802 | 'children' => bigbluebuttonbn_get_users_select($context, $bbactivity), |
@@ -1704,7 +1704,7 @@ discard block |
||
1704 | 1704 | 'data-action' => 'play', |
1705 | 1705 | 'data-target' => $playback['type'], |
1706 | 1706 | 'data-href' => $href, |
1707 | - ); |
|
1707 | + ); |
|
1708 | 1708 | if ($CFG->bigbluebuttonbn_recordings_validate_url && !bigbluebuttonbn_is_bn_server() |
1709 | 1709 | && !bigbluebuttonbn_is_valid_resource(trim($playback['url']))) { |
1710 | 1710 | $linkattributes['class'] = 'btn btn-sm btn-warning'; |