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