Completed
Pull Request — master (#49)
by
unknown
02:33
created
classes/settings/validator.php 2 patches
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.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 defined('MOODLE_INTERNAL') || die();
29 29
 
30 30
 require_once($CFG->dirroot . '/mod/bigbluebuttonbn/locallib.php');
31
-require_once($CFG->libdir.'/adminlib.php');
31
+require_once($CFG->libdir . '/adminlib.php');
32 32
 
33 33
 /**
34 34
  * Helper class for validating settings used HTML for settings.php.
Please login to merge, or discard this patch.
view.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -444,12 +444,12 @@  discard block
 block discarded – undo
444 444
     $recordings = bigbluebuttonbn_get_recordings(
445 445
         $bbbsession['course']->id, $bigbluebuttonbnid, $enabledfeatures['showroom'],
446 446
         $bbbsession['bigbluebuttonbn']->recordings_deleted
447
-      );
447
+        );
448 448
     if ($enabledfeatures['importrecordings']) {
449 449
         // Get recording links.
450 450
         $recordingsimported = bigbluebuttonbn_get_recordings_imported_array(
451 451
             $bbbsession['course']->id, $bigbluebuttonbnid, $enabledfeatures['showroom']
452
-          );
452
+            );
453 453
         /* Perform aritmetic addition instead of merge so the imported recordings corresponding to existent
454 454
          * recordings are not included. */
455 455
         $recordings += $recordingsimported;
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
     // JavaScript variables for recordings.
464 464
     $jsvars += array(
465 465
             'recordings_html' => $bbbsession['bigbluebuttonbn']->recordings_html == '1',
466
-          );
466
+            );
467 467
     // If there are meetings with recordings load the data to the table.
468 468
     if ($bbbsession['bigbluebuttonbn']->recordings_html) {
469 469
         // Render a plain html table.
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
     $jsvars += array(
474 474
             'columns' => bigbluebuttonbn_get_recording_columns($bbbsession),
475 475
             'data' => bigbluebuttonbn_get_recording_data($bbbsession, $recordings),
476
-          );
476
+            );
477 477
     // Render a YUI table.
478 478
     return html_writer::div('', '', array('id' => 'bigbluebuttonbn_recordings_table'));
479 479
 }
@@ -493,10 +493,10 @@  discard block
 block discarded – undo
493 493
     }
494 494
     $button = html_writer::tag('input', '',
495 495
         array('type' => 'button',
496
-              'value' => get_string('view_recording_button_import', 'bigbluebuttonbn'),
497
-              'class' => 'btn btn-secondary',
498
-              'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/import_view.php?bn='.
499
-                  $bbbsession['bigbluebuttonbn']->id.'\''));
496
+                'value' => get_string('view_recording_button_import', 'bigbluebuttonbn'),
497
+                'class' => 'btn btn-secondary',
498
+                'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/import_view.php?bn='.
499
+                    $bbbsession['bigbluebuttonbn']->id.'\''));
500 500
     $output  = html_writer::empty_tag('br');
501 501
     $output .= html_writer::tag('span', $button, array('id' => 'import_recording_links_button'));
502 502
     $output .= html_writer::tag('span', '', array('id' => 'import_recording_links_table'));
Please login to merge, or discard this patch.
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
24 24
  * @author    Fred Dixon  (ffdixon [at] blindsidenetworks [dt] com)
25 25
  */
26 26
 
27
-require_once(dirname(dirname(dirname(__FILE__))).'/config.php');
28
-require_once(dirname(__FILE__).'/locallib.php');
27
+require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
28
+require_once(dirname(__FILE__) . '/locallib.php');
29 29
 
30 30
 $id = required_param('id', PARAM_INT);
31 31
 $bn = optional_param('n', 0, PARAM_INT);
@@ -60,19 +60,19 @@  discard block
 block discarded – undo
60 60
 if (is_null($serverversion)) {
61 61
     if ($bbbsession['administrator']) {
62 62
         print_error('view_error_unable_join', 'bigbluebuttonbn',
63
-            $CFG->wwwroot.'/admin/settings.php?section=modsettingbigbluebuttonbn');
63
+            $CFG->wwwroot . '/admin/settings.php?section=modsettingbigbluebuttonbn');
64 64
         exit;
65 65
     }
