Completed
Pull Request — v2.2-stable (#140)
by Jesus
01:51
created
bbb_view.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -198,10 +198,10 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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'];
Please login to merge, or discard this patch.
import_view.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,8 +77,8 @@
 block discarded – undo
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.
Please login to merge, or discard this patch.
lib.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
345 345
     $str  = '<div class="bigbluebuttonbn overview">'."\n";
346 346
     $str .= '  <div class="name">'.get_string('modulename', 'bigbluebuttonbn').':&nbsp;'."\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
 }
Please login to merge, or discard this patch.
config-dist.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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";
Please login to merge, or discard this patch.
classes/settings/renderer.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -205,7 +205,7 @@
 block discarded – undo
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
     /**
Please login to merge, or discard this patch.
classes/event/base.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.
classes/privacy/provider.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -61,11 +61,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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) {
Please login to merge, or discard this patch.
view.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -434,12 +434,12 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
bbb_broker.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -440,26 +440,26 @@  discard block
 block discarded – undo
440 440
             return array(
441 441
                 'status' => false,
442 442
                 'message' => get_string('view_recording_publish_link_deleted', 'bigbluebuttonbn')
443
-              );
443
+                );
444 444
         }
445 445
         if ($realrecordings[$params['id']]['published'] !== 'true') {
446 446
             return array(
447 447
                 'status' => false,
448 448
                 'message' => get_string('view_recording_publish_link_not_published', 'bigbluebuttonbn')
449
-              );
449
+                );
450 450
         }
451 451
         return array(
452 452
             'status' => bigbluebuttonbn_publish_recording_imported(
453 453
                 $recordings[$params['id']]['imported'], true
454 454
             )
455
-          );
455
+            );
456 456
     }
457 457
     // As the recordingid was not identified as imported recording link, execute actual publish.
458 458
     return array(
459 459
         'status' => bigbluebuttonbn_publish_recordings(
460 460
             $params['id'], 'true'
461 461
         )
462
-      );
462
+        );
463 463
 }
464 464
 
465 465
 /**
@@ -480,26 +480,26 @@  discard block
 block discarded – undo
480 480
             return array(
481 481
                 'status' => false,
482 482
                 'message' => get_string('view_recording_unprotect_link_deleted', 'bigbluebuttonbn')
483
-              );
483
+                );
484 484
         }
485 485
         if ($realrecordings[$params['id']]['protected'] === 'true') {
486 486
             return array(
487 487
                 'status' => false,
488 488
                 'message' => get_string('view_recording_unprotect_link_not_unprotected', 'bigbluebuttonbn')
489
-              );
489
+                );
490 490
         }
491 491
         return array(
492 492
             'status' => bigbluebuttonbn_protect_recording_imported(
493 493
                 $recordings[$params['id']]['imported'], false
494 494
             )
495
-          );
495
+            );
496 496
     }
497 497
     // As the recordingid was not identified as imported recording link, execute actual uprotect.
498 498
     return array(
499 499
         'status' => bigbluebuttonbn_update_recordings(
500 500
             $params['id'], array('protect' => 'false')
501 501
         )
502
-      );
502
+        );
503 503
 }
504 504
 
505 505
 /**
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
             'status' => bigbluebuttonbn_publish_recording_imported(
519 519
                 $recordings[$params['id']]['imported'], false
520 520
             )
521
-          );
521
+            );
522 522
     }
523 523
     // As the recordingid was not identified as imported recording link, execute unpublish on a real recording.
524 524
     // First: Unpublish imported links associated to the recording.
@@ -536,7 +536,7 @@  discard block
 block discarded – undo
536 536
         'status' => bigbluebuttonbn_publish_recordings(
537 537
             $params['id'], 'false'
538 538
         )
539
-      );
539
+        );
540 540
 }
541 541
 
542 542
 /**
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
             'status' => bigbluebuttonbn_protect_recording_imported(
556 556
                 $recordings[$params['id']]['imported'], true
557 557
             )
558
-          );
558
+            );
559 559
     }
560 560
     // As the recordingid was not identified as imported recording link, execute protect on a real recording.
561 561
     // First: Protect imported links associated to the recording.
@@ -573,7 +573,7 @@  discard block
 block discarded – undo
573 573
         'status' => bigbluebuttonbn_update_recordings(
574 574
             $params['id'], array('protect' => 'true')
575 575
         )
576
-      );
576
+        );
577 577
 }
578 578
 
579 579
 /**
@@ -592,7 +592,7 @@  discard block
 block discarded – undo
592 592
             'status' => bigbluebuttonbn_delete_recording_imported(
593 593
                 $recordings[$params['id']]['imported']
594 594
             )
595
-          );
595
+            );
596 596
     }
597 597
     // As the recordingid was not identified as imported recording link, execute delete on a real recording.
598 598
     // First: Delete imported links associated to the recording.
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
     // Second: Execute the actual delete.
607 607
     return array(
608 608
         'status' => bigbluebuttonbn_delete_recordings($params['id'])
609
-      );
609
+        );
610 610
 }
611 611
 
612 612
 /**
@@ -624,7 +624,7 @@  discard block
 block discarded – undo
624 624
             'status' => bigbluebuttonbn_update_recording_imported(
625 625
                 $recordings[$params['id']]['imported'], json_decode($params['meta'], true)
626 626
             )
627
-          );
627
+            );
628 628
     }
629 629
 
630 630
     // As the recordingid was not identified as imported recording link, execute update on a real recording.
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
         'status' => bigbluebuttonbn_update_recordings(
635 635
             $params['id'], json_decode($params['meta'])
636 636
         )
637
-      );
637
+        );
638 638
 }
639 639
 
640 640
 /**
@@ -800,11 +800,11 @@  discard block
 block discarded – undo
800 800
     $params['recording_ready'] = [
801 801
             'bigbluebuttonbn' => 'An id for the bigbluebuttonbn instance should be included.',
802 802
             'signed_parameters' => 'A JWT encoded string must be included as [signed_parameters].'
803
-          ];
803
+            ];
804 804
     $params['live_session_events'] = [
805 805
             'bigbluebuttonbn' => 'An id for the bigbluebuttonbn instance should be included.',
806 806
             'signed_parameters' => 'A JWT encoded string must be included as [signed_parameters].'
807
-          ];
807
+            ];
808 808
     return $params;
809 809
 }
810 810
 
@@ -815,9 +815,9 @@  discard block
 block discarded – undo
815 815
  */
816 816
 function bigbluebuttonbn_broker_required_parameters_default($id) {
817 817
     return [
818
-              'id' => "The {$id} must be specified.",
819
-              'callback' => 'This call must include a javascript callback.'
820
-           ];
818
+                'id' => "The {$id} must be specified.",
819
+                'callback' => 'This call must include a javascript callback.'
820
+            ];
821 821
 }
822 822
 
823 823
 /**
Please login to merge, or discard this patch.