@@ -283,28 +283,28 @@ discard block |
||
283 | 283 | |
284 | 284 | if ($bbbsession['tagging'] && ($bbbsession['administrator'] || $bbbsession['moderator'])) { |
285 | 285 | echo '' . |
286 | - '<div id="panelContent" class="hidden">' . "\n" . |
|
287 | - ' <div class="yui3-widget-bd">' . "\n" . |
|
288 | - ' <form>' . "\n" . |
|
289 | - ' <fieldset>' . "\n" . |
|
290 | - ' <input type="hidden" name="join" id="meeting_join_url" value="">' . "\n" . |
|
291 | - ' <input type="hidden" name="message" id="meeting_message" value="">' . "\n" . |
|
292 | - ' <div>' . "\n" . |
|
293 | - ' <label for="name">' . get_string('view_recording_name', 'bigbluebuttonbn') . '</label><br/>' . "\n" . |
|
294 | - ' <input type="text" name="name" id="recording_name" placeholder="">' . "\n" . |
|
295 | - ' </div><br>' . "\n" . |
|
296 | - ' <div>' . "\n" . |
|
297 | - ' <label for="description">' . get_string('view_recording_description', 'bigbluebuttonbn') . '</label><br/>' . "\n" . |
|
298 | - ' <input type="text" name="description" id="recording_description" value="" placeholder="">' . "\n" . |
|
299 | - ' </div><br>' . "\n" . |
|
300 | - ' <div>' . "\n" . |
|
301 | - ' <label for="tags">' . get_string('view_recording_tags', 'bigbluebuttonbn') . '</label><br/>' . "\n" . |
|
302 | - ' <input type="text" name="tags" id="recording_tags" value="" placeholder="">' . "\n" . |
|
303 | - ' </div>' . "\n" . |
|
304 | - ' </fieldset>' . "\n" . |
|
305 | - ' </form>' . "\n" . |
|
306 | - ' </div>' . "\n" . |
|
307 | - '</div>'; |
|
286 | + '<div id="panelContent" class="hidden">' . "\n" . |
|
287 | + ' <div class="yui3-widget-bd">' . "\n" . |
|
288 | + ' <form>' . "\n" . |
|
289 | + ' <fieldset>' . "\n" . |
|
290 | + ' <input type="hidden" name="join" id="meeting_join_url" value="">' . "\n" . |
|
291 | + ' <input type="hidden" name="message" id="meeting_message" value="">' . "\n" . |
|
292 | + ' <div>' . "\n" . |
|
293 | + ' <label for="name">' . get_string('view_recording_name', 'bigbluebuttonbn') . '</label><br/>' . "\n" . |
|
294 | + ' <input type="text" name="name" id="recording_name" placeholder="">' . "\n" . |
|
295 | + ' </div><br>' . "\n" . |
|
296 | + ' <div>' . "\n" . |
|
297 | + ' <label for="description">' . get_string('view_recording_description', 'bigbluebuttonbn') . '</label><br/>' . "\n" . |
|
298 | + ' <input type="text" name="description" id="recording_description" value="" placeholder="">' . "\n" . |
|
299 | + ' </div><br>' . "\n" . |
|
300 | + ' <div>' . "\n" . |
|
301 | + ' <label for="tags">' . get_string('view_recording_tags', 'bigbluebuttonbn') . '</label><br/>' . "\n" . |
|
302 | + ' <input type="text" name="tags" id="recording_tags" value="" placeholder="">' . "\n" . |
|
303 | + ' </div>' . "\n" . |
|
304 | + ' </fieldset>' . "\n" . |
|
305 | + ' </form>' . "\n" . |
|
306 | + ' </div>' . "\n" . |
|
307 | + '</div>'; |
|
308 | 308 | } |
309 | 309 | } |
310 | 310 | |
@@ -316,8 +316,8 @@ discard block |
||
316 | 316 | $icon = new pix_icon($bbbsession['presentation']['icon'], $bbbsession['presentation']['mimetype_description']); |
317 | 317 | |
318 | 318 | echo '<h4>' . get_string('view_section_title_presentation', 'bigbluebuttonbn') . '</h4>' . |
319 | - '' . $OUTPUT->action_icon($bbbsession['presentation']['url'], $icon, null, array(), false) . '' . |
|
320 | - '' . $OUTPUT->action_link($bbbsession['presentation']['url'], $bbbsession['presentation']['name'], null, $attributes) . '<br><br>'; |
|
319 | + '' . $OUTPUT->action_icon($bbbsession['presentation']['url'], $icon, null, array(), false) . '' . |
|
320 | + '' . $OUTPUT->action_link($bbbsession['presentation']['url'], $bbbsession['presentation']['name'], null, $attributes) . '<br><br>'; |
|
321 | 321 | } |
322 | 322 | } |
323 | 323 |
@@ -84,8 +84,9 @@ discard block |
||
84 | 84 | $bbbsession['voicebridge'] = ($bigbluebuttonbn->voicebridge > 0) ? 70000 + $bigbluebuttonbn->voicebridge : $bigbluebuttonbn->voicebridge; |
85 | 85 | $bbbsession['wait'] = $bigbluebuttonbn->wait; |
86 | 86 | $bbbsession['record'] = $bigbluebuttonbn->record; |
87 | -if ($bigbluebuttonbn->record) |
|
87 | +if ($bigbluebuttonbn->record) { |
|
88 | 88 | $bbbsession['welcome'] .= '<br><br>' . get_string('bbbrecordwarning', 'bigbluebuttonbn'); |
89 | +} |
|
89 | 90 | $bbbsession['tagging'] = $bigbluebuttonbn->tagging; |
90 | 91 | |
91 | 92 | $bbbsession['openingtime'] = $bigbluebuttonbn->openingtime; |
@@ -112,22 +113,24 @@ discard block |
||
112 | 113 | // Validates if the BigBlueButton server is running |
113 | 114 | $serverVersion = bigbluebuttonbn_getServerVersion($bbbsession['endpoint']); |
114 | 115 | if (!isset($serverVersion)) { //Server is not working |
115 | - if ($bbbsession['administrator']) |
|
116 | - print_error('view_error_unable_join', 'bigbluebuttonbn', $CFG->wwwroot . '/admin/settings.php?section=modsettingbigbluebuttonbn'); |
|
117 | - else if ($bbbsession['moderator']) |
|
118 | - print_error('view_error_unable_join_teacher', 'bigbluebuttonbn', $CFG->wwwroot . '/course/view.php?id=' . $bigbluebuttonbn->course); |
|
119 | - else |
|
120 | - print_error('view_error_unable_join_student', 'bigbluebuttonbn', $CFG->wwwroot . '/course/view.php?id=' . $bigbluebuttonbn->course); |
|
121 | -} else { |
|
122 | - $xml = bigbluebuttonbn_wrap_xml_load_file(bigbluebuttonbn_getMeetingsURL($bbbsession['endpoint'], $bbbsession['shared_secret'])); |
|
123 | - if (!isset($xml) || !isset($xml->returncode) || $xml->returncode == 'FAILED') { // The shared secret is wrong |
|
124 | - if ($bbbsession['administrator']) |
|
116 | + if ($bbbsession['administrator']) { |
|
125 | 117 | print_error('view_error_unable_join', 'bigbluebuttonbn', $CFG->wwwroot . '/admin/settings.php?section=modsettingbigbluebuttonbn'); |
126 | - else if ($bbbsession['moderator']) |
|
118 | + } else if ($bbbsession['moderator']) { |
|
127 | 119 | print_error('view_error_unable_join_teacher', 'bigbluebuttonbn', $CFG->wwwroot . '/course/view.php?id=' . $bigbluebuttonbn->course); |
128 | - else |
|
120 | + } else { |
|
129 | 121 | print_error('view_error_unable_join_student', 'bigbluebuttonbn', $CFG->wwwroot . '/course/view.php?id=' . $bigbluebuttonbn->course); |
130 | 122 | } |
123 | + } else { |
|
124 | + $xml = bigbluebuttonbn_wrap_xml_load_file(bigbluebuttonbn_getMeetingsURL($bbbsession['endpoint'], $bbbsession['shared_secret'])); |
|
125 | + if (!isset($xml) || !isset($xml->returncode) || $xml->returncode == 'FAILED') { // The shared secret is wrong |
|
126 | + if ($bbbsession['administrator']) { |
|
127 | + print_error('view_error_unable_join', 'bigbluebuttonbn', $CFG->wwwroot . '/admin/settings.php?section=modsettingbigbluebuttonbn'); |
|
128 | + } else if ($bbbsession['moderator']) { |
|
129 | + print_error('view_error_unable_join_teacher', 'bigbluebuttonbn', $CFG->wwwroot . '/course/view.php?id=' . $bigbluebuttonbn->course); |
|
130 | + } else { |
|
131 | + print_error('view_error_unable_join_student', 'bigbluebuttonbn', $CFG->wwwroot . '/course/view.php?id=' . $bigbluebuttonbn->course); |
|
132 | + } |
|
133 | + } |
|
131 | 134 | } |
132 | 135 | |
133 | 136 | // Mark viewed by user (if required) |
@@ -338,7 +341,9 @@ discard block |
||
338 | 341 | } |
339 | 342 | //Generates the meetingID string |
340 | 343 | foreach ($mIDs as $mID) { |
341 | - if (strlen($meetingID) > 0) $meetingID .= ','; |
|
344 | + if (strlen($meetingID) > 0) { |
|
345 | + $meetingID .= ','; |
|
346 | + } |
|
342 | 347 | $meetingID .= $mID; |
343 | 348 | } |
344 | 349 | } |