66 66
     if ($bbbsession['moderator']) {
67 67
         print_error('view_error_unable_join_teacher', 'bigbluebuttonbn',
68
-            $CFG->wwwroot.'/course/view.php?id='.$bigbluebuttonbn->course);
68
+            $CFG->wwwroot . '/course/view.php?id=' . $bigbluebuttonbn->course);
69 69
         exit;
70 70
     }
71 71
     print_error('view_error_unable_join_student', 'bigbluebuttonbn',
72
-        $CFG->wwwroot.'/course/view.php?id='.$bigbluebuttonbn->course);
72
+        $CFG->wwwroot . '/course/view.php?id=' . $bigbluebuttonbn->course);
73 73
     exit;
74 74
 }
75
-$bbbsession['serverversion'] = (string) $serverversion;
75
+$bbbsession['serverversion'] = (string)$serverversion;
76 76
 
77 77
 // Mark viewed by user (if required).
78 78
 $completion = new completion_info($course);
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 
81 81
 // Print the page header.
82 82
 $PAGE->set_context($context);
83
-$PAGE->set_url($CFG->wwwroot.'/mod/bigbluebuttonbn/view.php', array('id' => $cm->id));
83
+$PAGE->set_url($CFG->wwwroot . '/mod/bigbluebuttonbn/view.php', array('id' => $cm->id));
84 84
 $PAGE->set_title(format_string($bigbluebuttonbn->name));
85 85
 $PAGE->set_cacheable(false);
86 86
 $PAGE->set_heading($course->fullname);
@@ -90,11 +90,11 @@  discard block
 block discarded – undo
90 90
 if (!has_capability('moodle/category:manage', $context) && !has_capability('mod/bigbluebuttonbn:join', $context)) {
91 91
     echo $OUTPUT->header();
92 92
     if (isguestuser()) {
93
-        echo $OUTPUT->confirm('<p>'.get_string('view_noguests', 'bigbluebuttonbn').'</p>'.get_string('liketologin'),
94
-            get_login_url(), $CFG->wwwroot.'/course/view.php?id='.$course->id);
93
+        echo $OUTPUT->confirm('<p>' . get_string('view_noguests', 'bigbluebuttonbn') . '</p>' . get_string('liketologin'),
94
+            get_login_url(), $CFG->wwwroot . '/course/view.php?id=' . $course->id);
95 95
     } else {
96
-        echo $OUTPUT->confirm('<p>'.get_string('view_nojoin', 'bigbluebuttonbn').'</p>'.get_string('liketologin'),
97
-            get_login_url(), $CFG->wwwroot.'/course/view.php?id='.$course->id);
96
+        echo $OUTPUT->confirm('<p>' . get_string('view_nojoin', 'bigbluebuttonbn') . '</p>' . get_string('liketologin'),
97
+            get_login_url(), $CFG->wwwroot . '/course/view.php?id=' . $course->id);
98 98
     }
99 99
     echo $OUTPUT->footer();
100 100
     exit;
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 
103 103
 // Operation URLs.
104 104
 $bbbsession['bigbluebuttonbnURL'] = $CFG->wwwroot . '/mod/bigbluebuttonbn/view.php?id=' . $bbbsession['cm']->id;
105
-$bbbsession['logoutURL'] = $CFG->wwwroot . '/mod/bigbluebuttonbn/bbb_view.php?action=logout&id='.$id .
105
+$bbbsession['logoutURL'] = $CFG->wwwroot . '/mod/bigbluebuttonbn/bbb_view.php?action=logout&id=' . $id .
106 106
     '&bn=' . $bbbsession['bigbluebuttonbn']->id;
107 107
 $bbbsession['recordingReadyURL'] = $CFG->wwwroot . '/mod/bigbluebuttonbn/bbb_broker.php?action=recording_' .
108 108
     'ready&bigbluebuttonbn=' . $bbbsession['bigbluebuttonbn']->id;
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 echo $OUTPUT->footer();
123 123
 
124 124
 // Shows version as a comment.
125
-echo '<!-- '.$bbbsession['originTag'].' -->'."\n";
125
+echo '<!-- ' . $bbbsession['originTag'] . ' -->' . "\n";
126 126
 
127 127
 // Initialize session variable used across views.
128 128
 $SESSION->bigbluebuttonbn_bbbsession = $bbbsession;
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
     $bbbsession['modPW'] = $bbbsession['bigbluebuttonbn']->moderatorpass;
152 152
     $bbbsession['viewerPW'] = $bbbsession['bigbluebuttonbn']->viewerpass;
153 153
     // Database info related to the activity.
154
-    $bbbsession['meetingid'] = $bbbsession['bigbluebuttonbn']->meetingid.'-'.$bbbsession['course']->id.'-'.
154
+    $bbbsession['meetingid'] = $bbbsession['bigbluebuttonbn']->meetingid . '-' . $bbbsession['course']->id . '-' .
155 155
         $bbbsession['bigbluebuttonbn']->id;
156 156
     $bbbsession['meetingname'] = $bbbsession['bigbluebuttonbn']->name;
157 157
     $bbbsession['meetingdescription'] = $bbbsession['bigbluebuttonbn']->intro;
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
         $bbbsession['welcome'] = get_string('mod_form_field_welcome_default', 'bigbluebuttonbn');
172 172
     }
