@@ -93,7 +93,7 @@ |
||
93 | 93 | } else { |
94 | 94 | $getArray = bigbluebuttonbn_wrap_xml_load_file(bigbluebuttonbn_getEndMeetingURL( $meetingID, $modPW, $endpoint, $shared_secret )); |
95 | 95 | } |
96 | - redirect('index.php?id='.$id); |
|
96 | + redirect('index.php?id='.$id); |
|
97 | 97 | } |
98 | 98 | } |
99 | 99 |
@@ -53,9 +53,9 @@ |
||
53 | 53 | $returnid = $DB->insert_record('bigbluebuttonbn_log', $log); |
54 | 54 | } |
55 | 55 | |
56 | - //////////////////////////// |
|
56 | + //////////////////////////// |
|
57 | 57 | // BigBlueButton API Calls // |
58 | - //////////////////////////// |
|
58 | + //////////////////////////// |
|
59 | 59 | function bigbluebuttonbn_getJoinURL( $meetingID, $userName, $PW, $SALT, $URL ) { |
60 | 60 | $url_join = $URL."api/join?"; |
61 | 61 | $params = 'meetingID='.urlencode($meetingID).'&fullName='.urlencode($userName).'&password='.urlencode($PW); |
@@ -190,27 +190,27 @@ |
||
190 | 190 | |
191 | 191 | //// Configuration for "scheduled duration" feature |
192 | 192 | if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_scheduled_duration_enabled) ) { |
193 | - $settings->add( new admin_setting_heading('config_scheduled', |
|
194 | - get_string('config_scheduled', 'bigbluebuttonbn'), |
|
195 | - get_string('config_scheduled_description', 'bigbluebuttonbn'))); |
|
193 | + $settings->add( new admin_setting_heading('config_scheduled', |
|
194 | + get_string('config_scheduled', 'bigbluebuttonbn'), |
|
195 | + get_string('config_scheduled_description', 'bigbluebuttonbn'))); |
|
196 | 196 | |
197 | - // calculated duration for 'scheduled session' feature |
|
198 | - $settings->add(new admin_setting_configcheckbox('bigbluebuttonbn_scheduled_duration_enabled', |
|
199 | - get_string('config_scheduled_duration_enabled', 'bigbluebuttonbn'), |
|
200 | - get_string('config_scheduled_duration_enabled_description', 'bigbluebuttonbn'), |
|
201 | - 1)); |
|
197 | + // calculated duration for 'scheduled session' feature |
|
198 | + $settings->add(new admin_setting_configcheckbox('bigbluebuttonbn_scheduled_duration_enabled', |
|
199 | + get_string('config_scheduled_duration_enabled', 'bigbluebuttonbn'), |
|
200 | + get_string('config_scheduled_duration_enabled_description', 'bigbluebuttonbn'), |
|
201 | + 1)); |
|
202 | 202 | |
203 | - // compensatory time for 'scheduled session' feature |
|
204 | - $settings->add(new admin_setting_configtext('bigbluebuttonbn_scheduled_duration_compensation', |
|
205 | - get_string('config_scheduled_duration_compensation', 'bigbluebuttonbn'), |
|
206 | - get_string('config_scheduled_duration_compensation_description', 'bigbluebuttonbn'), |
|
207 | - 10, PARAM_INT)); |
|
203 | + // compensatory time for 'scheduled session' feature |
|
204 | + $settings->add(new admin_setting_configtext('bigbluebuttonbn_scheduled_duration_compensation', |
|
205 | + get_string('config_scheduled_duration_compensation', 'bigbluebuttonbn'), |
|
206 | + get_string('config_scheduled_duration_compensation_description', 'bigbluebuttonbn'), |
|
207 | + 10, PARAM_INT)); |
|
208 | 208 | |
209 | - // pre-opening time for 'scheduled session' feature |
|
210 | - $settings->add(new admin_setting_configtext('bigbluebuttonbn_scheduled_pre_opening', |
|
211 | - get_string('config_scheduled_pre_opening', 'bigbluebuttonbn'), |
|
212 | - get_string('config_scheduled_pre_opening_description', 'bigbluebuttonbn'), |
|
213 | - 10, PARAM_INT)); |
|
209 | + // pre-opening time for 'scheduled session' feature |
|
210 | + $settings->add(new admin_setting_configtext('bigbluebuttonbn_scheduled_pre_opening', |
|
211 | + get_string('config_scheduled_pre_opening', 'bigbluebuttonbn'), |
|
212 | + get_string('config_scheduled_pre_opening_description', 'bigbluebuttonbn'), |
|
213 | + 10, PARAM_INT)); |
|
214 | 214 | } |
215 | 215 | |
216 | 216 | //// Configuration for defining the default role/user that will be moderator on new activities |
@@ -183,30 +183,30 @@ discard block |
||
183 | 183 | $mform->setType('participants', PARAM_TEXT); |
184 | 184 | |
185 | 185 | $html_participant_selection = ''. |
186 | - '<div id="fitem_bigbluebuttonbn_participant_selection" class="fitem fitem_fselect">'."\n". |
|
187 | - ' <div class="fitemtitle">'."\n". |
|
188 | - ' <label for="bigbluebuttonbn_participant_selectiontype">'.get_string('mod_form_field_participant_add', 'bigbluebuttonbn').' </label>'."\n". |
|
189 | - ' </div>'."\n". |
|
190 | - ' <div class="felement fselect">'."\n". |
|
191 | - ' <select id="bigbluebuttonbn_participant_selection_type" onchange="bigbluebuttonbn_participant_selection_set(); return 0;">'."\n". |
|
192 | - ' <option value="all" selected="selected">'.get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn').'</option>'."\n". |
|
193 | - ' <option value="role">'.get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn').'</option>'."\n". |
|
194 | - ' <option value="user">'.get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn').'</option>'."\n". |
|
195 | - ' </select>'."\n". |
|
196 | - ' '."\n". |
|
197 | - ' <select id="bigbluebuttonbn_participant_selection" disabled="disabled">'."\n". |
|
198 | - ' <option value="all" selected="selected">---------------</option>'."\n". |
|
199 | - ' </select>'."\n". |
|
200 | - ' '."\n". |
|
201 | - ' <input value="'.get_string('mod_form_field_participant_list_action_add', 'bigbluebuttonbn').'" type="button" id="id_addselectionid" onclick="bigbluebuttonbn_participant_add(); return 0;" />'."\n". |
|
202 | - ' </div>'."\n". |
|
203 | - '</div>'."\n". |
|
204 | - '<div id="fitem_bigbluebuttonbn_participant_list" class="fitem">'."\n". |
|
205 | - ' <div class="fitemtitle">'."\n". |
|
206 | - ' <label for="bigbluebuttonbn_participant_list">'.get_string('mod_form_field_participant_list', 'bigbluebuttonbn').' </label>'."\n". |
|
207 | - ' </div>'."\n". |
|
208 | - ' <div class="felement fselect">'."\n". |
|
209 | - ' <table id="participant_list_table">'."\n"; |
|
186 | + '<div id="fitem_bigbluebuttonbn_participant_selection" class="fitem fitem_fselect">'."\n". |
|
187 | + ' <div class="fitemtitle">'."\n". |
|
188 | + ' <label for="bigbluebuttonbn_participant_selectiontype">'.get_string('mod_form_field_participant_add', 'bigbluebuttonbn').' </label>'."\n". |
|
189 | + ' </div>'."\n". |
|
190 | + ' <div class="felement fselect">'."\n". |
|
191 | + ' <select id="bigbluebuttonbn_participant_selection_type" onchange="bigbluebuttonbn_participant_selection_set(); return 0;">'."\n". |
|
192 | + ' <option value="all" selected="selected">'.get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn').'</option>'."\n". |
|
193 | + ' <option value="role">'.get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn').'</option>'."\n". |
|
194 | + ' <option value="user">'.get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn').'</option>'."\n". |
|
195 | + ' </select>'."\n". |
|
196 | + ' '."\n". |
|
197 | + ' <select id="bigbluebuttonbn_participant_selection" disabled="disabled">'."\n". |
|
198 | + ' <option value="all" selected="selected">---------------</option>'."\n". |
|
199 | + ' </select>'."\n". |
|
200 | + ' '."\n". |
|
201 | + ' <input value="'.get_string('mod_form_field_participant_list_action_add', 'bigbluebuttonbn').'" type="button" id="id_addselectionid" onclick="bigbluebuttonbn_participant_add(); return 0;" />'."\n". |
|
202 | + ' </div>'."\n". |
|
203 | + '</div>'."\n". |
|
204 | + '<div id="fitem_bigbluebuttonbn_participant_list" class="fitem">'."\n". |
|
205 | + ' <div class="fitemtitle">'."\n". |
|
206 | + ' <label for="bigbluebuttonbn_participant_list">'.get_string('mod_form_field_participant_list', 'bigbluebuttonbn').' </label>'."\n". |
|
207 | + ' </div>'."\n". |
|
208 | + ' <div class="felement fselect">'."\n". |
|
209 | + ' <table id="participant_list_table">'."\n"; |
|
210 | 210 | |
211 | 211 | // Add participant list |
212 | 212 | foreach($participant_list as $participant){ |
@@ -243,11 +243,11 @@ discard block |
||
243 | 243 | } |
244 | 244 | |
245 | 245 | $html_participant_selection .= ''. |
246 | - ' </table>'."\n". |
|
247 | - ' </div>'."\n". |
|
248 | - '</div>'."\n". |
|
249 | - '<script type="text/javascript" src="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/mod_form.js">'."\n". |
|
250 | - '</script>'."\n"; |
|
246 | + ' </table>'."\n". |
|
247 | + ' </div>'."\n". |
|
248 | + '</div>'."\n". |
|
249 | + '<script type="text/javascript" src="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/mod_form.js">'."\n". |
|
250 | + '</script>'."\n"; |
|
251 | 251 | |
252 | 252 | $mform->addElement('html', $html_participant_selection); |
253 | 253 | |
@@ -255,9 +255,9 @@ discard block |
||
255 | 255 | $mform->addElement('html', '<script type="text/javascript">var bigbluebuttonbn_participant_selection = {"all": [], "role": '.json_encode($roles).', "user": '.bigbluebuttonbn_get_users_json($users).'}; </script>'); |
256 | 256 | $mform->addElement('html', '<script type="text/javascript">var bigbluebuttonbn_participant_list = '.json_encode($participant_list).'; </script>'); |
257 | 257 | $bigbluebuttonbn_strings = Array( "as" => get_string('mod_form_field_participant_list_text_as', 'bigbluebuttonbn'), |
258 | - "viewer" => get_string('mod_form_field_participant_bbb_role_viewer', 'bigbluebuttonbn'), |
|
259 | - "moderator" => get_string('mod_form_field_participant_bbb_role_moderator', 'bigbluebuttonbn'), |
|
260 | - "remove" => get_string('mod_form_field_participant_list_action_remove', 'bigbluebuttonbn'), |
|
258 | + "viewer" => get_string('mod_form_field_participant_bbb_role_viewer', 'bigbluebuttonbn'), |
|
259 | + "moderator" => get_string('mod_form_field_participant_bbb_role_moderator', 'bigbluebuttonbn'), |
|
260 | + "remove" => get_string('mod_form_field_participant_list_action_remove', 'bigbluebuttonbn'), |
|
261 | 261 | ); |
262 | 262 | $mform->addElement('html', '<script type="text/javascript">var bigbluebuttonbn_strings = '.json_encode($bigbluebuttonbn_strings).'; </script>'); |
263 | 263 | //------------------------------------------------------------------------------- |
@@ -36,11 +36,11 @@ |
||
36 | 36 | |
37 | 37 | // Define each element separated |
38 | 38 | $bigbluebuttonbn = new backup_nested_element('bigbluebuttonbn', array('id'), array( |
39 | - 'course', 'name', 'intro', 'introformat', 'meetingid', |
|
40 | - 'moderatorpass', 'viewerpass', 'wait', 'record', 'tagging', |
|
41 | - 'welcome', 'voicebridge', 'openingtime', 'closingtime', |
|
42 | - 'timecreated', 'timemodified', 'presentation', 'participants', |
|
43 | - 'userlimit')); |
|
39 | + 'course', 'name', 'intro', 'introformat', 'meetingid', |
|
40 | + 'moderatorpass', 'viewerpass', 'wait', 'record', 'tagging', |
|
41 | + 'welcome', 'voicebridge', 'openingtime', 'closingtime', |
|
42 | + 'timecreated', 'timemodified', 'presentation', 'participants', |
|
43 | + 'userlimit')); |
|
44 | 44 | |
45 | 45 | $logs = new backup_nested_element('logs'); |
46 | 46 |
@@ -49,7 +49,7 @@ |
||
49 | 49 | switch (strtolower($action)) { |
50 | 50 | case 'logout': |
51 | 51 | if (isset($errors) && $errors != '') { |
52 | - bigbluebutton_bbb_view_errors($errors, $id); |
|
52 | + bigbluebutton_bbb_view_errors($errors, $id); |
|
53 | 53 | |
54 | 54 | } else if ( isset($bbbsession) && !is_null($bbbsession) ) { |
55 | 55 | /// Moodle event logger: Create an event for meeting left |
@@ -289,28 +289,28 @@ discard block |
||
289 | 289 | |
290 | 290 | if( $bbbsession['tagging'] && ($bbbsession['administrator'] || $bbbsession['moderator']) ){ |
291 | 291 | echo ''. |
292 | - '<div id="panelContent" class="hidden">'."\n". |
|
293 | - ' <div class="yui3-widget-bd">'."\n". |
|
294 | - ' <form>'."\n". |
|
295 | - ' <fieldset>'."\n". |
|
296 | - ' <input type="hidden" name="join" id="meeting_join_url" value="">'."\n". |
|
297 | - ' <input type="hidden" name="message" id="meeting_message" value="">'."\n". |
|
298 | - ' <div>'."\n". |
|
299 | - ' <label for="name">'.get_string('view_recording_name', 'bigbluebuttonbn').'</label><br/>'."\n". |
|
300 | - ' <input type="text" name="name" id="recording_name" placeholder="">'."\n". |
|
301 | - ' </div><br>'."\n". |
|
302 | - ' <div>'."\n". |
|
303 | - ' <label for="description">'.get_string('view_recording_description', 'bigbluebuttonbn').'</label><br/>'."\n". |
|
304 | - ' <input type="text" name="description" id="recording_description" value="" placeholder="">'."\n". |
|
305 | - ' </div><br>'."\n". |
|
306 | - ' <div>'."\n". |
|
307 | - ' <label for="tags">'.get_string('view_recording_tags', 'bigbluebuttonbn').'</label><br/>'."\n". |
|
308 | - ' <input type="text" name="tags" id="recording_tags" value="" placeholder="">'."\n". |
|
309 | - ' </div>'."\n". |
|
310 | - ' </fieldset>'."\n". |
|
311 | - ' </form>'."\n". |
|
312 | - ' </div>'."\n". |
|
313 | - '</div>'; |
|
292 | + '<div id="panelContent" class="hidden">'."\n". |
|
293 | + ' <div class="yui3-widget-bd">'."\n". |
|
294 | + ' <form>'."\n". |
|
295 | + ' <fieldset>'."\n". |
|
296 | + ' <input type="hidden" name="join" id="meeting_join_url" value="">'."\n". |
|
297 | + ' <input type="hidden" name="message" id="meeting_message" value="">'."\n". |
|
298 | + ' <div>'."\n". |
|
299 | + ' <label for="name">'.get_string('view_recording_name', 'bigbluebuttonbn').'</label><br/>'."\n". |
|
300 | + ' <input type="text" name="name" id="recording_name" placeholder="">'."\n". |
|
301 | + ' </div><br>'."\n". |
|
302 | + ' <div>'."\n". |
|
303 | + ' <label for="description">'.get_string('view_recording_description', 'bigbluebuttonbn').'</label><br/>'."\n". |
|
304 | + ' <input type="text" name="description" id="recording_description" value="" placeholder="">'."\n". |
|
305 | + ' </div><br>'."\n". |
|
306 | + ' <div>'."\n". |
|
307 | + ' <label for="tags">'.get_string('view_recording_tags', 'bigbluebuttonbn').'</label><br/>'."\n". |
|
308 | + ' <input type="text" name="tags" id="recording_tags" value="" placeholder="">'."\n". |
|
309 | + ' </div>'."\n". |
|
310 | + ' </fieldset>'."\n". |
|
311 | + ' </form>'."\n". |
|
312 | + ' </div>'."\n". |
|
313 | + '</div>'; |
|
314 | 314 | } |
315 | 315 | } |
316 | 316 | |
@@ -322,8 +322,8 @@ discard block |
||
322 | 322 | $icon = new pix_icon($bbbsession['presentation']['icon'], $bbbsession['presentation']['mimetype_description']); |
323 | 323 | |
324 | 324 | echo '<h4>'.get_string('view_section_title_presentation', 'bigbluebuttonbn').'</h4>'. |
325 | - ''.$OUTPUT->action_icon($bbbsession['presentation']['url'], $icon, null, array(), false).''. |
|
326 | - ''.$OUTPUT->action_link($bbbsession['presentation']['url'], $bbbsession['presentation']['name'], null, $attributes).'<br><br>'; |
|
325 | + ''.$OUTPUT->action_icon($bbbsession['presentation']['url'], $icon, null, array(), false).''. |
|
326 | + ''.$OUTPUT->action_link($bbbsession['presentation']['url'], $bbbsession['presentation']['name'], null, $attributes).'<br><br>'; |
|
327 | 327 | } |
328 | 328 | } |
329 | 329 |
@@ -241,7 +241,6 @@ discard block |
||
241 | 241 | |
242 | 242 | /** |
243 | 243 | * Prints single activity item prepared by {@see recordingsbn_get_recent_mod_activity()} |
244 | - |
|
245 | 244 | * @return void |
246 | 245 | */ |
247 | 246 | function bigbluebuttonbn_print_recent_mod_activity($activity, $courseid, $detail, $modnames, $viewfullnames) { |
@@ -362,9 +361,9 @@ discard block |
||
362 | 361 | $now = time(); |
363 | 362 | if ( $bigbluebuttonbn->openingtime and (!$bigbluebuttonbn->closingtime or $bigbluebuttonbn->closingtime > $now)) { // A bigbluebuttonbn is scheduled. |
364 | 363 | $str = '<div class="bigbluebuttonbn overview"><div class="name">'. |
365 | - $strbigbluebuttonbn.': <a '.($bigbluebuttonbn->visible ? '' : ' class="dimmed"'). |
|
366 | - ' href="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bigbluebuttonbn->coursemodule.'">'. |
|
367 | - $bigbluebuttonbn->name.'</a></div>'; |
|
364 | + $strbigbluebuttonbn.': <a '.($bigbluebuttonbn->visible ? '' : ' class="dimmed"'). |
|
365 | + ' href="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bigbluebuttonbn->coursemodule.'">'. |
|
366 | + $bigbluebuttonbn->name.'</a></div>'; |
|
368 | 367 | if ( $bigbluebuttonbn->openingtime > $now ) { |
369 | 368 | $str .= '<div class="info">'.get_string('starts_at', 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->openingtime).'</div>'; |
370 | 369 | } else { |