@@ -198,13 +198,13 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | $params['attendee_pw'] = isset($params['moderator_pw']) ? $params['moderator_pw'] : $courseCode; |
| 201 | - $attendeePassword = $params['attendee_pw']; |
|
| 201 | + $attendeePassword = $params['attendee_pw']; |
|
| 202 | 202 | $params['moderator_pw'] = isset($params['moderator_pw']) ? $params['moderator_pw'] : $this->getModMeetingPassword(); |
| 203 | 203 | $moderatorPassword = $params['moderator_pw']; |
| 204 | 204 | |
| 205 | 205 | $params['record'] = api_get_course_setting('big_blue_button_record_and_store', $courseCode) == 1 ? true : false; |
| 206 | 206 | $max = api_get_course_setting('big_blue_button_max_students_allowed', $courseCode); |
| 207 | - $max = isset($max) ? $max : -1; |
|
| 207 | + $max = isset($max) ? $max : -1; |
|
| 208 | 208 | |
| 209 | 209 | $params['status'] = 1; |
| 210 | 210 | // Generate a pseudo-global-unique-id to avoid clash of conferences on |
@@ -235,23 +235,23 @@ discard block |
||
| 235 | 235 | $duration = 300; |
| 236 | 236 | |
| 237 | 237 | $bbbParams = array( |
| 238 | - 'meetingId' => $params['remote_id'], // REQUIRED |
|
| 239 | - 'meetingName' => $meetingName, // REQUIRED |
|
| 240 | - 'attendeePw' => $attendeePassword, // Match this value in getJoinMeetingURL() to join as attendee. |
|
| 241 | - 'moderatorPw' => $moderatorPassword, // Match this value in getJoinMeetingURL() to join as moderator. |
|
| 242 | - 'welcomeMsg' => $welcomeMessage, // ''= use default. Change to customize. |
|
| 243 | - 'dialNumber' => '', // The main number to call into. Optional. |
|
| 244 | - 'voiceBridge' => $params['voice_bridge'], // PIN to join voice. Required. |
|
| 245 | - 'webVoice' => '', // Alphanumeric to join voice. Optional. |
|
| 238 | + 'meetingId' => $params['remote_id'], // REQUIRED |
|
| 239 | + 'meetingName' => $meetingName, // REQUIRED |
|
| 240 | + 'attendeePw' => $attendeePassword, // Match this value in getJoinMeetingURL() to join as attendee. |
|
| 241 | + 'moderatorPw' => $moderatorPassword, // Match this value in getJoinMeetingURL() to join as moderator. |
|
| 242 | + 'welcomeMsg' => $welcomeMessage, // ''= use default. Change to customize. |
|
| 243 | + 'dialNumber' => '', // The main number to call into. Optional. |
|
| 244 | + 'voiceBridge' => $params['voice_bridge'], // PIN to join voice. Required. |
|
| 245 | + 'webVoice' => '', // Alphanumeric to join voice. Optional. |
|
| 246 | 246 | 'logoutUrl' => $this->logoutUrl, |
| 247 | - 'maxParticipants' => $max, // Optional. -1 = unlimitted. Not supported in BBB. [number] |
|
| 248 | - 'record' => $record, // New. 'true' will tell BBB to record the meeting. |
|
| 249 | - 'duration' => $duration, // Default = 0 which means no set duration in minutes. [number] |
|
| 247 | + 'maxParticipants' => $max, // Optional. -1 = unlimitted. Not supported in BBB. [number] |
|
| 248 | + 'record' => $record, // New. 'true' will tell BBB to record the meeting. |
|
| 249 | + 'duration' => $duration, // Default = 0 which means no set duration in minutes. [number] |
|
| 250 | 250 | //'meta_category' => '', // Use to pass additional info to BBB server. See API docs. |
| 251 | 251 | ); |
| 252 | 252 | |
| 253 | 253 | if ($this->debug) { |
| 254 | - error_log("create_meeting params: ".print_r($bbbParams,1)); |
|
| 254 | + error_log("create_meeting params: ".print_r($bbbParams, 1)); |
|
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | $status = false; |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | if (isset($result) && strval($result['returncode']) == 'SUCCESS') { |
| 265 | 265 | if ($this->debug) { |
| 266 | 266 | error_log( |
| 267 | - "create_meeting result: " . print_r($result, 1) |
|
| 267 | + "create_meeting result: ".print_r($result, 1) |
|
| 268 | 268 | ); |
| 269 | 269 | } |
| 270 | 270 | $meeting = $this->joinMeeting($meetingName, true); |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | |
| 315 | 315 | $courseId = api_get_course_int_id(); |
| 316 | 316 | $sessionId = api_get_session_id(); |
| 317 | - $conditions = array( |
|
| 317 | + $conditions = array( |
|
| 318 | 318 | 'where' => array( |
| 319 | 319 | 'c_id = ? AND session_id = ? AND meeting_name = ? AND status = 1 ' => |
| 320 | 320 | array($courseId, $sessionId, $meetingName) |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | |
| 324 | 324 | if ($this->hasGroupSupport()) { |
| 325 | 325 | $groupId = api_get_group_id(); |
| 326 | - $conditions = array( |
|
| 326 | + $conditions = array( |
|
| 327 | 327 | 'where' => array( |
| 328 | 328 | 'c_id = ? AND session_id = ? AND meeting_name = ? AND group_id = ? AND status = 1 ' => |
| 329 | 329 | array($courseId, $sessionId, $meetingName, $groupId) |
@@ -420,7 +420,7 @@ discard block |
||
| 420 | 420 | |
| 421 | 421 | if ($this->debug) { |
| 422 | 422 | error_log( |
| 423 | - "meeting is running: " . intval($meetingInfoExists) |
|
| 423 | + "meeting is running: ".intval($meetingInfoExists) |
|
| 424 | 424 | ); |
| 425 | 425 | } |
| 426 | 426 | |
@@ -437,11 +437,11 @@ discard block |
||
| 437 | 437 | |
| 438 | 438 | if ($meetingInfoExists) { |
| 439 | 439 | $joinParams = array( |
| 440 | - 'meetingId' => $meetingData['remote_id'], // -- REQUIRED - A unique id for the meeting |
|
| 441 | - 'username' => $this->userCompleteName, //-- REQUIRED - The name that will display for the user in the meeting |
|
| 442 | - 'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here |
|
| 440 | + 'meetingId' => $meetingData['remote_id'], // -- REQUIRED - A unique id for the meeting |
|
| 441 | + 'username' => $this->userCompleteName, //-- REQUIRED - The name that will display for the user in the meeting |
|
| 442 | + 'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here |
|
| 443 | 443 | //'createTime' => api_get_utc_datetime(), //-- OPTIONAL - string. Leave blank ('') unless you set this correctly. |
| 444 | - 'userID' => api_get_user_id(), //-- OPTIONAL - string |
|
| 444 | + 'userID' => api_get_user_id(), //-- OPTIONAL - string |
|
| 445 | 445 | 'webVoiceConf' => '' // -- OPTIONAL - string |
| 446 | 446 | ); |
| 447 | 447 | $url = $this->api->getJoinMeetingURL($joinParams); |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | $url = $this->logoutUrl; |
| 451 | 451 | } |
| 452 | 452 | if ($this->debug) { |
| 453 | - error_log("return url :" . $url); |
|
| 453 | + error_log("return url :".$url); |
|
| 454 | 454 | } |
| 455 | 455 | |
| 456 | 456 | return $url; |
@@ -493,14 +493,14 @@ discard block |
||
| 493 | 493 | $conditions = []; |
| 494 | 494 | |
| 495 | 495 | if ($courseId || $sessionId || $groupId) { |
| 496 | - $conditions = array( |
|
| 496 | + $conditions = array( |
|
| 497 | 497 | 'where' => array( |
| 498 | 498 | 'c_id = ? AND session_id = ? ' => array($courseId, $sessionId), |
| 499 | 499 | ), |
| 500 | 500 | ); |
| 501 | 501 | |
| 502 | 502 | if ($this->hasGroupSupport()) { |
| 503 | - $conditions = array( |
|
| 503 | + $conditions = array( |
|
| 504 | 504 | 'where' => array( |
| 505 | 505 | 'c_id = ? AND session_id = ? AND group_id = ? ' => array($courseId, $sessionId, $groupId) |
| 506 | 506 | ) |
@@ -515,7 +515,7 @@ discard block |
||
| 515 | 515 | $date = $date->add(new DateInterval('P1D')); |
| 516 | 516 | $dateEnd = date_format($date, 'Y-m-d H:i:s'); |
| 517 | 517 | |
| 518 | - $conditions = array( |
|
| 518 | + $conditions = array( |
|
| 519 | 519 | 'where' => array( |
| 520 | 520 | 'created_at BETWEEN ? AND ? ' => array($dateStart, $dateEnd), |
| 521 | 521 | ), |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | } |
| 550 | 550 | $meetingBBB['end_url'] = $this->endUrl($meetingDB); |
| 551 | 551 | |
| 552 | - if ((string)$meetingBBB['returncode'] == 'FAILED') { |
|
| 552 | + if ((string) $meetingBBB['returncode'] == 'FAILED') { |
|
| 553 | 553 | if ($meetingDB['status'] == 1 && $this->isConferenceManager()) { |
| 554 | 554 | $this->endMeeting($meetingDB['id']); |
| 555 | 555 | } |
@@ -607,7 +607,7 @@ discard block |
||
| 607 | 607 | } |
| 608 | 608 | |
| 609 | 609 | $actionLinks = $this->getActionLinks($meetingDB, $record, $isGlobal, $isAdminReport); |
| 610 | - $item['show_links'] = $recordLink; |
|
| 610 | + $item['show_links'] = $recordLink; |
|
| 611 | 611 | $item['action_links'] = implode(PHP_EOL, $actionLinks); |
| 612 | 612 | } |
| 613 | 613 | |
@@ -620,11 +620,11 @@ discard block |
||
| 620 | 620 | |
| 621 | 621 | if ($meetingDB['status'] == 1) { |
| 622 | 622 | $joinParams = array( |
| 623 | - 'meetingId' => $meetingDB['remote_id'], //-- REQUIRED - A unique id for the meeting |
|
| 624 | - 'username' => $this->userCompleteName, //-- REQUIRED - The name that will display for the user in the meeting |
|
| 625 | - 'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here |
|
| 626 | - 'createTime' => '', //-- OPTIONAL - string. Leave blank ('') unless you set this correctly. |
|
| 627 | - 'userID' => '', // -- OPTIONAL - string |
|
| 623 | + 'meetingId' => $meetingDB['remote_id'], //-- REQUIRED - A unique id for the meeting |
|
| 624 | + 'username' => $this->userCompleteName, //-- REQUIRED - The name that will display for the user in the meeting |
|
| 625 | + 'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here |
|
| 626 | + 'createTime' => '', //-- OPTIONAL - string. Leave blank ('') unless you set this correctly. |
|
| 627 | + 'userID' => '', // -- OPTIONAL - string |
|
| 628 | 628 | 'webVoiceConf' => '' // -- OPTIONAL - string |
| 629 | 629 | ); |
| 630 | 630 | $item['go_url'] = $this->protocol.$this->api->getJoinMeetingURL($joinParams); |
@@ -689,8 +689,8 @@ discard block |
||
| 689 | 689 | $pass = $this->getUserMeetingPassword(); |
| 690 | 690 | |
| 691 | 691 | $endParams = array( |
| 692 | - 'meetingId' => $meetingData['remote_id'], // REQUIRED - We have to know which meeting to end. |
|
| 693 | - 'password' => $pass, // REQUIRED - Must match moderator pass for meeting. |
|
| 692 | + 'meetingId' => $meetingData['remote_id'], // REQUIRED - We have to know which meeting to end. |
|
| 693 | + 'password' => $pass, // REQUIRED - Must match moderator pass for meeting. |
|
| 694 | 694 | ); |
| 695 | 695 | $this->api->endMeetingWithXmlResponseArray($endParams); |
| 696 | 696 | Database::update( |
@@ -915,7 +915,7 @@ discard block |
||
| 915 | 915 | */ |
| 916 | 916 | public function redirectToBBB($url) |
| 917 | 917 | { |
| 918 | - if (file_exists(__DIR__ . '/../config.vm.php')) { |
|
| 918 | + if (file_exists(__DIR__.'/../config.vm.php')) { |
|
| 919 | 919 | // Using VM |
| 920 | 920 | echo Display::url(get_lang('ClickToContinue'), $url); |
| 921 | 921 | exit; |
@@ -1138,7 +1138,7 @@ discard block |
||
| 1138 | 1138 | if ($meetingInfo['has_video_m4v']) { |
| 1139 | 1139 | $links[] = Display::url( |
| 1140 | 1140 | Display::return_icon('save.png', get_lang('DownloadFile')), |
| 1141 | - $recordInfo['playbackFormatUrl'] . '/capture.m4v', |
|
| 1141 | + $recordInfo['playbackFormatUrl'].'/capture.m4v', |
|
| 1142 | 1142 | ['target' => '_blank'] |
| 1143 | 1143 | ); |
| 1144 | 1144 | } else { |
@@ -1203,7 +1203,7 @@ discard block |
||
| 1203 | 1203 | return false; |
| 1204 | 1204 | } |
| 1205 | 1205 | |
| 1206 | - $hasCapture = SocialManager::verifyUrl($meetingInfo['video_url'] . '/capture.m4v'); |
|
| 1206 | + $hasCapture = SocialManager::verifyUrl($meetingInfo['video_url'].'/capture.m4v'); |
|
| 1207 | 1207 | |
| 1208 | 1208 | if ($hasCapture) { |
| 1209 | 1209 | return Database::update( |