173 173
     if ($bbbsession['bigbluebuttonbn']->record) {
174
-        $bbbsession['welcome'] .= '<br><br>'.get_string('bbbrecordwarning', 'bigbluebuttonbn');
174
+        $bbbsession['welcome'] .= '<br><br>' . get_string('bbbrecordwarning', 'bigbluebuttonbn');
175 175
     }
176 176
     $bbbsession['openingtime'] = $bbbsession['bigbluebuttonbn']->openingtime;
177 177
     $bbbsession['closingtime'] = $bbbsession['bigbluebuttonbn']->closingtime;
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
     $bbbsession['originServerName'] = $parsedurl['host'];
185 185
     $bbbsession['originServerUrl'] = $CFG->wwwroot;
186 186
     $bbbsession['originServerCommonName'] = '';
187
-    $bbbsession['originTag'] = 'moodle-mod_bigbluebuttonbn ('.get_config('mod_bigbluebuttonbn', 'version').')';
187
+    $bbbsession['originTag'] = 'moodle-mod_bigbluebuttonbn (' . get_config('mod_bigbluebuttonbn', 'version') . ')';
188 188
     $bbbsession['bnserver'] = bigbluebuttonbn_is_bn_server();
189 189
 }
190 190
 
@@ -242,8 +242,8 @@  discard block
 block discarded – undo
242 242
         $groupname = groups_get_group_name($bbbsession['group']);
243 243
     }
244 244
     // Assign group default values.
245
-    $bbbsession['meetingid'] .= '['.$bbbsession['group'].']';
246
-    $bbbsession['meetingname'] .= ' ('.$groupname.')';
245
+    $bbbsession['meetingid'] .= '[' . $bbbsession['group'] . ']';
246
+    $bbbsession['meetingname'] .= ' (' . $groupname . ')';
247 247
     if (count($groups) == 0) {
248 248
         // Only the All participants group exists.
249 249
         bigbluebuttonbn_view_message_box($bbbsession, get_string('view_groups_notenrolled_warning', 'bigbluebuttonbn'), 'info');
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
         return;
255 255
     }
256 256
     bigbluebuttonbn_view_message_box($bbbsession, get_string('view_groups_selection_warning', 'bigbluebuttonbn'));
257
-    $urltoroot = $CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bbbsession['cm']->id;
257
+    $urltoroot = $CFG->wwwroot . '/mod/bigbluebuttonbn/view.php?id=' . $bbbsession['cm']->id;
258 258
     groups_print_activity_menu($bbbsession['cm'], $urltoroot);
259 259
     echo '<br><br>';
260 260
 }
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
         'locale' => bigbluebuttonbn_get_localcode(), 'profile_features' => $typeprofiles[0]['features']);
302 302
     // Renders general warning when configured.
303 303
     $cfg = \mod_bigbluebuttonbn\locallib\config::get_options();
304
-    $output  = '';
304
+    $output = '';
305 305
     if (bigbluebuttonbn_view_warning_shown($bbbsession)) {
306 306
         $output .= bigbluebuttonbn_render_warning(
307 307
             (string)$cfg['general_warning_message'],
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
         $recordingsdisabled = get_string('view_message_recordings_disabled', 'bigbluebuttonbn');
328 328
         $output .= bigbluebuttonbn_render_warning($recordingsdisabled, 'danger');
329 329
     }
330
-    echo $output.html_writer::empty_tag('br').html_writer::empty_tag('br').html_writer::empty_tag('br');
330
+    echo $output . html_writer::empty_tag('br') . html_writer::empty_tag('br') . html_writer::empty_tag('br');
331 331
     $PAGE->requires->yui_module('moodle-mod_bigbluebuttonbn-broker', 'M.mod_bigbluebuttonbn.broker.init', array($jsvars));
332 332
 }
