@@ -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"; |
@@ -205,7 +205,7 @@ |
||
| 205 | 205 | !isset($CFG->bigbluebuttonbn['recordings_imported_editable']) || |
| 206 | 206 | !isset($CFG->bigbluebuttonbn['recordings_preview_default']) || |
| 207 | 207 | !isset($CFG->bigbluebuttonbn['recordings_preview_editable']) |
| 208 | - ); |
|
| 208 | + ); |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | /** |
@@ -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; |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | * Remove this block when restored |
| 65 | 65 | */ |
| 66 | 66 | |
| 67 | - /** @var BIGBLUEBUTTONBN_DEFAULT_SERVER_URL string of default bigbluebutton server url */ |
|
| 67 | + /** @var BIGBLUEBUTTONBN_DEFAULT_SERVER_URL string of default bigbluebutton server url */ |
|
| 68 | 68 | const BIGBLUEBUTTONBN_DEFAULT_SERVER_URL = 'http://test-install.blindsidenetworks.com/bigbluebutton/'; |
| 69 | 69 | /** @var BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET string of default bigbluebutton server shared secret */ |
| 70 | 70 | const BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET = '8cd8ef52e8e101574e400365b55e11a6'; |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | $sql = "SELECT COUNT(*) FROM {bigbluebuttonbn_logs} "; |
| 279 | 279 | $sql .= "WHERE courseid = ? AND bigbluebuttonbnid = ? AND userid = ? AND (log = ? OR log = ?)"; |
| 280 | 280 | $result = $DB->count_records_sql($sql, array($course->id, $bigbluebuttonbn->id, $user->id, |
| 281 | - BIGBLUEBUTTONBN_LOG_EVENT_JOIN, BIGBLUEBUTTONBN_LOG_EVENT_PLAYED)); |
|
| 281 | + BIGBLUEBUTTONBN_LOG_EVENT_JOIN, BIGBLUEBUTTONBN_LOG_EVENT_PLAYED)); |
|
| 282 | 282 | return $result; |
| 283 | 283 | } |
| 284 | 284 | |
@@ -507,12 +507,12 @@ discard block |
||
| 507 | 507 | $str = '<div class="bigbluebuttonbn overview">'."\n"; |
| 508 | 508 | $str .= ' <div class="name">'.get_string('modulename', 'bigbluebuttonbn').': '."\n"; |
| 509 | 509 | $str .= ' <a '.$classes.'href="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bigbluebuttonbn->coursemodule. |
| 510 | - '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
| 510 | + '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
| 511 | 511 | $str .= ' </div>'."\n"; |
| 512 | 512 | $str .= ' <div class="info">'.get_string($start, 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->openingtime). |
| 513 | 513 | '</div>'."\n"; |
| 514 | 514 | $str .= ' <div class="info">'.get_string('ends_at', 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->closingtime) |
| 515 | - .'</div>'."\n"; |
|
| 515 | + .'</div>'."\n"; |
|
| 516 | 516 | $str .= '</div>'."\n"; |
| 517 | 517 | return $str; |
| 518 | 518 | } |
@@ -720,7 +720,7 @@ discard block |
||
| 720 | 720 | $bigbluebuttonbn->coursemodule, |
| 721 | 721 | 'bigbluebuttonbn', |
| 722 | 722 | $bigbluebuttonbn->id, $bigbluebuttonbn->completionexpected |
| 723 | - ); |
|
| 723 | + ); |
|
| 724 | 724 | } |
| 725 | 725 | } |
| 726 | 726 | |
@@ -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) { |
@@ -170,43 +170,43 @@ |
||
| 170 | 170 | */ |
| 171 | 171 | public static function get_options() { |
| 172 | 172 | return array( |
| 173 | - 'version_major' => self::get_moodle_version_major(), |
|
| 174 | - 'voicebridge_editable' => self::get('voicebridge_editable'), |
|
| 175 | - 'importrecordings_enabled' => self::get('importrecordings_enabled'), |
|
| 176 | - 'importrecordings_from_deleted_enabled' => self::get('importrecordings_from_deleted_enabled'), |
|
| 177 | - 'waitformoderator_default' => self::get('waitformoderator_default'), |
|
| 178 | - 'waitformoderator_editable' => self::get('waitformoderator_editable'), |
|
| 179 | - 'userlimit_default' => self::get('userlimit_default'), |
|
| 180 | - 'userlimit_editable' => self::get('userlimit_editable'), |
|
| 181 | - 'preuploadpresentation_enabled' => self::get('preuploadpresentation_enabled'), |
|
| 182 | - 'sendnotifications_enabled' => self::get('sendnotifications_enabled'), |
|
| 183 | - 'recordings_enabled' => self::get('recordings_enabled'), |
|
| 184 | - 'meetingevents_enabled' => self::get('meetingevents_enabled'), |
|
| 185 | - 'recordings_html_default' => self::get('recordings_html_default'), |
|
| 186 | - 'recordings_html_editable' => self::get('recordings_html_editable'), |
|
| 187 | - 'recordings_deleted_default' => self::get('recordings_deleted_default'), |
|
| 188 | - 'recordings_deleted_editable' => self::get('recordings_deleted_editable'), |
|
| 189 | - 'recordings_imported_default' => self::get('recordings_imported_default'), |
|
| 190 | - 'recordings_imported_editable' => self::get('recordings_imported_editable'), |
|
| 191 | - 'recordings_preview_default' => self::get('recordings_preview_default'), |
|
| 192 | - 'recordings_preview_editable' => self::get('recordings_preview_editable'), |
|
| 193 | - 'recording_default' => self::get('recording_default'), |
|
| 194 | - 'recording_editable' => self::get('recording_editable'), |
|
| 195 | - 'recording_icons_enabled' => self::get('recording_icons_enabled'), |
|
| 196 | - 'recording_all_from_start_default' => self::get('recording_all_from_start_default'), |
|
| 197 | - 'recording_all_from_start_editable' => self::get('recording_all_from_start_editable'), |
|
| 198 | - 'recording_hide_button_default' => self::get('recording_hide_button_default'), |
|
| 199 | - 'recording_hide_button_editable' => self::get('recording_hide_button_editable'), |
|
| 200 | - 'general_warning_message' => self::get('general_warning_message'), |
|
| 201 | - 'general_warning_box_type' => self::get('general_warning_box_type'), |
|
| 202 | - 'general_warning_button_text' => self::get('general_warning_button_text'), |
|
| 203 | - 'general_warning_button_href' => self::get('general_warning_button_href'), |
|
| 204 | - 'general_warning_button_class' => self::get('general_warning_button_class'), |
|
| 205 | - 'clienttype_enabled' => self::get('clienttype_enabled'), |
|
| 206 | - 'clienttype_editable' => self::get('clienttype_editable'), |
|
| 207 | - 'clienttype_default' => self::get('clienttype_default'), |
|
| 208 | - 'muteonstart_editable' => self::get('muteonstart_editable'), |
|
| 209 | - 'muteonstart_default' => self::get('muteonstart_default'), |
|
| 210 | - ); |
|
| 173 | + 'version_major' => self::get_moodle_version_major(), |
|
| 174 | + 'voicebridge_editable' => self::get('voicebridge_editable'), |
|
| 175 | + 'importrecordings_enabled' => self::get('importrecordings_enabled'), |
|
| 176 | + 'importrecordings_from_deleted_enabled' => self::get('importrecordings_from_deleted_enabled'), |
|
| 177 | + 'waitformoderator_default' => self::get('waitformoderator_default'), |
|
| 178 | + 'waitformoderator_editable' => self::get('waitformoderator_editable'), |
|
| 179 | + 'userlimit_default' => self::get('userlimit_default'), |
|
| 180 | + 'userlimit_editable' => self::get('userlimit_editable'), |
|
| 181 | + 'preuploadpresentation_enabled' => self::get('preuploadpresentation_enabled'), |
|
| 182 | + 'sendnotifications_enabled' => self::get('sendnotifications_enabled'), |
|
| 183 | + 'recordings_enabled' => self::get('recordings_enabled'), |
|
| 184 | + 'meetingevents_enabled' => self::get('meetingevents_enabled'), |
|
| 185 | + 'recordings_html_default' => self::get('recordings_html_default'), |
|
| 186 | + 'recordings_html_editable' => self::get('recordings_html_editable'), |
|
| 187 | + 'recordings_deleted_default' => self::get('recordings_deleted_default'), |
|
| 188 | + 'recordings_deleted_editable' => self::get('recordings_deleted_editable'), |
|
| 189 | + 'recordings_imported_default' => self::get('recordings_imported_default'), |
|
| 190 | + 'recordings_imported_editable' => self::get('recordings_imported_editable'), |
|
| 191 | + 'recordings_preview_default' => self::get('recordings_preview_default'), |
|
| 192 | + 'recordings_preview_editable' => self::get('recordings_preview_editable'), |
|
| 193 | + 'recording_default' => self::get('recording_default'), |
|
| 194 | + 'recording_editable' => self::get('recording_editable'), |
|
| 195 | + 'recording_icons_enabled' => self::get('recording_icons_enabled'), |
|
| 196 | + 'recording_all_from_start_default' => self::get('recording_all_from_start_default'), |
|
| 197 | + 'recording_all_from_start_editable' => self::get('recording_all_from_start_editable'), |
|
| 198 | + 'recording_hide_button_default' => self::get('recording_hide_button_default'), |
|
| 199 | + 'recording_hide_button_editable' => self::get('recording_hide_button_editable'), |
|
| 200 | + 'general_warning_message' => self::get('general_warning_message'), |
|
| 201 | + 'general_warning_box_type' => self::get('general_warning_box_type'), |
|
| 202 | + 'general_warning_button_text' => self::get('general_warning_button_text'), |
|
| 203 | + 'general_warning_button_href' => self::get('general_warning_button_href'), |
|
| 204 | + 'general_warning_button_class' => self::get('general_warning_button_class'), |
|
| 205 | + 'clienttype_enabled' => self::get('clienttype_enabled'), |
|
| 206 | + 'clienttype_editable' => self::get('clienttype_editable'), |
|
| 207 | + 'clienttype_default' => self::get('clienttype_default'), |
|
| 208 | + 'muteonstart_editable' => self::get('muteonstart_editable'), |
|
| 209 | + 'muteonstart_default' => self::get('muteonstart_default'), |
|
| 210 | + ); |
|
| 211 | 211 | } |
| 212 | 212 | } |
@@ -104,9 +104,9 @@ discard block |
||
| 104 | 104 | function bigbluebuttonbn_get_join_url($meetingid, $username, $pw, $logouturl, $configtoken = null, |
| 105 | 105 | $userid = null, $clienttype = BIGBLUEBUTTON_CLIENTTYPE_FLASH) { |
| 106 | 106 | $data = ['meetingID' => $meetingid, |
| 107 | - 'fullName' => $username, |
|
| 108 | - 'password' => $pw, |
|
| 109 | - 'logoutURL' => $logouturl, |
|
| 107 | + 'fullName' => $username, |
|
| 108 | + 'password' => $pw, |
|
| 109 | + 'logoutURL' => $logouturl, |
|
| 110 | 110 | ]; |
| 111 | 111 | // Choose between Adobe Flash or HTML5 Client. |
| 112 | 112 | if ( $clienttype == BIGBLUEBUTTON_CLIENTTYPE_HTML5 ) { |
@@ -162,23 +162,23 @@ discard block |
||
| 162 | 162 | function bigbluebuttonbn_get_meeting_info_array($meetingid) { |
| 163 | 163 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 164 | 164 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 165 | - ); |
|
| 165 | + ); |
|
| 166 | 166 | if ($xml && $xml->returncode == 'SUCCESS' && empty($xml->messageKey)) { |
| 167 | 167 | // Meeting info was returned. |
| 168 | 168 | return array('returncode' => $xml->returncode, |
| 169 | - 'meetingID' => $xml->meetingID, |
|
| 170 | - 'moderatorPW' => $xml->moderatorPW, |
|
| 171 | - 'attendeePW' => $xml->attendeePW, |
|
| 172 | - 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 173 | - 'running' => $xml->running, |
|
| 174 | - 'recording' => $xml->recording, |
|
| 175 | - 'startTime' => $xml->startTime, |
|
| 176 | - 'endTime' => $xml->endTime, |
|
| 177 | - 'participantCount' => $xml->participantCount, |
|
| 178 | - 'moderatorCount' => $xml->moderatorCount, |
|
| 179 | - 'attendees' => $xml->attendees, |
|
| 180 | - 'metadata' => $xml->metadata, |
|
| 181 | - ); |
|
| 169 | + 'meetingID' => $xml->meetingID, |
|
| 170 | + 'moderatorPW' => $xml->moderatorPW, |
|
| 171 | + 'attendeePW' => $xml->attendeePW, |
|
| 172 | + 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
| 173 | + 'running' => $xml->running, |
|
| 174 | + 'recording' => $xml->recording, |
|
| 175 | + 'startTime' => $xml->startTime, |
|
| 176 | + 'endTime' => $xml->endTime, |
|
| 177 | + 'participantCount' => $xml->participantCount, |
|
| 178 | + 'moderatorCount' => $xml->moderatorCount, |
|
| 179 | + 'attendees' => $xml->attendees, |
|
| 180 | + 'metadata' => $xml->metadata, |
|
| 181 | + ); |
|
| 182 | 182 | } |
| 183 | 183 | if ($xml) { |
| 184 | 184 | // Either failure or success without meeting info. |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | function bigbluebuttonbn_get_default_config_xml() { |
| 331 | 331 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 332 | 332 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getDefaultConfigXML') |
| 333 | - ); |
|
| 333 | + ); |
|
| 334 | 334 | return $xml; |
| 335 | 335 | } |
| 336 | 336 | |
@@ -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('deleteRecordings', ['recordID' => $id]) |
| 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('publishRecordings', ['recordID' => $id, 'publish' => $publish]) |
| 456 | - ); |
|
| 456 | + ); |
|
| 457 | 457 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 458 | 458 | return false; |
| 459 | 459 | } |
@@ -472,7 +472,7 @@ discard block |
||
| 472 | 472 | foreach ($ids as $id) { |
| 473 | 473 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 474 | 474 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('updateRecordings', ['recordID' => $id] + (array) $params) |
| 475 | - ); |
|
| 475 | + ); |
|
| 476 | 476 | if ($xml && $xml->returncode != 'SUCCESS') { |
| 477 | 477 | return false; |
| 478 | 478 | } |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | function bigbluebuttonbn_end_meeting($meetingid, $modpw) { |
| 490 | 490 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 491 | 491 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('end', ['meetingID' => $meetingid, 'password' => $modpw]) |
| 492 | - ); |
|
| 492 | + ); |
|
| 493 | 493 | if ($xml) { |
| 494 | 494 | // If the xml packet returned failure it displays the message to the user. |
| 495 | 495 | return array('returncode' => $xml->returncode, 'message' => $xml->message, 'messageKey' => $xml->messageKey); |
@@ -506,7 +506,7 @@ discard block |
||
| 506 | 506 | function bigbluebuttonbn_get_server_version() { |
| 507 | 507 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
| 508 | 508 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url() |
| 509 | - ); |
|
| 509 | + ); |
|
| 510 | 510 | if ($xml && $xml->returncode == 'SUCCESS') { |
| 511 | 511 | return $xml->version; |
| 512 | 512 | } |
@@ -573,10 +573,10 @@ discard block |
||
| 573 | 573 | } |
| 574 | 574 | $options = array(); |
| 575 | 575 | $options['CURLOPT_HTTPHEADER'] = array( |
| 576 | - 'Content-Type: '.$contenttype, |
|
| 577 | - 'Content-Length: '.strlen($data), |
|
| 578 | - 'Content-Language: en-US', |
|
| 579 | - ); |
|
| 576 | + 'Content-Type: '.$contenttype, |
|
| 577 | + 'Content-Length: '.strlen($data), |
|
| 578 | + 'Content-Language: en-US', |
|
| 579 | + ); |
|
| 580 | 580 | |
| 581 | 581 | return $c->post($url, $data, $options); |
| 582 | 582 | } |
@@ -723,16 +723,16 @@ discard block |
||
| 723 | 723 | 'all' => array( |
| 724 | 724 | 'name' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 725 | 725 | 'children' => [] |
| 726 | - ) |
|
| 727 | - ); |
|
| 726 | + ) |
|
| 727 | + ); |
|
| 728 | 728 | $data['role'] = array( |
| 729 | 729 | 'name' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 730 | 730 | 'children' => bigbluebuttonbn_get_roles_select($context) |
| 731 | - ); |
|
| 731 | + ); |
|
| 732 | 732 | $data['user'] = array( |
| 733 | 733 | 'name' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 734 | 734 | 'children' => bigbluebuttonbn_get_users_select($context) |
| 735 | - ); |
|
| 735 | + ); |
|
| 736 | 736 | return $data; |
| 737 | 737 | } |
| 738 | 738 | |
@@ -775,7 +775,7 @@ discard block |
||
| 775 | 775 | 'selectiontype' => 'all', |
| 776 | 776 | 'selectionid' => 'all', |
| 777 | 777 | 'role' => BIGBLUEBUTTONBN_ROLE_VIEWER |
| 778 | - ); |
|
| 778 | + ); |
|
| 779 | 779 | $defaultrules = explode(',', \mod_bigbluebuttonbn\locallib\config::get('participant_moderator_default')); |
| 780 | 780 | foreach ($defaultrules as $defaultrule) { |
| 781 | 781 | if ($defaultrule == '0') { |
@@ -788,9 +788,9 @@ discard block |
||
| 788 | 788 | continue; |
| 789 | 789 | } |
| 790 | 790 | $participantlist[] = array( |
| 791 | - 'selectiontype' => 'role', |
|
| 792 | - 'selectionid' => $defaultrule, |
|
| 793 | - 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 791 | + 'selectiontype' => 'role', |
|
| 792 | + 'selectionid' => $defaultrule, |
|
| 793 | + 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
| 794 | 794 | } |
| 795 | 795 | return $participantlist; |
| 796 | 796 | } |
@@ -829,11 +829,11 @@ discard block |
||
| 829 | 829 | 'all' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
| 830 | 830 | 'role' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
| 831 | 831 | 'user' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
| 832 | - ], |
|
| 832 | + ], |
|
| 833 | 833 | 'type_selected' => 'all', |
| 834 | 834 | 'options' => ['all' => '---------------'], |
| 835 | 835 | 'selected' => 'all', |
| 836 | - ]; |
|
| 836 | + ]; |
|
| 837 | 837 | } |
| 838 | 838 | |
| 839 | 839 | /** |
@@ -1152,7 +1152,7 @@ discard block |
||
| 1152 | 1152 | // Ping again and refresh the cache. |
| 1153 | 1153 | $meetinginfo = (array) bigbluebuttonbn_wrap_xml_load_file( |
| 1154 | 1154 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
| 1155 | - ); |
|
| 1155 | + ); |
|
| 1156 | 1156 | $cache->set($meetingid, array('creation_time' => time(), 'meeting_info' => json_encode($meetinginfo))); |
| 1157 | 1157 | return $meetinginfo; |
| 1158 | 1158 | } |
@@ -1566,8 +1566,8 @@ discard block |
||
| 1566 | 1566 | } |
| 1567 | 1567 | $id = 'playbacks-'.$recording['recordID']; |
| 1568 | 1568 | $recordingtypes = html_writer::start_tag('div', array('id' => $id, 'data-imported' => $dataimported, |
| 1569 | - 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
| 1570 | - 'title' => $title, $visibility => $visibility)); |
|
| 1569 | + 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
| 1570 | + 'title' => $title, $visibility => $visibility)); |
|
| 1571 | 1571 | foreach ($recording['playbacks'] as $playback) { |
| 1572 | 1572 | $recordingtypes .= bigbluebuttonbn_get_recording_data_row_type($recording, $bbbsession, $playback); |
| 1573 | 1573 | } |
@@ -1591,7 +1591,7 @@ discard block |
||
| 1591 | 1591 | } |
| 1592 | 1592 | $text = get_string('view_recording_format_'.$playback['type'], 'bigbluebuttonbn'); |
| 1593 | 1593 | $href = $CFG->wwwroot . '/mod/bigbluebuttonbn/bbb_view.php?action=play&bn=' . $bbbsession['bigbluebuttonbn']->id . |
| 1594 | - '&mid='.$recording['meetingID'] . '&rid=' . $recording['recordID'] . '&rtype=' . $playback['type']; |
|
| 1594 | + '&mid='.$recording['meetingID'] . '&rid=' . $recording['recordID'] . '&rtype=' . $playback['type']; |
|
| 1595 | 1595 | if (!isset($recording['imported']) || !isset($recording['protected']) || $recording['protected'] === 'false') { |
| 1596 | 1596 | $href .= '&href='.urlencode(trim($playback['url'])); |
| 1597 | 1597 | } |
@@ -1602,7 +1602,7 @@ discard block |
||
| 1602 | 1602 | 'data-action' => 'play', |
| 1603 | 1603 | 'data-target' => $playback['type'], |
| 1604 | 1604 | 'data-href' => $href, |
| 1605 | - ); |
|
| 1605 | + ); |
|
| 1606 | 1606 | if (!bigbluebuttonbn_is_bn_server() && !bigbluebuttonbn_is_valid_resource(trim($playback['url']))) { |
| 1607 | 1607 | $linkattributes['class'] = 'btn btn-sm btn-warning'; |
| 1608 | 1608 | $linkattributes['title'] = get_string('view_recording_format_errror_unreachable', 'bigbluebuttonbn'); |
@@ -1767,10 +1767,10 @@ discard block |
||
| 1767 | 1767 | 'id' => $id, |
| 1768 | 1768 | 'onclick' => $onclick, |
| 1769 | 1769 | 'data-action' => $data['action'] |
| 1770 | - ); |
|
| 1770 | + ); |
|
| 1771 | 1771 | if (!isset($recording['imported'])) { |
| 1772 | 1772 | $linkattributes['data-links'] = bigbluebuttonbn_count_recording_imported_instances( |
| 1773 | - $recording['recordID']); |
|
| 1773 | + $recording['recordID']); |
|
| 1774 | 1774 | } |
| 1775 | 1775 | if (isset($data['disabled'])) { |
| 1776 | 1776 | $iconattributes['class'] .= ' fa-' . $data['disabled']; |
@@ -2377,17 +2377,17 @@ discard block |
||
| 2377 | 2377 | function bigbluebuttonbn_get_instance_type_profiles() { |
| 2378 | 2378 | $instanceprofiles = array( |
| 2379 | 2379 | BIGBLUEBUTTONBN_TYPE_ALL => array('id' => BIGBLUEBUTTONBN_TYPE_ALL, |
| 2380 | - 'name' => get_string('instance_type_default', 'bigbluebuttonbn'), |
|
| 2381 | - 'features' => array('all')), |
|
| 2380 | + 'name' => get_string('instance_type_default', 'bigbluebuttonbn'), |
|
| 2381 | + 'features' => array('all')), |
|
| 2382 | 2382 | BIGBLUEBUTTONBN_TYPE_ROOM_ONLY => array('id' => BIGBLUEBUTTONBN_TYPE_ROOM_ONLY, |
| 2383 | - 'name' => get_string('instance_type_room_only', 'bigbluebuttonbn'), |
|
| 2384 | - 'features' => array('showroom', 'welcomemessage', 'voicebridge', 'waitformoderator', 'userlimit', |
|
| 2385 | - 'recording', 'sendnotifications', 'preuploadpresentation', 'permissions', 'schedule', 'groups', |
|
| 2386 | - 'modstandardelshdr', 'availabilityconditionsheader', 'tagshdr', 'competenciessection', |
|
| 2387 | - 'clienttype', 'completionattendance')), |
|
| 2383 | + 'name' => get_string('instance_type_room_only', 'bigbluebuttonbn'), |
|
| 2384 | + 'features' => array('showroom', 'welcomemessage', 'voicebridge', 'waitformoderator', 'userlimit', |
|
| 2385 | + 'recording', 'sendnotifications', 'preuploadpresentation', 'permissions', 'schedule', 'groups', |
|
| 2386 | + 'modstandardelshdr', 'availabilityconditionsheader', 'tagshdr', 'competenciessection', |
|
| 2387 | + 'clienttype', 'completionattendance')), |
|
| 2388 | 2388 | BIGBLUEBUTTONBN_TYPE_RECORDING_ONLY => array('id' => BIGBLUEBUTTONBN_TYPE_RECORDING_ONLY, |
| 2389 | - 'name' => get_string('instance_type_recording_only', 'bigbluebuttonbn'), |
|
| 2390 | - 'features' => array('showrecordings', 'importrecordings')) |
|
| 2389 | + 'name' => get_string('instance_type_recording_only', 'bigbluebuttonbn'), |
|
| 2390 | + 'features' => array('showrecordings', 'importrecordings')) |
|
| 2391 | 2391 | ); |
| 2392 | 2392 | return $instanceprofiles; |
| 2393 | 2393 | } |
@@ -2474,8 +2474,8 @@ discard block |
||
| 2474 | 2474 | $activitytime = ''; |
| 2475 | 2475 | if ($time) { |
| 2476 | 2476 | $activitytime = calendar_day_representation($time).' '. |
| 2477 | - get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2478 | - calendar_time_representation($time); |
|
| 2477 | + get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
| 2478 | + calendar_time_representation($time); |
|
| 2479 | 2479 | } |
| 2480 | 2480 | return $activitytime; |
| 2481 | 2481 | } |
@@ -2794,7 +2794,7 @@ discard block |
||
| 2794 | 2794 | $renderer->render_group_element('participant_moderator_default', |
| 2795 | 2795 | $renderer->render_group_element_configmultiselect('participant_moderator_default', |
| 2796 | 2796 | array_keys($owner), array_merge($owner, $roles)) |
| 2797 | - ); |
|
| 2797 | + ); |
|
| 2798 | 2798 | } |
| 2799 | 2799 | } |
| 2800 | 2800 | |
@@ -2830,7 +2830,7 @@ discard block |
||
| 2830 | 2830 | // Web Client default. |
| 2831 | 2831 | $default = intval((int)\mod_bigbluebuttonbn\locallib\config::get('clienttype_default')); |
| 2832 | 2832 | $choices = array(BIGBLUEBUTTON_CLIENTTYPE_FLASH => get_string('mod_form_block_clienttype_flash', 'bigbluebuttonbn'), |
| 2833 | - BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
| 2833 | + BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
| 2834 | 2834 | $renderer->render_group_element('clienttype_default', |
| 2835 | 2835 | $renderer->render_group_element_configselect('clienttype_default', |
| 2836 | 2836 | $default, $choices)); |
@@ -2941,7 +2941,7 @@ discard block |
||
| 2941 | 2941 | return $output; |
| 2942 | 2942 | } |
| 2943 | 2943 | $output .= $OUTPUT->box_start('box boxalignleft adminerror alert alert-' . $type . ' alert-block fade in', |
| 2944 | - 'bigbluebuttonbn_view_general_warning') . "\n"; |
|
| 2944 | + 'bigbluebuttonbn_view_general_warning') . "\n"; |
|
| 2945 | 2945 | $output .= ' ' . $message . "\n"; |
| 2946 | 2946 | $output .= ' <div class="singlebutton pull-right">' . "\n"; |
| 2947 | 2947 | if (!empty($href)) { |
@@ -3294,8 +3294,8 @@ discard block |
||
| 3294 | 3294 | array( |
| 3295 | 3295 | 'email' => array('"' . fullname($USER) . '" <' . $USER->email . '>'), |
| 3296 | 3296 | 'context' => $bbbsession['bigbluebuttonbnURL'] |
| 3297 | - ) |
|
| 3298 | - ); |
|
| 3297 | + ) |
|
| 3298 | + ); |
|
| 3299 | 3299 | } |
| 3300 | 3300 | if ((boolean)\mod_bigbluebuttonbn\locallib\config::get('recordingready_enabled')) { |
| 3301 | 3301 | $metadata['bn-recording-ready-url'] = $bbbsession['recordingReadyURL']; |