@@ -198,10 +198,10 @@ discard block |
||
| 198 | 198 | */ |
| 199 | 199 | function bigbluebutton_bbb_view_create_meeting_data(&$bbbsession) { |
| 200 | 200 | $data = ['meetingID' => $bbbsession['meetingid'], |
| 201 | - 'name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
| 202 | - 'attendeePW' => $bbbsession['viewerPW'], |
|
| 203 | - 'moderatorPW' => $bbbsession['modPW'], |
|
| 204 | - 'logoutURL' => $bbbsession['logoutURL'], |
|
| 201 | + 'name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
| 202 | + 'attendeePW' => $bbbsession['viewerPW'], |
|
| 203 | + 'moderatorPW' => $bbbsession['modPW'], |
|
| 204 | + 'logoutURL' => $bbbsession['logoutURL'], |
|
| 205 | 205 | ]; |
| 206 | 206 | $data['record'] = bigbluebutton_bbb_view_create_meeting_data_record($bbbsession['record']); |
| 207 | 207 | $data['welcome'] = trim($bbbsession['welcome']); |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | '%duration%', |
| 215 | 215 | (string) $durationtime, |
| 216 | 216 | get_string('bbbdurationwarning', 'bigbluebuttonbn') |
| 217 | - ); |
|
| 217 | + ); |
|
| 218 | 218 | } |
| 219 | 219 | $voicebridge = intval($bbbsession['voicebridge']); |
| 220 | 220 | if ($voicebridge > 0 && $voicebridge < 79999) { |
@@ -253,22 +253,22 @@ discard block |
||
| 253 | 253 | function bigbluebutton_bbb_view_create_meeting_metadata(&$bbbsession) { |
| 254 | 254 | global $USER; |
| 255 | 255 | $metadata = ['bbb-origin' => $bbbsession['origin'], |
| 256 | - 'bbb-origin-version' => $bbbsession['originVersion'], |
|
| 257 | - 'bbb-origin-server-name' => $bbbsession['originServerName'], |
|
| 258 | - 'bbb-origin-server-common-name' => $bbbsession['originServerCommonName'], |
|
| 259 | - 'bbb-origin-tag' => $bbbsession['originTag'], |
|
| 260 | - 'bbb-context' => $bbbsession['course']->fullname, |
|
| 261 | - 'bbb-recording-name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
| 262 | - 'bbb-recording-description' => bigbluebuttonbn_html2text($bbbsession['meetingdescription'], 64), |
|
| 263 | - 'bbb-recording-tags' => bigbluebuttonbn_get_tags($bbbsession['cm']->id), // Same as $id. |
|
| 256 | + 'bbb-origin-version' => $bbbsession['originVersion'], |
|
| 257 | + 'bbb-origin-server-name' => $bbbsession['originServerName'], |
|
| 258 | + 'bbb-origin-server-common-name' => $bbbsession['originServerCommonName'], |
|
| 259 | + 'bbb-origin-tag' => $bbbsession['originTag'], |
|
| 260 | + 'bbb-context' => $bbbsession['course']->fullname, |
|
| 261 | + 'bbb-recording-name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64), |
|
| 262 | + 'bbb-recording-description' => bigbluebuttonbn_html2text($bbbsession['meetingdescription'], 64), |
|
| 263 | + 'bbb-recording-tags' => bigbluebuttonbn_get_tags($bbbsession['cm']->id), // Same as $id. |
|
| 264 | 264 | ]; |
| 265 | 265 | if ((boolean)\mod_bigbluebuttonbn\locallib\config::get('recordingstatus_enabled')) { |
| 266 | 266 | $metadata["bn-recording-status"] = json_encode( |
| 267 | 267 | array( |
| 268 | 268 | 'email' => array('"' . fullname($USER) . '" <' . $USER->email . '>'), |
| 269 | 269 | 'context' => $bbbsession['bigbluebuttonbnURL'] |
| 270 | - ) |
|
| 271 | - ); |
|
| 270 | + ) |
|
| 271 | + ); |
|
| 272 | 272 | } |
| 273 | 273 | if ((boolean)\mod_bigbluebuttonbn\locallib\config::get('recordingready_enabled')) { |
| 274 | 274 | $metadata['bn-recording-ready-url'] = $bbbsession['recordingReadyURL']; |
@@ -77,8 +77,8 @@ |
||
| 77 | 77 | $body .= html_writer::start_tag('br'); |
| 78 | 78 | $body .= html_writer::tag('input', '', |
| 79 | 79 | array('type' => 'button', 'class' => 'btn btn-secondary', |
| 80 | - 'value' => get_string('view_recording_button_return', 'bigbluebuttonbn'), |
|
| 81 | - 'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$cm->id.'\'')); |
|
| 80 | + 'value' => get_string('view_recording_button_return', 'bigbluebuttonbn'), |
|
| 81 | + 'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$cm->id.'\'')); |
|
| 82 | 82 | // JavaScript for locales. |
| 83 | 83 | $PAGE->requires->strings_for_js(array_keys(bigbluebuttonbn_get_strings_for_js()), 'bigbluebuttonbn'); |
| 84 | 84 | // Require JavaScript modules. |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | * Remove this block when restored |
| 69 | 69 | */ |
| 70 | 70 | |
| 71 | - /** @var BIGBLUEBUTTONBN_DEFAULT_SERVER_URL string of default bigbluebutton server url */ |
|
| 71 | + /** @var BIGBLUEBUTTONBN_DEFAULT_SERVER_URL string of default bigbluebutton server url */ |
|
| 72 | 72 | const BIGBLUEBUTTONBN_DEFAULT_SERVER_URL = 'http://test-install.blindsidenetworks.com/bigbluebutton/'; |
| 73 | 73 | /** @var BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET string of default bigbluebutton server shared secret */ |
| 74 | 74 | const BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET = '8cd8ef52e8e101574e400365b55e11a6'; |
@@ -345,12 +345,12 @@ discard block |
||
| 345 | 345 | $str = '<div class="bigbluebuttonbn overview">'."\n"; |
| 346 | 346 | $str .= ' <div class="name">'.get_string('modulename', 'bigbluebuttonbn').': '."\n"; |
| 347 | 347 | $str .= ' <a '.$classes.'href="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bigbluebuttonbn->coursemodule. |
| 348 | - '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
| 348 | + '">'.$bigbluebuttonbn->name.'</a>'."\n"; |
|
| 349 | 349 | $str .= ' </div>'."\n"; |
| 350 | 350 | $str .= ' <div class="info">'.get_string($start, 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->openingtime). |
| 351 | 351 | '</div>'."\n"; |
| 352 | 352 | $str .= ' <div class="info">'.get_string('ends_at', 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->closingtime) |
| 353 | - .'</div>'."\n"; |
|
| 353 | + .'</div>'."\n"; |
|
| 354 | 354 | $str .= '</div>'."\n"; |
| 355 | 355 | return $str; |
| 356 | 356 | } |
@@ -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 | /** |
@@ -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. |
@@ -259,13 +259,13 @@ discard block |
||
| 259 | 259 | * $CFG->bigbluebuttonbn['recordings_imported_editable'] = 1; |
| 260 | 260 | */ |
| 261 | 261 | |
| 262 | - /* |
|
| 262 | + /* |
|
| 263 | 263 | * When the value is set to 1 (checked) the bigbluebuttonbn resources |
| 264 | 264 | * will show the recodings with thumbnails. |
| 265 | 265 | * $CFG->bigbluebuttonbn['recordings_preview_default'] = 1; |
| 266 | 266 | */ |
| 267 | 267 | |
| 268 | - /* |
|
| 268 | + /* |
|
| 269 | 269 | * When the value is set to 1 (checked) the 'preview ui' capability can be |
| 270 | 270 | * enabled/disabled by the user creating or editing the resource. |
| 271 | 271 | * $CFG->bigbluebuttonbn['recordings_preview_editable'] = 0; |
@@ -310,27 +310,27 @@ discard block |
||
| 310 | 310 | * $CFG->bigbluebuttonbn['general_warning_message'] = "Would you like to record your BigBlueButton sessions for later viewing? "; |
| 311 | 311 | */ |
| 312 | 312 | |
| 313 | - /* |
|
| 313 | + /* |
|
| 314 | 314 | * The warning box is always shown to administrators, but it is also possible to define other roles |
| 315 | 315 | * to whom the it will be shown. The roles are based on the shortnames defined by Moodle: |
| 316 | 316 | * 'manager,coursecreator,editingteacher,teacher,student,guest,user,frontpage' |
| 317 | 317 | * $CFG->bigbluebuttonbn['general_warning_roles'] = 'editingteacher,teacher'; |
| 318 | 318 | */ |
| 319 | 319 | |
| 320 | - /* |
|
| 320 | + /* |
|
| 321 | 321 | * As the general_warning_message is shown in a box, its type can be defined with general_warning_type |
| 322 | 322 | * The default type is 'info' which is normaly rendered in blue when using a bootstrap theme. |
| 323 | 323 | * All the modifiers for boxed in bootstrap can be used [info|success|warning|danger]. |
| 324 | 324 | * $CFG->bigbluebuttonbn['general_warning_box_type'] = 'info'; |
| 325 | 325 | */ |
| 326 | 326 | |
| 327 | - /* |
|
| 327 | + /* |
|
| 328 | 328 | * Additionally, when general_warning_button_href value is different than "", a button |
| 329 | 329 | * can also be shown right after the message. |
| 330 | 330 | * $CFG->bigbluebuttonbn['general_warning_button_href'] = "http://blindsidenetworks.com/"; |
| 331 | 331 | */ |
| 332 | 332 | |
| 333 | - /* |
|
| 333 | + /* |
|
| 334 | 334 | * Finally, the text and class for the button can be modified |
| 335 | 335 | * $CFG->bigbluebuttonbn['general_warning_button_text'] = "Upgrade your site"; |
| 336 | 336 | * $CFG->bigbluebuttonbn['general_warning_button_class'] = "btn btn-primary"; |
@@ -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) { |
@@ -434,12 +434,12 @@ discard block |
||
| 434 | 434 | $recordings = bigbluebuttonbn_get_recordings( |
| 435 | 435 | $bbbsession['course']->id, $bigbluebuttonbnid, $enabledfeatures['showroom'], |
| 436 | 436 | $bbbsession['bigbluebuttonbn']->recordings_deleted |
| 437 | - ); |
|
| 437 | + ); |
|
| 438 | 438 | if ($enabledfeatures['importrecordings']) { |
| 439 | 439 | // Get recording links. |
| 440 | 440 | $recordingsimported = bigbluebuttonbn_get_recordings_imported_array( |
| 441 | 441 | $bbbsession['course']->id, $bigbluebuttonbnid, $enabledfeatures['showroom'] |
| 442 | - ); |
|
| 442 | + ); |
|
| 443 | 443 | /* Perform aritmetic addition instead of merge so the imported recordings corresponding to existent |
| 444 | 444 | * recordings are not included. */ |
| 445 | 445 | if ($bbbsession['bigbluebuttonbn']->recordings_imported) { |
@@ -457,7 +457,7 @@ discard block |
||
| 457 | 457 | // JavaScript variables for recordings. |
| 458 | 458 | $jsvars += array( |
| 459 | 459 | 'recordings_html' => $bbbsession['bigbluebuttonbn']->recordings_html == '1', |
| 460 | - ); |
|
| 460 | + ); |
|
| 461 | 461 | // If there are meetings with recordings load the data to the table. |
| 462 | 462 | if ($bbbsession['bigbluebuttonbn']->recordings_html) { |
| 463 | 463 | // Render a plain html table. |
@@ -467,7 +467,7 @@ discard block |
||
| 467 | 467 | $jsvars += array( |
| 468 | 468 | 'columns' => bigbluebuttonbn_get_recording_columns($bbbsession), |
| 469 | 469 | 'data' => bigbluebuttonbn_get_recording_data($bbbsession, $recordings), |
| 470 | - ); |
|
| 470 | + ); |
|
| 471 | 471 | // Render a YUI table. |
| 472 | 472 | return html_writer::div('', '', array('id' => 'bigbluebuttonbn_recordings_table')); |
| 473 | 473 | } |
@@ -487,10 +487,10 @@ discard block |
||
| 487 | 487 | } |
| 488 | 488 | $button = html_writer::tag('input', '', |
| 489 | 489 | array('type' => 'button', |
| 490 | - 'value' => get_string('view_recording_button_import', 'bigbluebuttonbn'), |
|
| 491 | - 'class' => 'btn btn-secondary', |
|
| 492 | - 'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/import_view.php?bn='. |
|
| 493 | - $bbbsession['bigbluebuttonbn']->id.'\'')); |
|
| 490 | + 'value' => get_string('view_recording_button_import', 'bigbluebuttonbn'), |
|
| 491 | + 'class' => 'btn btn-secondary', |
|
| 492 | + 'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/import_view.php?bn='. |
|
| 493 | + $bbbsession['bigbluebuttonbn']->id.'\'')); |
|
| 494 | 494 | $output = html_writer::empty_tag('br'); |
| 495 | 495 | $output .= html_writer::tag('span', $button, array('id' => 'import_recording_links_button')); |
| 496 | 496 | $output .= html_writer::tag('span', '', array('id' => 'import_recording_links_table')); |
@@ -569,5 +569,5 @@ discard block |
||
| 569 | 569 | (string)\mod_bigbluebuttonbn\locallib\config::get('general_warning_button_href'), |
| 570 | 570 | (string)\mod_bigbluebuttonbn\locallib\config::get('general_warning_button_text'), |
| 571 | 571 | (string)\mod_bigbluebuttonbn\locallib\config::get('general_warning_button_class') |
| 572 | - ); |
|
| 572 | + ); |
|
| 573 | 573 | } |
@@ -152,33 +152,33 @@ |
||
| 152 | 152 | */ |
| 153 | 153 | public static function get_options() { |
| 154 | 154 | return array( |
| 155 | - 'version_major' => self::get_moodle_version_major(), |
|
| 156 | - 'voicebridge_editable' => self::get('voicebridge_editable'), |
|
| 157 | - 'importrecordings_enabled' => self::get('importrecordings_enabled'), |
|
| 158 | - 'importrecordings_from_deleted_enabled' => self::get('importrecordings_from_deleted_enabled'), |
|
| 159 | - 'waitformoderator_default' => self::get('waitformoderator_default'), |
|
| 160 | - 'waitformoderator_editable' => self::get('waitformoderator_editable'), |
|
| 161 | - 'userlimit_default' => self::get('userlimit_default'), |
|
| 162 | - 'userlimit_editable' => self::get('userlimit_editable'), |
|
| 163 | - 'preuploadpresentation_enabled' => self::get('preuploadpresentation_enabled'), |
|
| 164 | - 'sendnotifications_enabled' => self::get('sendnotifications_enabled'), |
|
| 165 | - 'recordings_enabled' => self::get('recordings_enabled'), |
|
| 166 | - 'recordings_html_default' => self::get('recordings_html_default'), |
|
| 167 | - 'recordings_html_editable' => self::get('recordings_html_editable'), |
|
| 168 | - 'recordings_deleted_default' => self::get('recordings_deleted_default'), |
|
| 169 | - 'recordings_deleted_editable' => self::get('recordings_deleted_editable'), |
|
| 170 | - 'recordings_imported_default' => self::get('recordings_imported_default'), |
|
| 171 | - 'recordings_imported_editable' => self::get('recordings_imported_editable'), |
|
| 172 | - 'recordings_preview_default' => self::get('recordings_preview_default'), |
|
| 173 | - 'recordings_preview_editable' => self::get('recordings_preview_editable'), |
|
| 174 | - 'recording_default' => self::get('recording_default'), |
|
| 175 | - 'recording_editable' => self::get('recording_editable'), |
|
| 176 | - 'recording_icons_enabled' => self::get('recording_icons_enabled'), |
|
| 177 | - 'general_warning_message' => self::get('general_warning_message'), |
|
| 178 | - 'general_warning_box_type' => self::get('general_warning_box_type'), |
|
| 179 | - 'general_warning_button_text' => self::get('general_warning_button_text'), |
|
| 180 | - 'general_warning_button_href' => self::get('general_warning_button_href'), |
|
| 181 | - 'general_warning_button_class' => self::get('general_warning_button_class'), |
|
| 182 | - ); |
|
| 155 | + 'version_major' => self::get_moodle_version_major(), |
|
| 156 | + 'voicebridge_editable' => self::get('voicebridge_editable'), |
|
| 157 | + 'importrecordings_enabled' => self::get('importrecordings_enabled'), |
|
| 158 | + 'importrecordings_from_deleted_enabled' => self::get('importrecordings_from_deleted_enabled'), |
|
| 159 | + 'waitformoderator_default' => self::get('waitformoderator_default'), |
|
| 160 | + 'waitformoderator_editable' => self::get('waitformoderator_editable'), |
|
| 161 | + 'userlimit_default' => self::get('userlimit_default'), |
|
| 162 | + 'userlimit_editable' => self::get('userlimit_editable'), |
|
| 163 | + 'preuploadpresentation_enabled' => self::get('preuploadpresentation_enabled'), |
|
| 164 | + 'sendnotifications_enabled' => self::get('sendnotifications_enabled'), |
|
| 165 | + 'recordings_enabled' => self::get('recordings_enabled'), |
|
| 166 | + 'recordings_html_default' => self::get('recordings_html_default'), |
|
| 167 | + 'recordings_html_editable' => self::get('recordings_html_editable'), |
|
| 168 | + 'recordings_deleted_default' => self::get('recordings_deleted_default'), |
|
| 169 | + 'recordings_deleted_editable' => self::get('recordings_deleted_editable'), |
|
| 170 | + 'recordings_imported_default' => self::get('recordings_imported_default'), |
|
| 171 | + 'recordings_imported_editable' => self::get('recordings_imported_editable'), |
|
| 172 | + 'recordings_preview_default' => self::get('recordings_preview_default'), |
|
| 173 | + 'recordings_preview_editable' => self::get('recordings_preview_editable'), |
|
| 174 | + 'recording_default' => self::get('recording_default'), |
|
| 175 | + 'recording_editable' => self::get('recording_editable'), |
|
| 176 | + 'recording_icons_enabled' => self::get('recording_icons_enabled'), |
|
| 177 | + 'general_warning_message' => self::get('general_warning_message'), |
|
| 178 | + 'general_warning_box_type' => self::get('general_warning_box_type'), |
|
| 179 | + 'general_warning_button_text' => self::get('general_warning_button_text'), |
|
| 180 | + 'general_warning_button_href' => self::get('general_warning_button_href'), |
|
| 181 | + 'general_warning_button_class' => self::get('general_warning_button_class'), |
|
| 182 | + ); |
|
| 183 | 183 | } |
| 184 | 184 | } |