333 333
 
@@ -396,12 +396,12 @@  discard block
 block discarded – undo
396 396
     // JavaScript variables for room.
397 397
     $openingtime = '';
398 398
     if ($bbbsession['openingtime']) {
399
-        $openingtime = get_string('mod_form_field_openingtime', 'bigbluebuttonbn').': '.
399
+        $openingtime = get_string('mod_form_field_openingtime', 'bigbluebuttonbn') . ': ' .
400 400
             userdate($bbbsession['openingtime']);
401 401
     }
402 402
     $closingtime = '';
403 403
     if ($bbbsession['closingtime']) {
404
-        $closingtime = get_string('mod_form_field_closingtime', 'bigbluebuttonbn').': '.
404
+        $closingtime = get_string('mod_form_field_closingtime', 'bigbluebuttonbn') . ': ' .
405 405
             userdate($bbbsession['closingtime']);
406 406
     }
407 407
     $jsvars += array(
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
     $output .= $OUTPUT->box_end();
419 419
     // Action button box.
420 420
     $output .= $OUTPUT->box_start('generalbox boxaligncenter', 'bigbluebuttonbn_view_action_button_box');
421
-    $output .= '<br><br><span id="join_button"></span>&nbsp;<span id="end_button"></span>'."\n";
421
+    $output .= '<br><br><span id="join_button"></span>&nbsp;<span id="end_button"></span>' . "\n";
422 422
     $output .= $OUTPUT->box_end();
423 423
     if ($activity == 'ended') {
424 424
         $output .= bigbluebuttonbn_view_ended($bbbsession);
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
467 467
     // If there are meetings with recordings load the data to the table.
468 468
     if ($bbbsession['bigbluebuttonbn']->recordings_html) {
469 469
         // Render a plain html table.
470
-        return bigbluebuttonbn_output_recording_table($bbbsession, $recordings)."\n";
470
+        return bigbluebuttonbn_output_recording_table($bbbsession, $recordings) . "\n";
471 471
     }
472 472
     // JavaScript variables for recordings with YUI.
473 473
     $jsvars += array(
@@ -495,8 +495,8 @@  discard block
 block discarded – undo
495 495
         array('type' => 'button',
496 496
               'value' => get_string('view_recording_button_import', 'bigbluebuttonbn'),
497 497
               'class' => 'btn btn-secondary',
498
-              'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/import_view.php?bn='.
499
-                  $bbbsession['bigbluebuttonbn']->id.'\''));
498
+              'onclick' => 'window.location=\'' . $CFG->wwwroot . '/mod/bigbluebuttonbn/import_view.php?bn=' .
499
+                  $bbbsession['bigbluebuttonbn']->id . '\''));
500 500
     $output  = html_writer::empty_tag('br');
501 501
     $output .= html_writer::tag('span', $button, array('id' => 'import_recording_links_button'));
502 502
     $output .= html_writer::tag('span', '', array('id' => 'import_recording_links_table'));
@@ -515,10 +515,10 @@  discard block
 block discarded – undo
515 515
     if (!is_null($bbbsession['presentation']['url'])) {
516 516
         $attributes = array('title' => $bbbsession['presentation']['name']);
517 517
         $icon = new pix_icon($bbbsession['presentation']['icon'], $bbbsession['presentation']['mimetype_description']);
518
-        return '<h4>'.get_string('view_section_title_presentation', 'bigbluebuttonbn').'</h4>'.
519
-                $OUTPUT->action_icon($bbbsession['presentation']['url'], $icon, null, array(), false).
518
+        return '<h4>' . get_string('view_section_title_presentation', 'bigbluebuttonbn') . '</h4>' .
519
+                $OUTPUT->action_icon($bbbsession['presentation']['url'], $icon, null, array(), false) .
520 520
                 $OUTPUT->action_link($bbbsession['presentation']['url'],
521
-                $bbbsession['presentation']['name'], null, $attributes).'<br><br>';
521
+                $bbbsession['presentation']['name'], null, $attributes) . '<br><br>';
522 522
     }
523 523
     return '';
524 524
 }
Please login to merge, or discard this patch.