@@ -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) { |
@@ -95,9 +95,9 @@ discard block |
||
95 | 95 | function bigbluebuttonbn_get_join_url($meetingid, $username, $pw, $logouturl, $configtoken = null, |
96 | 96 | $userid = null, $clienttype = BIGBLUEBUTTON_CLIENTTYPE_FLASH) { |
97 | 97 | $data = ['meetingID' => $meetingid, |
98 | - 'fullName' => $username, |
|
99 | - 'password' => $pw, |
|
100 | - 'logoutURL' => $logouturl, |
|
98 | + 'fullName' => $username, |
|
99 | + 'password' => $pw, |
|
100 | + 'logoutURL' => $logouturl, |
|
101 | 101 | ]; |
102 | 102 | // Choose between Adobe Flash or HTML5 Client. |
103 | 103 | if ( $clienttype == BIGBLUEBUTTON_CLIENTTYPE_HTML5 ) { |
@@ -153,23 +153,23 @@ discard block |
||
153 | 153 | function bigbluebuttonbn_get_meeting_info_array($meetingid) { |
154 | 154 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
155 | 155 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
156 | - ); |
|
156 | + ); |
|
157 | 157 | if ($xml && $xml->returncode == 'SUCCESS' && empty($xml->messageKey)) { |
158 | 158 | // Meeting info was returned. |
159 | 159 | return array('returncode' => $xml->returncode, |
160 | - 'meetingID' => $xml->meetingID, |
|
161 | - 'moderatorPW' => $xml->moderatorPW, |
|
162 | - 'attendeePW' => $xml->attendeePW, |
|
163 | - 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
164 | - 'running' => $xml->running, |
|
165 | - 'recording' => $xml->recording, |
|
166 | - 'startTime' => $xml->startTime, |
|
167 | - 'endTime' => $xml->endTime, |
|
168 | - 'participantCount' => $xml->participantCount, |
|
169 | - 'moderatorCount' => $xml->moderatorCount, |
|
170 | - 'attendees' => $xml->attendees, |
|
171 | - 'metadata' => $xml->metadata, |
|
172 | - ); |
|
160 | + 'meetingID' => $xml->meetingID, |
|
161 | + 'moderatorPW' => $xml->moderatorPW, |
|
162 | + 'attendeePW' => $xml->attendeePW, |
|
163 | + 'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded, |
|
164 | + 'running' => $xml->running, |
|
165 | + 'recording' => $xml->recording, |
|
166 | + 'startTime' => $xml->startTime, |
|
167 | + 'endTime' => $xml->endTime, |
|
168 | + 'participantCount' => $xml->participantCount, |
|
169 | + 'moderatorCount' => $xml->moderatorCount, |
|
170 | + 'attendees' => $xml->attendees, |
|
171 | + 'metadata' => $xml->metadata, |
|
172 | + ); |
|
173 | 173 | } |
174 | 174 | if ($xml) { |
175 | 175 | // Either failure or success without meeting info. |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | function bigbluebuttonbn_get_default_config_xml() { |
306 | 306 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
307 | 307 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getDefaultConfigXML') |
308 | - ); |
|
308 | + ); |
|
309 | 309 | return $xml; |
310 | 310 | } |
311 | 311 | |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | foreach ($ids as $id) { |
407 | 407 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
408 | 408 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('deleteRecordings', ['recordID' => $id]) |
409 | - ); |
|
409 | + ); |
|
410 | 410 | if ($xml && $xml->returncode != 'SUCCESS') { |
411 | 411 | return false; |
412 | 412 | } |
@@ -425,7 +425,7 @@ discard block |
||
425 | 425 | foreach ($ids as $id) { |
426 | 426 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
427 | 427 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('publishRecordings', ['recordID' => $id, 'publish' => $publish]) |
428 | - ); |
|
428 | + ); |
|
429 | 429 | if ($xml && $xml->returncode != 'SUCCESS') { |
430 | 430 | return false; |
431 | 431 | } |
@@ -444,7 +444,7 @@ discard block |
||
444 | 444 | foreach ($ids as $id) { |
445 | 445 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
446 | 446 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('updateRecordings', ['recordID' => $id] + (array) $params) |
447 | - ); |
|
447 | + ); |
|
448 | 448 | if ($xml && $xml->returncode != 'SUCCESS') { |
449 | 449 | return false; |
450 | 450 | } |
@@ -461,7 +461,7 @@ discard block |
||
461 | 461 | function bigbluebuttonbn_end_meeting($meetingid, $modpw) { |
462 | 462 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
463 | 463 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('end', ['meetingID' => $meetingid, 'password' => $modpw]) |
464 | - ); |
|
464 | + ); |
|
465 | 465 | if ($xml) { |
466 | 466 | // If the xml packet returned failure it displays the message to the user. |
467 | 467 | return array('returncode' => $xml->returncode, 'message' => $xml->message, 'messageKey' => $xml->messageKey); |
@@ -478,7 +478,7 @@ discard block |
||
478 | 478 | function bigbluebuttonbn_get_server_version() { |
479 | 479 | $xml = bigbluebuttonbn_wrap_xml_load_file( |
480 | 480 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url() |
481 | - ); |
|
481 | + ); |
|
482 | 482 | if ($xml && $xml->returncode == 'SUCCESS') { |
483 | 483 | return $xml->version; |
484 | 484 | } |
@@ -545,10 +545,10 @@ discard block |
||
545 | 545 | } |
546 | 546 | $options = array(); |
547 | 547 | $options['CURLOPT_HTTPHEADER'] = array( |
548 | - 'Content-Type: '.$contenttype, |
|
549 | - 'Content-Length: '.strlen($data), |
|
550 | - 'Content-Language: en-US', |
|
551 | - ); |
|
548 | + 'Content-Type: '.$contenttype, |
|
549 | + 'Content-Length: '.strlen($data), |
|
550 | + 'Content-Language: en-US', |
|
551 | + ); |
|
552 | 552 | |
553 | 553 | return $c->post($url, $data, $options); |
554 | 554 | } |
@@ -695,16 +695,16 @@ discard block |
||
695 | 695 | 'all' => array( |
696 | 696 | 'name' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
697 | 697 | 'children' => [] |
698 | - ) |
|
699 | - ); |
|
698 | + ) |
|
699 | + ); |
|
700 | 700 | $data['role'] = array( |
701 | 701 | 'name' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
702 | 702 | 'children' => bigbluebuttonbn_get_roles_select($context) |
703 | - ); |
|
703 | + ); |
|
704 | 704 | $data['user'] = array( |
705 | 705 | 'name' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
706 | 706 | 'children' => bigbluebuttonbn_get_users_select($context) |
707 | - ); |
|
707 | + ); |
|
708 | 708 | return $data; |
709 | 709 | } |
710 | 710 | |
@@ -747,7 +747,7 @@ discard block |
||
747 | 747 | 'selectiontype' => 'all', |
748 | 748 | 'selectionid' => 'all', |
749 | 749 | 'role' => BIGBLUEBUTTONBN_ROLE_VIEWER |
750 | - ); |
|
750 | + ); |
|
751 | 751 | $defaultrules = explode(',', \mod_bigbluebuttonbn\locallib\config::get('participant_moderator_default')); |
752 | 752 | foreach ($defaultrules as $defaultrule) { |
753 | 753 | if ($defaultrule == '0') { |
@@ -760,9 +760,9 @@ discard block |
||
760 | 760 | continue; |
761 | 761 | } |
762 | 762 | $participantlist[] = array( |
763 | - 'selectiontype' => 'role', |
|
764 | - 'selectionid' => $defaultrule, |
|
765 | - 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
763 | + 'selectiontype' => 'role', |
|
764 | + 'selectionid' => $defaultrule, |
|
765 | + 'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR); |
|
766 | 766 | } |
767 | 767 | return $participantlist; |
768 | 768 | } |
@@ -801,11 +801,11 @@ discard block |
||
801 | 801 | 'all' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'), |
802 | 802 | 'role' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'), |
803 | 803 | 'user' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'), |
804 | - ], |
|
804 | + ], |
|
805 | 805 | 'type_selected' => 'all', |
806 | 806 | 'options' => ['all' => '---------------'], |
807 | 807 | 'selected' => 'all', |
808 | - ]; |
|
808 | + ]; |
|
809 | 809 | } |
810 | 810 | |
811 | 811 | /** |
@@ -1080,7 +1080,7 @@ discard block |
||
1080 | 1080 | // Ping again and refresh the cache. |
1081 | 1081 | $meetinginfo = (array) bigbluebuttonbn_wrap_xml_load_file( |
1082 | 1082 | \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid]) |
1083 | - ); |
|
1083 | + ); |
|
1084 | 1084 | $cache->set($meetingid, array('creation_time' => time(), 'meeting_info' => json_encode($meetinginfo))); |
1085 | 1085 | return $meetinginfo; |
1086 | 1086 | } |
@@ -1492,8 +1492,8 @@ discard block |
||
1492 | 1492 | } |
1493 | 1493 | $id = 'playbacks-'.$recording['recordID']; |
1494 | 1494 | $recordingtypes = html_writer::start_tag('div', array('id' => $id, 'data-imported' => $dataimported, |
1495 | - 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
1496 | - 'title' => $title, $visibility => $visibility)); |
|
1495 | + 'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'], |
|
1496 | + 'title' => $title, $visibility => $visibility)); |
|
1497 | 1497 | foreach ($recording['playbacks'] as $playback) { |
1498 | 1498 | $recordingtypes .= bigbluebuttonbn_get_recording_data_row_type($recording, $bbbsession, $playback); |
1499 | 1499 | } |
@@ -1517,7 +1517,7 @@ discard block |
||
1517 | 1517 | } |
1518 | 1518 | $text = get_string('view_recording_format_'.$playback['type'], 'bigbluebuttonbn'); |
1519 | 1519 | $href = $CFG->wwwroot . '/mod/bigbluebuttonbn/bbb_view.php?action=play&bn=' . $bbbsession['bigbluebuttonbn']->id . |
1520 | - '&mid='.$recording['meetingID'] . '&rid=' . $recording['recordID'] . '&rtype=' . $playback['type']; |
|
1520 | + '&mid='.$recording['meetingID'] . '&rid=' . $recording['recordID'] . '&rtype=' . $playback['type']; |
|
1521 | 1521 | if (!isset($recording['imported']) || !isset($recording['protected']) || $recording['protected'] === 'false') { |
1522 | 1522 | $href .= '&href='.urlencode(trim($playback['url'])); |
1523 | 1523 | } |
@@ -1528,7 +1528,7 @@ discard block |
||
1528 | 1528 | 'data-action' => 'play', |
1529 | 1529 | 'data-target' => $playback['type'], |
1530 | 1530 | 'data-href' => $href, |
1531 | - ); |
|
1531 | + ); |
|
1532 | 1532 | if (!bigbluebuttonbn_is_bn_server() && !bigbluebuttonbn_is_valid_resource(trim($playback['url']))) { |
1533 | 1533 | $linkattributes['class'] = 'btn btn-sm btn-warning'; |
1534 | 1534 | $linkattributes['title'] = get_string('view_recording_format_errror_unreachable', 'bigbluebuttonbn'); |
@@ -1678,10 +1678,10 @@ discard block |
||
1678 | 1678 | 'id' => $id, |
1679 | 1679 | 'onclick' => $onclick, |
1680 | 1680 | 'data-action' => $data['action'] |
1681 | - ); |
|
1681 | + ); |
|
1682 | 1682 | if (!isset($recording['imported'])) { |
1683 | 1683 | $linkattributes['data-links'] = bigbluebuttonbn_count_recording_imported_instances( |
1684 | - $recording['recordID']); |
|
1684 | + $recording['recordID']); |
|
1685 | 1685 | } |
1686 | 1686 | if (isset($data['disabled'])) { |
1687 | 1687 | $iconattributes['class'] .= ' fa-' . $data['disabled']; |
@@ -2167,17 +2167,17 @@ discard block |
||
2167 | 2167 | function bigbluebuttonbn_get_instance_type_profiles() { |
2168 | 2168 | $instanceprofiles = array( |
2169 | 2169 | BIGBLUEBUTTONBN_TYPE_ALL => array('id' => BIGBLUEBUTTONBN_TYPE_ALL, |
2170 | - 'name' => get_string('instance_type_default', 'bigbluebuttonbn'), |
|
2171 | - 'features' => array('all')), |
|
2170 | + 'name' => get_string('instance_type_default', 'bigbluebuttonbn'), |
|
2171 | + 'features' => array('all')), |
|
2172 | 2172 | BIGBLUEBUTTONBN_TYPE_ROOM_ONLY => array('id' => BIGBLUEBUTTONBN_TYPE_ROOM_ONLY, |
2173 | - 'name' => get_string('instance_type_room_only', 'bigbluebuttonbn'), |
|
2174 | - 'features' => array('showroom', 'welcomemessage', 'voicebridge', 'waitformoderator', 'userlimit', |
|
2175 | - 'recording', 'sendnotifications', 'preuploadpresentation', 'permissions', 'schedule', 'groups', |
|
2176 | - 'modstandardelshdr', 'availabilityconditionsheader', 'tagshdr', 'competenciessection', |
|
2177 | - 'clienttype')), |
|
2173 | + 'name' => get_string('instance_type_room_only', 'bigbluebuttonbn'), |
|
2174 | + 'features' => array('showroom', 'welcomemessage', 'voicebridge', 'waitformoderator', 'userlimit', |
|
2175 | + 'recording', 'sendnotifications', 'preuploadpresentation', 'permissions', 'schedule', 'groups', |
|
2176 | + 'modstandardelshdr', 'availabilityconditionsheader', 'tagshdr', 'competenciessection', |
|
2177 | + 'clienttype')), |
|
2178 | 2178 | BIGBLUEBUTTONBN_TYPE_RECORDING_ONLY => array('id' => BIGBLUEBUTTONBN_TYPE_RECORDING_ONLY, |
2179 | - 'name' => get_string('instance_type_recording_only', 'bigbluebuttonbn'), |
|
2180 | - 'features' => array('showrecordings', 'importrecordings')) |
|
2179 | + 'name' => get_string('instance_type_recording_only', 'bigbluebuttonbn'), |
|
2180 | + 'features' => array('showrecordings', 'importrecordings')) |
|
2181 | 2181 | ); |
2182 | 2182 | return $instanceprofiles; |
2183 | 2183 | } |
@@ -2244,8 +2244,8 @@ discard block |
||
2244 | 2244 | $activitytime = ''; |
2245 | 2245 | if ($time) { |
2246 | 2246 | $activitytime = calendar_day_representation($time).' '. |
2247 | - get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
2248 | - calendar_time_representation($time); |
|
2247 | + get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '. |
|
2248 | + calendar_time_representation($time); |
|
2249 | 2249 | } |
2250 | 2250 | return $activitytime; |
2251 | 2251 | } |
@@ -2545,7 +2545,7 @@ discard block |
||
2545 | 2545 | $renderer->render_group_element('participant_moderator_default', |
2546 | 2546 | $renderer->render_group_element_configmultiselect('participant_moderator_default', |
2547 | 2547 | array_keys($owner), array_merge($owner, $roles)) |
2548 | - ); |
|
2548 | + ); |
|
2549 | 2549 | } |
2550 | 2550 | } |
2551 | 2551 | |
@@ -2581,7 +2581,7 @@ discard block |
||
2581 | 2581 | // Web Client default. |
2582 | 2582 | $default = intval((int)\mod_bigbluebuttonbn\locallib\config::get('clienttype_default')); |
2583 | 2583 | $choices = array(BIGBLUEBUTTON_CLIENTTYPE_FLASH => get_string('mod_form_block_clienttype_flash', 'bigbluebuttonbn'), |
2584 | - BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
2584 | + BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn')); |
|
2585 | 2585 | $renderer->render_group_element('clienttype_default', |
2586 | 2586 | $renderer->render_group_element_configselect('clienttype_default', |
2587 | 2587 | $default, $choices)); |
@@ -2674,7 +2674,7 @@ discard block |
||
2674 | 2674 | return $output; |
2675 | 2675 | } |
2676 | 2676 | $output .= $OUTPUT->box_start('box boxalignleft adminerror alert alert-' . $type . ' alert-block fade in', |
2677 | - 'bigbluebuttonbn_view_general_warning') . "\n"; |
|
2677 | + 'bigbluebuttonbn_view_general_warning') . "\n"; |
|
2678 | 2678 | $output .= ' ' . $message . "\n"; |
2679 | 2679 | $output .= ' <div class="singlebutton pull-right">' . "\n"; |
2680 | 2680 | if (!empty($href)) { |
@@ -304,10 +304,10 @@ discard block |
||
304 | 304 | */ |
305 | 305 | function bigbluebutton_bbb_view_create_meeting_data(&$bbbsession) { |
306 | 306 | $data = ['meetingID' => $bbbsession['meetingid'], |
307 | - 'name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
308 | - 'attendeePW' => $bbbsession['viewerPW'], |
|
309 | - 'moderatorPW' => $bbbsession['modPW'], |
|
310 | - 'logoutURL' => $bbbsession['logoutURL'], |
|
307 | + 'name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
308 | + 'attendeePW' => $bbbsession['viewerPW'], |
|
309 | + 'moderatorPW' => $bbbsession['modPW'], |
|
310 | + 'logoutURL' => $bbbsession['logoutURL'], |
|
311 | 311 | ]; |
312 | 312 | $data['record'] = bigbluebutton_bbb_view_create_meeting_data_record($bbbsession['record']); |
313 | 313 | // Check if auto_start_record is enable. |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | '%duration%', |
330 | 330 | (string) $durationtime, |
331 | 331 | get_string('bbbdurationwarning', 'bigbluebuttonbn') |
332 | - ); |
|
332 | + ); |
|
333 | 333 | } |
334 | 334 | $voicebridge = intval($bbbsession['voicebridge']); |
335 | 335 | if ($voicebridge > 0 && $voicebridge < 79999) { |
@@ -380,22 +380,22 @@ discard block |
||
380 | 380 | function bigbluebutton_bbb_view_create_meeting_metadata(&$bbbsession) { |
381 | 381 | global $USER; |
382 | 382 | $metadata = ['bbb-origin' => $bbbsession['origin'], |
383 | - 'bbb-origin-version' => $bbbsession['originVersion'], |
|
384 | - 'bbb-origin-server-name' => $bbbsession['originServerName'], |
|
385 | - 'bbb-origin-server-common-name' => $bbbsession['originServerCommonName'], |
|
386 | - 'bbb-origin-tag' => $bbbsession['originTag'], |
|
387 | - 'bbb-context' => $bbbsession['course']->fullname, |
|
388 | - 'bbb-recording-name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
389 | - 'bbb-recording-description' => bigbluebuttonbn_html2text($bbbsession['meetingdescription'], 64), |
|
390 | - 'bbb-recording-tags' => bigbluebuttonbn_get_tags($bbbsession['cm']->id), // Same as $id. |
|
383 | + 'bbb-origin-version' => $bbbsession['originVersion'], |
|
384 | + 'bbb-origin-server-name' => $bbbsession['originServerName'], |
|
385 | + 'bbb-origin-server-common-name' => $bbbsession['originServerCommonName'], |
|
386 | + 'bbb-origin-tag' => $bbbsession['originTag'], |
|
387 | + 'bbb-context' => $bbbsession['course']->fullname, |
|
388 | + 'bbb-recording-name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
389 | + 'bbb-recording-description' => bigbluebuttonbn_html2text($bbbsession['meetingdescription'], 64), |
|
390 | + 'bbb-recording-tags' => bigbluebuttonbn_get_tags($bbbsession['cm']->id), // Same as $id. |
|
391 | 391 | ]; |
392 | 392 | if ((boolean)\mod_bigbluebuttonbn\locallib\config::get('recordingstatus_enabled')) { |
393 | 393 | $metadata["bn-recording-status"] = json_encode( |
394 | 394 | array( |
395 | 395 | 'email' => array('"' . fullname($USER) . '" <' . $USER->email . '>'), |
396 | 396 | 'context' => $bbbsession['bigbluebuttonbnURL'] |
397 | - ) |
|
398 | - ); |
|
397 | + ) |
|
398 | + ); |
|
399 | 399 | } |
400 | 400 | if ((boolean)\mod_bigbluebuttonbn\locallib\config::get('recordingready_enabled')) { |
401 | 401 | $metadata['bn-recording-ready-url'] = $bbbsession['recordingReadyURL']; |
@@ -171,42 +171,42 @@ |
||
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 | - '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 | - ); |
|
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 | + '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 | } |
@@ -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 | } |
@@ -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 | /** |
@@ -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; |