@@ -190,27 +190,27 @@ |
||
| 190 | 190 | |
| 191 | 191 | //// Configuration for "scheduled duration" feature |
| 192 | 192 | if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_scheduled_duration_enabled) ) { |
| 193 | - $settings->add( new admin_setting_heading('config_scheduled', |
|
| 194 | - get_string('config_scheduled', 'bigbluebuttonbn'), |
|
| 195 | - get_string('config_scheduled_description', 'bigbluebuttonbn'))); |
|
| 193 | + $settings->add( new admin_setting_heading('config_scheduled', |
|
| 194 | + get_string('config_scheduled', 'bigbluebuttonbn'), |
|
| 195 | + get_string('config_scheduled_description', 'bigbluebuttonbn'))); |
|
| 196 | 196 | |
| 197 | - // calculated duration for 'scheduled session' feature |
|
| 198 | - $settings->add(new admin_setting_configcheckbox('bigbluebuttonbn_scheduled_duration_enabled', |
|
| 199 | - get_string('config_scheduled_duration_enabled', 'bigbluebuttonbn'), |
|
| 200 | - get_string('config_scheduled_duration_enabled_description', 'bigbluebuttonbn'), |
|
| 201 | - 1)); |
|
| 197 | + // calculated duration for 'scheduled session' feature |
|
| 198 | + $settings->add(new admin_setting_configcheckbox('bigbluebuttonbn_scheduled_duration_enabled', |
|
| 199 | + get_string('config_scheduled_duration_enabled', 'bigbluebuttonbn'), |
|
| 200 | + get_string('config_scheduled_duration_enabled_description', 'bigbluebuttonbn'), |
|
| 201 | + 1)); |
|
| 202 | 202 | |
| 203 | - // compensatory time for 'scheduled session' feature |
|
| 204 | - $settings->add(new admin_setting_configtext('bigbluebuttonbn_scheduled_duration_compensation', |
|
| 205 | - get_string('config_scheduled_duration_compensation', 'bigbluebuttonbn'), |
|
| 206 | - get_string('config_scheduled_duration_compensation_description', 'bigbluebuttonbn'), |
|
| 207 | - 10, PARAM_INT)); |
|
| 203 | + // compensatory time for 'scheduled session' feature |
|
| 204 | + $settings->add(new admin_setting_configtext('bigbluebuttonbn_scheduled_duration_compensation', |
|
| 205 | + get_string('config_scheduled_duration_compensation', 'bigbluebuttonbn'), |
|
| 206 | + get_string('config_scheduled_duration_compensation_description', 'bigbluebuttonbn'), |
|
| 207 | + 10, PARAM_INT)); |
|
| 208 | 208 | |
| 209 | - // pre-opening time for 'scheduled session' feature |
|
| 210 | - $settings->add(new admin_setting_configtext('bigbluebuttonbn_scheduled_pre_opening', |
|
| 211 | - get_string('config_scheduled_pre_opening', 'bigbluebuttonbn'), |
|
| 212 | - get_string('config_scheduled_pre_opening_description', 'bigbluebuttonbn'), |
|
| 213 | - 10, PARAM_INT)); |
|
| 209 | + // pre-opening time for 'scheduled session' feature |
|
| 210 | + $settings->add(new admin_setting_configtext('bigbluebuttonbn_scheduled_pre_opening', |
|
| 211 | + get_string('config_scheduled_pre_opening', 'bigbluebuttonbn'), |
|
| 212 | + get_string('config_scheduled_pre_opening_description', 'bigbluebuttonbn'), |
|
| 213 | + 10, PARAM_INT)); |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | //// Configuration for defining the default role/user that will be moderator on new activities |
@@ -36,11 +36,11 @@ |
||
| 36 | 36 | |
| 37 | 37 | // Define each element separated |
| 38 | 38 | $bigbluebuttonbn = new backup_nested_element('bigbluebuttonbn', array('id'), array( |
| 39 | - 'course', 'name', 'intro', 'introformat', 'meetingid', |
|
| 40 | - 'moderatorpass', 'viewerpass', 'wait', 'record', 'tagging', |
|
| 41 | - 'welcome', 'voicebridge', 'openingtime', 'closingtime', |
|
| 42 | - 'timecreated', 'timemodified', 'presentation', 'participants', |
|
| 43 | - 'userlimit')); |
|
| 39 | + 'course', 'name', 'intro', 'introformat', 'meetingid', |
|
| 40 | + 'moderatorpass', 'viewerpass', 'wait', 'record', 'tagging', |
|
| 41 | + 'welcome', 'voicebridge', 'openingtime', 'closingtime', |
|
| 42 | + 'timecreated', 'timemodified', 'presentation', 'participants', |
|
| 43 | + 'userlimit')); |
|
| 44 | 44 | |
| 45 | 45 | $logs = new backup_nested_element('logs'); |
| 46 | 46 | |
@@ -241,7 +241,6 @@ discard block |
||
| 241 | 241 | |
| 242 | 242 | /** |
| 243 | 243 | * Prints single activity item prepared by {@see recordingsbn_get_recent_mod_activity()} |
| 244 | - |
|
| 245 | 244 | * @return void |
| 246 | 245 | */ |
| 247 | 246 | function bigbluebuttonbn_print_recent_mod_activity($activity, $courseid, $detail, $modnames, $viewfullnames) { |
@@ -359,9 +358,9 @@ discard block |
||
| 359 | 358 | $now = time(); |
| 360 | 359 | if ( $bigbluebuttonbn->openingtime and (!$bigbluebuttonbn->closingtime or $bigbluebuttonbn->closingtime > $now)) { // A bigbluebuttonbn is scheduled. |
| 361 | 360 | $str = '<div class="bigbluebuttonbn overview"><div class="name">'. |
| 362 | - get_string('modulename', 'bigbluebuttonbn').': <a '.($bigbluebuttonbn->visible ? '' : ' class="dimmed"'). |
|
| 363 | - ' href="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bigbluebuttonbn->coursemodule.'">'. |
|
| 364 | - $bigbluebuttonbn->name.'</a></div>'; |
|
| 361 | + get_string('modulename', 'bigbluebuttonbn').': <a '.($bigbluebuttonbn->visible ? '' : ' class="dimmed"'). |
|
| 362 | + ' href="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bigbluebuttonbn->coursemodule.'">'. |
|
| 363 | + $bigbluebuttonbn->name.'</a></div>'; |
|
| 365 | 364 | if ( $bigbluebuttonbn->openingtime > $now ) { |
| 366 | 365 | $str .= '<div class="info">'.get_string('starts_at', 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->openingtime).'</div>'; |
| 367 | 366 | } else { |
@@ -93,7 +93,7 @@ |
||
| 93 | 93 | } else { |
| 94 | 94 | $getArray = bigbluebuttonbn_wrap_xml_load_file(bigbluebuttonbn_getEndMeetingURL($meetingID, $modPW, $endpoint, $shared_secret)); |
| 95 | 95 | } |
| 96 | - redirect('index.php?id=' . $id); |
|
| 96 | + redirect('index.php?id=' . $id); |
|
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | 99 | |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | 'class' => 'btn btn-default', |
| 71 | 71 | 'value' => get_string('view_recording_button_return', 'bigbluebuttonbn'), |
| 72 | 72 | 'onclick' => 'window.location=\'' . $CFG->wwwroot . '/mod/bigbluebuttonbn/view.php?id=' . $cm->id . '\'' |
| 73 | - ); |
|
| 73 | + ); |
|
| 74 | 74 | $output .= html_writer::tag('input', '', $buttonoptions); |
| 75 | 75 | |
| 76 | 76 | $jsvars = array( |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | switch (strtolower($action)) { |
| 50 | 50 | case 'logout': |
| 51 | 51 | if (isset($errors) && $errors != '') { |
| 52 | - bigbluebutton_bbb_view_errors($errors, $id); |
|
| 52 | + bigbluebutton_bbb_view_errors($errors, $id); |
|
| 53 | 53 | |
| 54 | 54 | } else if (isset($bbbsession) && !is_null($bbbsession)) { |
| 55 | 55 | // Moodle event logger: Create an event for meeting left. |
@@ -93,8 +93,8 @@ discard block |
||
| 93 | 93 | array( |
| 94 | 94 | 'email' => array('"' . fullname($USER) . '" <' . $USER->email . '>'), |
| 95 | 95 | 'context' => $bbbsession['bigbluebuttonbnURL'] |
| 96 | - ) |
|
| 97 | - ); |
|
| 96 | + ) |
|
| 97 | + ); |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | if (bigbluebuttonbn_get_cfg_recordingready_enabled()) { |
@@ -53,9 +53,9 @@ discard block |
||
| 53 | 53 | $returnid = $DB->insert_record('bigbluebuttonbn_logs', $log); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - //////////////////////////// |
|
| 56 | + //////////////////////////// |
|
| 57 | 57 | // BigBlueButton API Calls // |
| 58 | - //////////////////////////// |
|
| 58 | + //////////////////////////// |
|
| 59 | 59 | function bigbluebuttonbn_getJoinURL( $meetingID, $userName, $PW, $SALT, $URL, $logoutURL ) { |
| 60 | 60 | $url_join = $URL."api/join?"; |
| 61 | 61 | $params = 'meetingID='.urlencode($meetingID).'&fullName='.urlencode($userName).'&password='.urlencode($PW).'&logoutURL='.urlencode($logoutURL); |
@@ -493,7 +493,7 @@ discard block |
||
| 493 | 493 | $roles[$key] = array('id' => $value->id, 'name' => $value->localname); |
| 494 | 494 | } |
| 495 | 495 | return $roles; |
| 496 | - } |
|
| 496 | + } |
|
| 497 | 497 | |
| 498 | 498 | function bigbluebuttonbn_get_role($id) { |
| 499 | 499 | $roles = (array) role_get_names(); |
@@ -512,16 +512,16 @@ discard block |
||
| 512 | 512 | 'all' => array( |
| 513 | 513 | 'name' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 514 | 514 | 'children' => [] |
| 515 | - ) |
|
| 516 | - ); |
|
| 515 | + ) |
|
| 516 | + ); |
|
| 517 | 517 | $data['role'] = array( |
| 518 | 518 | 'name' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 519 | 519 | 'children' => bigbluebuttonbn_get_roles_select($context) |
| 520 | - ); |
|
| 520 | + ); |
|
| 521 | 521 | $data['user'] = array( |
| 522 | 522 | 'name' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 523 | 523 | 'children' => bigbluebuttonbn_get_users_select($context) |
| 524 | - ); |
|
| 524 | + ); |
|
| 525 | 525 | return $data; |
| 526 | 526 | } |
| 527 | 527 | |
@@ -568,9 +568,9 @@ discard block |
||
| 568 | 568 | continue; |
| 569 | 569 | } |
| 570 | 570 | $participantlistarray[] = array( |
| 571 | - 'selectiontype' => 'role', |
|
| 572 | - 'selectionid' => $moderatordefault, |
|
| 573 | - 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 571 | + 'selectiontype' => 'role', |
|
| 572 | + 'selectionid' => $moderatordefault, |
|
| 573 | + 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 574 | 574 | } |
| 575 | 575 | return $participantlistarray; |
| 576 | 576 | } |
@@ -581,11 +581,11 @@ discard block |
||
| 581 | 581 | 'all' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 582 | 582 | 'role' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 583 | 583 | 'user' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 584 | - ], |
|
| 584 | + ], |
|
| 585 | 585 | 'type_selected' => 'all', |
| 586 | 586 | 'options' => ['all' => '---------------'], |
| 587 | 587 | 'selected' => 'all', |
| 588 | - ]; |
|
| 588 | + ]; |
|
| 589 | 589 | } |
| 590 | 590 | |
| 591 | 591 | function bigbluebuttonbn_is_moderator($user, $roles, $participants) { |
@@ -265,33 +265,33 @@ discard block |
||
| 265 | 265 | private function mform_participant_renderer_old_format($mform, $context, $participantselection, $participantlist) { |
| 266 | 266 | global $CFG; |
| 267 | 267 | $htmlparticipantselection = ''. |
| 268 | - '<div class="fitem fitem_fselect">'."\n". |
|
| 269 | - ' <div class="fitemtitle">'."\n". |
|
| 270 | - ' <label for="bigbluebuttonbn_participant_selectiontype">'.get_string('mod_form_field_participant_add', 'bigbluebuttonbn').' </label>'."\n". |
|
| 271 | - ' </div>'."\n". |
|
| 272 | - ' <div class="felement fselect">'."\n". |
|
| 273 | - ' <select id="bigbluebuttonbn_participant_selection_type" onchange="bigbluebuttonbn_participant_selection_set(); return 0;" class="select custom-select">'."\n". |
|
| 274 | - ' <option value="all" selected="selected">'.get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn').'</option>'."\n". |
|
| 275 | - ' <option value="role">'.get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn').'</option>'."\n". |
|
| 276 | - ' <option value="user">'.get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn').'</option>'."\n". |
|
| 277 | - ' </select>'."\n". |
|
| 278 | - ' '."\n". |
|
| 279 | - ' <select id="bigbluebuttonbn_participant_selection" disabled="disabled" class="select custom-select">'."\n". |
|
| 280 | - ' <option value="all" selected="selected">---------------</option>'."\n". |
|
| 281 | - ' </select>'."\n". |
|
| 282 | - ' '."\n". |
|
| 283 | - ' <input value="'.get_string('mod_form_field_participant_list_action_add', 'bigbluebuttonbn').'" class="btn btn-secondary" type="button" id="id_addselectionid" onclick="bigbluebuttonbn_participant_add(); return 0;" />'."\n". |
|
| 284 | - ' </div>'."\n". |
|
| 285 | - '</div>'."\n"; |
|
| 268 | + '<div class="fitem fitem_fselect">'."\n". |
|
| 269 | + ' <div class="fitemtitle">'."\n". |
|
| 270 | + ' <label for="bigbluebuttonbn_participant_selectiontype">'.get_string('mod_form_field_participant_add', 'bigbluebuttonbn').' </label>'."\n". |
|
| 271 | + ' </div>'."\n". |
|
| 272 | + ' <div class="felement fselect">'."\n". |
|
| 273 | + ' <select id="bigbluebuttonbn_participant_selection_type" onchange="bigbluebuttonbn_participant_selection_set(); return 0;" class="select custom-select">'."\n". |
|
| 274 | + ' <option value="all" selected="selected">'.get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn').'</option>'."\n". |
|
| 275 | + ' <option value="role">'.get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn').'</option>'."\n". |
|
| 276 | + ' <option value="user">'.get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn').'</option>'."\n". |
|
| 277 | + ' </select>'."\n". |
|
| 278 | + ' '."\n". |
|
| 279 | + ' <select id="bigbluebuttonbn_participant_selection" disabled="disabled" class="select custom-select">'."\n". |
|
| 280 | + ' <option value="all" selected="selected">---------------</option>'."\n". |
|
| 281 | + ' </select>'."\n". |
|
| 282 | + ' '."\n". |
|
| 283 | + ' <input value="'.get_string('mod_form_field_participant_list_action_add', 'bigbluebuttonbn').'" class="btn btn-secondary" type="button" id="id_addselectionid" onclick="bigbluebuttonbn_participant_add(); return 0;" />'."\n". |
|
| 284 | + ' </div>'."\n". |
|
| 285 | + '</div>'."\n"; |
|
| 286 | 286 | |
| 287 | 287 | |
| 288 | 288 | $htmlparticipantselection .= ''. |
| 289 | - '<div class="fitem">'."\n". |
|
| 290 | - ' <div class="fitemtitle">'."\n". |
|
| 291 | - ' <label for="bigbluebuttonbn_participant_list">'.get_string('mod_form_field_participant_list', 'bigbluebuttonbn').' </label>'."\n". |
|
| 292 | - ' </div>'."\n". |
|
| 293 | - ' <div class="felement fselect">'."\n". |
|
| 294 | - ' <table id="participant_list_table">'."\n"; |
|
| 289 | + '<div class="fitem">'."\n". |
|
| 290 | + ' <div class="fitemtitle">'."\n". |
|
| 291 | + ' <label for="bigbluebuttonbn_participant_list">'.get_string('mod_form_field_participant_list', 'bigbluebuttonbn').' </label>'."\n". |
|
| 292 | + ' </div>'."\n". |
|
| 293 | + ' <div class="felement fselect">'."\n". |
|
| 294 | + ' <table id="participant_list_table">'."\n"; |
|
| 295 | 295 | |
| 296 | 296 | |
| 297 | 297 | // Add participant list |
@@ -328,11 +328,11 @@ discard block |
||
| 328 | 328 | } |
| 329 | 329 | |
| 330 | 330 | $htmlparticipantselection .= ''. |
| 331 | - ' </table>'."\n". |
|
| 332 | - ' </div>'."\n". |
|
| 333 | - '</div>'."\n". |
|
| 334 | - '<script type="text/javascript" src="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/mod_form.js">'."\n". |
|
| 335 | - '</script>'."\n"; |
|
| 331 | + ' </table>'."\n". |
|
| 332 | + ' </div>'."\n". |
|
| 333 | + '</div>'."\n". |
|
| 334 | + '<script type="text/javascript" src="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/mod_form.js">'."\n". |
|
| 335 | + '</script>'."\n"; |
|
| 336 | 336 | |
| 337 | 337 | $mform->addElement('html', $htmlparticipantselection); |
| 338 | 338 | |
@@ -344,9 +344,9 @@ discard block |
||
| 344 | 344 | $mform->addElement('html', '<script type="text/javascript">var bigbluebuttonbn_participant_selection = {"all": [], "role": '.json_encode($roles).', "user": '.bigbluebuttonbn_get_users_json($users).'}; </script>'); |
| 345 | 345 | $mform->addElement('html', '<script type="text/javascript">var bigbluebuttonbn_participant_list = '.json_encode($participantlist).'; </script>'); |
| 346 | 346 | $bigbluebuttonbn_strings = Array( "as" => get_string('mod_form_field_participant_list_text_as', 'bigbluebuttonbn'), |
| 347 | - "viewer" => get_string('mod_form_field_participant_bbb_role_viewer', 'bigbluebuttonbn'), |
|
| 348 | - "moderator" => get_string('mod_form_field_participant_bbb_role_moderator', 'bigbluebuttonbn'), |
|
| 349 | - "remove" => get_string('mod_form_field_participant_list_action_remove', 'bigbluebuttonbn'), |
|
| 347 | + "viewer" => get_string('mod_form_field_participant_bbb_role_viewer', 'bigbluebuttonbn'), |
|
| 348 | + "moderator" => get_string('mod_form_field_participant_bbb_role_moderator', 'bigbluebuttonbn'), |
|
| 349 | + "remove" => get_string('mod_form_field_participant_list_action_remove', 'bigbluebuttonbn'), |
|
| 350 | 350 | ); |
| 351 | 351 | $mform->addElement('html', '<script type="text/javascript">var bigbluebuttonbn_strings = '.json_encode($bigbluebuttonbn_strings).'; </script>'); |
| 352 | 352 | |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | html_writer::select($participantselection['type_options'], 'bigbluebuttonbn_participant_selection_type', |
| 359 | 359 | $participantselection['type_selected'], array(), |
| 360 | 360 | array('id' => 'bigbluebuttonbn_participant_selection_type', |
| 361 | - 'onchange' => 'M.mod_bigbluebuttonbn.modform.participant_selection_set(); return 0;')).' '. |
|
| 361 | + 'onchange' => 'M.mod_bigbluebuttonbn.modform.participant_selection_set(); return 0;')).' '. |
|
| 362 | 362 | html_writer::select($participantselection['options'], 'bigbluebuttonbn_participant_selection', |
| 363 | 363 | $participantselection['selected'], array(), |
| 364 | 364 | array('id' => 'bigbluebuttonbn_participant_selection', 'disabled' => 'disabled')).' '. |