@@ -60,96 +60,96 @@ |
||
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | switch (strtolower($action)) { |
| 63 | - case 'logout': |
|
| 64 | - if (isset($errors) && $errors != '') { |
|
| 65 | - bigbluebutton_bbb_view_errors($errors, $id); |
|
| 66 | - break; |
|
| 67 | - } |
|
| 68 | - |
|
| 69 | - if (is_null($bbbsession)) { |
|
| 70 | - bigbluebutton_bbb_view_close_window_manually(); |
|
| 71 | - break; |
|
| 72 | - } |
|
| 63 | + case 'logout': |
|
| 64 | + if (isset($errors) && $errors != '') { |
|
| 65 | + bigbluebutton_bbb_view_errors($errors, $id); |
|
| 66 | + break; |
|
| 67 | + } |
|
| 73 | 68 | |
| 74 | - // Moodle event logger: Create an event for meeting left. |
|
| 75 | - bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_MEETING_LEFT, $bigbluebuttonbn, $cm); |
|
| 69 | + if (is_null($bbbsession)) { |
|
| 70 | + bigbluebutton_bbb_view_close_window_manually(); |
|
| 71 | + break; |
|
| 72 | + } |
|
| 76 | 73 | |
| 77 | - // Update the cache. |
|
| 78 | - $meetinginfo = bigbluebuttonbn_get_meeting_info($bbbsession['meetingid'], BIGBLUEBUTTONBN_FORCED); |
|
| 74 | + // Moodle event logger: Create an event for meeting left. |
|
| 75 | + bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_MEETING_LEFT, $bigbluebuttonbn, $cm); |
|
| 79 | 76 | |
| 80 | - // Close the tab or window where BBB was opened. |
|
| 81 | - bigbluebutton_bbb_view_close_window(); |
|
| 82 | - break; |
|
| 83 | - case 'join': |
|
| 84 | - if (is_null($bbbsession)) { |
|
| 85 | - print_error('view_error_unable_join', 'bigbluebuttonbn'); |
|
| 86 | - break; |
|
| 87 | - } |
|
| 77 | + // Update the cache. |
|
| 78 | + $meetinginfo = bigbluebuttonbn_get_meeting_info($bbbsession['meetingid'], BIGBLUEBUTTONBN_FORCED); |
|
| 88 | 79 | |
| 89 | - // See if the session is in progress. |
|
| 90 | - if (bigbluebuttonbn_is_meeting_running($bbbsession['meetingid'])) { |
|
| 91 | - // Since the meeting is already running, we just join the session. |
|
| 92 | - bigbluebutton_bbb_view_join_meeting($bbbsession, $cm, $bigbluebuttonbn); |
|
| 80 | + // Close the tab or window where BBB was opened. |
|
| 81 | + bigbluebutton_bbb_view_close_window(); |
|
| 93 | 82 | break; |
| 94 | - } |
|
| 83 | + case 'join': |
|
| 84 | + if (is_null($bbbsession)) { |
|
| 85 | + print_error('view_error_unable_join', 'bigbluebuttonbn'); |
|
| 86 | + break; |
|
| 87 | + } |
|
| 95 | 88 | |
| 96 | - // If user is not administrator nor moderator (user is steudent) and waiting is required. |
|
| 97 | - if (!$bbbsession['administrator'] && !$bbbsession['moderator'] && $bbbsession['wait']) { |
|
| 98 | - header('Location: '.$bbbsession['logoutURL']); |
|
| 99 | - break; |
|
| 100 | - } |
|
| 89 | + // See if the session is in progress. |
|
| 90 | + if (bigbluebuttonbn_is_meeting_running($bbbsession['meetingid'])) { |
|
| 91 | + // Since the meeting is already running, we just join the session. |
|
| 92 | + bigbluebutton_bbb_view_join_meeting($bbbsession, $cm, $bigbluebuttonbn); |
|
| 93 | + break; |
|
| 94 | + } |
|
| 101 | 95 | |
| 102 | - // As the meeting doesn't exist, try to create it. |
|
| 103 | - $response = bigbluebuttonbn_get_create_meeting_array( |
|
| 104 | - bigbluebutton_bbb_view_create_meeting_data($bbbsession, $bigbluebuttonbn), |
|
| 105 | - bigbluebutton_bbb_view_create_meeting_metadata($bbbsession), |
|
| 106 | - $bbbsession['presentation']['name'], |
|
| 107 | - $bbbsession['presentation']['url'] |
|
| 108 | - ); |
|
| 109 | - |
|
| 110 | - if (!$response) { |
|
| 111 | - // The server is unreachable. |
|
| 112 | - if ($bbbsession['administrator']) { |
|
| 113 | - print_error('view_error_unable_join', 'bigbluebuttonbn', |
|
| 114 | - $CFG->wwwroot.'/admin/settings.php?section=modsettingbigbluebuttonbn'); |
|
| 96 | + // If user is not administrator nor moderator (user is steudent) and waiting is required. |
|
| 97 | + if (!$bbbsession['administrator'] && !$bbbsession['moderator'] && $bbbsession['wait']) { |
|
| 98 | + header('Location: '.$bbbsession['logoutURL']); |
|
| 115 | 99 | break; |
| 116 | 100 | } |
| 117 | - if ($bbbsession['moderator']) { |
|
| 118 | - print_error('view_error_unable_join_teacher', 'bigbluebuttonbn', |
|
| 101 | + |
|
| 102 | + // As the meeting doesn't exist, try to create it. |
|
| 103 | + $response = bigbluebuttonbn_get_create_meeting_array( |
|
| 104 | + bigbluebutton_bbb_view_create_meeting_data($bbbsession, $bigbluebuttonbn), |
|
| 105 | + bigbluebutton_bbb_view_create_meeting_metadata($bbbsession), |
|
| 106 | + $bbbsession['presentation']['name'], |
|
| 107 | + $bbbsession['presentation']['url'] |
|
| 108 | + ); |
|
| 109 | + |
|
| 110 | + if (!$response) { |
|
| 111 | + // The server is unreachable. |
|
| 112 | + if ($bbbsession['administrator']) { |
|
| 113 | + print_error('view_error_unable_join', 'bigbluebuttonbn', |
|
| 114 | + $CFG->wwwroot.'/admin/settings.php?section=modsettingbigbluebuttonbn'); |
|
| 115 | + break; |
|
| 116 | + } |
|
| 117 | + if ($bbbsession['moderator']) { |
|
| 118 | + print_error('view_error_unable_join_teacher', 'bigbluebuttonbn', |
|
| 119 | + $CFG->wwwroot.'/admin/settings.php?section=modsettingbigbluebuttonbn'); |
|
| 120 | + break; |
|
| 121 | + } |
|
| 122 | + |
|
| 123 | + print_error('view_error_unable_join_student', 'bigbluebuttonbn', |
|
| 119 | 124 | $CFG->wwwroot.'/admin/settings.php?section=modsettingbigbluebuttonbn'); |
| 120 | 125 | break; |
| 121 | 126 | } |
| 122 | 127 | |
| 123 | - print_error('view_error_unable_join_student', 'bigbluebuttonbn', |
|
| 124 | - $CFG->wwwroot.'/admin/settings.php?section=modsettingbigbluebuttonbn'); |
|
| 125 | - break; |
|
| 126 | - } |
|
| 128 | + if ($response['returncode'] == 'FAILED') { |
|
| 129 | + // The meeting was not created. |
|
| 130 | + if (!$printerrorkey) { |
|
| 131 | + print_error($response['message'], 'bigbluebuttonbn'); |
|
| 132 | + break; |
|
| 133 | + } |
|
| 134 | + $printerrorkey = bigbluebuttonbn_get_error_key($response['messageKey'], 'view_error_create'); |
|
| 135 | + print_error($printerrorkey, 'bigbluebuttonbn'); |
|
| 136 | + break; |
|
| 137 | + } |
|
| 127 | 138 | |
| 128 | - if ($response['returncode'] == 'FAILED') { |
|
| 129 | - // The meeting was not created. |
|
| 130 | - if (!$printerrorkey) { |
|
| 131 | - print_error($response['message'], 'bigbluebuttonbn'); |
|
| 139 | + if ($response['hasBeenForciblyEnded'] == 'true') { |
|
| 140 | + print_error(get_string('index_error_forciblyended', 'bigbluebuttonbn')); |
|
| 132 | 141 | break; |
| 133 | 142 | } |
| 134 | - $printerrorkey = bigbluebuttonbn_get_error_key($response['messageKey'], 'view_error_create'); |
|
| 135 | - print_error($printerrorkey, 'bigbluebuttonbn'); |
|
| 136 | - break; |
|
| 137 | - } |
|
| 138 | 143 | |
| 139 | - if ($response['hasBeenForciblyEnded'] == 'true') { |
|
| 140 | - print_error(get_string('index_error_forciblyended', 'bigbluebuttonbn')); |
|
| 144 | + // Moodle event logger: Create an event for meeting created. |
|
| 145 | + bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_MEETING_CREATED, $bigbluebuttonbn, $cm); |
|
| 146 | + // Internal logger: Insert a record with the meeting created. |
|
| 147 | + bigbluebuttonbn_logs($bbbsession, BIGBLUEBUTTONBN_LOG_EVENT_CREATE); |
|
| 148 | + // Since the meeting is already running, we just join the session. |
|
| 149 | + bigbluebutton_bbb_view_join_meeting($bbbsession, $cm, $bigbluebuttonbn); |
|
| 141 | 150 | break; |
| 142 | - } |
|
| 143 | - |
|
| 144 | - // Moodle event logger: Create an event for meeting created. |
|
| 145 | - bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_MEETING_CREATED, $bigbluebuttonbn, $cm); |
|
| 146 | - // Internal logger: Insert a record with the meeting created. |
|
| 147 | - bigbluebuttonbn_logs($bbbsession, BIGBLUEBUTTONBN_LOG_EVENT_CREATE); |
|
| 148 | - // Since the meeting is already running, we just join the session. |
|
| 149 | - bigbluebutton_bbb_view_join_meeting($bbbsession, $cm, $bigbluebuttonbn); |
|
| 150 | - break; |
|
| 151 | - default: |
|
| 152 | - bigbluebutton_bbb_view_close_window(); |
|
| 151 | + default: |
|
| 152 | + bigbluebutton_bbb_view_close_window(); |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | function bigbluebutton_bbb_view_close_window() { |