Completed
Push — 1.10.x ( 1a78fc...c0a895 )
by Yannick
62:01 queued 21:27
created
plugin/bbb/lib/bbb.lib.php 1 patch
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -196,13 +196,13 @@  discard block
 block discarded – undo
196 196
         }
197 197
 
198 198
         $params['attendee_pw'] = isset($params['moderator_pw']) ? $params['moderator_pw'] : $courseCode;
199
-        $attendeePassword =  $params['attendee_pw'];
199
+        $attendeePassword = $params['attendee_pw'];
200 200
         $params['moderator_pw'] = isset($params['moderator_pw']) ? $params['moderator_pw'] : $this->getModMeetingPassword();
201 201
         $moderatorPassword = $params['moderator_pw'];
202 202
 
203 203
         $params['record'] = api_get_course_setting('big_blue_button_record_and_store', $courseCode) == 1 ? true : false;
204 204
         $max = api_get_course_setting('big_blue_button_max_students_allowed', $courseCode);
205
-        $max =  isset($max) ? $max : -1;
205
+        $max = isset($max) ? $max : -1;
206 206
 
207 207
         $params['status'] = 1;
208 208
         // Generate a pseudo-global-unique-id to avoid clash of conferences on
@@ -233,23 +233,23 @@  discard block
 block discarded – undo
233 233
             $duration = 300;
234 234
 
235 235
             $bbbParams = array(
236
-                'meetingId' => $params['remote_id'], 					// REQUIRED
237
-                'meetingName' => $meetingName, 	// REQUIRED
238
-                'attendeePw' => $attendeePassword, 					// Match this value in getJoinMeetingURL() to join as attendee.
239
-                'moderatorPw' => $moderatorPassword, 					// Match this value in getJoinMeetingURL() to join as moderator.
240
-                'welcomeMsg' => $welcomeMessage, 					// ''= use default. Change to customize.
241
-                'dialNumber' => '', 					// The main number to call into. Optional.
242
-                'voiceBridge' => $params['voice_bridge'], 					// PIN to join voice. Required.
243
-                'webVoice' => '', 						// Alphanumeric to join voice. Optional.
236
+                'meetingId' => $params['remote_id'], // REQUIRED
237
+                'meetingName' => $meetingName, // REQUIRED
238
+                'attendeePw' => $attendeePassword, // Match this value in getJoinMeetingURL() to join as attendee.
239
+                'moderatorPw' => $moderatorPassword, // Match this value in getJoinMeetingURL() to join as moderator.
240
+                'welcomeMsg' => $welcomeMessage, // ''= use default. Change to customize.
241
+                'dialNumber' => '', // The main number to call into. Optional.
242
+                'voiceBridge' => $params['voice_bridge'], // PIN to join voice. Required.
243
+                'webVoice' => '', // Alphanumeric to join voice. Optional.
244 244
                 'logoutUrl' =>  $this->logoutUrl,
245
-                'maxParticipants' => $max, 				// Optional. -1 = unlimitted. Not supported in BBB. [number]
246
-                'record' => $record, 					// New. 'true' will tell BBB to record the meeting.
247
-                'duration' => $duration, 				// Default = 0 which means no set duration in minutes. [number]
245
+                'maxParticipants' => $max, // Optional. -1 = unlimitted. Not supported in BBB. [number]
246
+                'record' => $record, // New. 'true' will tell BBB to record the meeting.
247
+                'duration' => $duration, // Default = 0 which means no set duration in minutes. [number]
248 248
                 //'meta_category' => '', 				// Use to pass additional info to BBB server. See API docs.
249 249
             );
250 250
 
251 251
             if ($this->debug) {
252
-                error_log("create_meeting params: ".print_r($bbbParams,1));
252
+                error_log("create_meeting params: ".print_r($bbbParams, 1));
253 253
             }
254 254
 
255 255
             $status = false;
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
                 if (isset($result) && strval($result['returncode']) == 'SUCCESS') {
263 263
                     if ($this->debug) {
264 264
                         error_log(
265
-                            "create_meeting result: " . print_r($result, 1)
265
+                            "create_meeting result: ".print_r($result, 1)
266 266
                         );
267 267
                     }
268 268
                     $meeting = $this->joinMeeting($meetingName, true);
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
 
313 313
         $courseId = api_get_course_int_id();
314 314
         $sessionId = api_get_session_id();
315
-        $conditions =  array(
315
+        $conditions = array(
316 316
             'where' => array(
317 317
                 'c_id = ? AND session_id = ? AND meeting_name = ? AND status = 1 ' =>
318 318
                     array($courseId, $sessionId, $meetingName)
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
 
322 322
         if ($this->hasGroupSupport()) {
323 323
             $groupId = api_get_group_id();
324
-            $conditions =  array(
324
+            $conditions = array(
325 325
                 'where' => array(
326 326
                     'c_id = ? AND session_id = ? AND meeting_name = ? AND group_id = ? AND status = 1 ' =>
327 327
                         array($courseId, $sessionId, $meetingName, $groupId)
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
 
419 419
             if ($this->debug) {
420 420
                 error_log(
421
-                    "meeting is running: " . intval($meetingInfoExists)
421
+                    "meeting is running: ".intval($meetingInfoExists)
422 422
                 );
423 423
             }
424 424
 
@@ -435,11 +435,11 @@  discard block
 block discarded – undo
435 435
 
436 436
         if ($meetingInfoExists) {
437 437
             $joinParams = array(
438
-                'meetingId' => $meetingData['remote_id'],	//	-- REQUIRED - A unique id for the meeting
439
-                'username' => $this->userCompleteName,	//-- REQUIRED - The name that will display for the user in the meeting
440
-                'password' => $pass,			//-- REQUIRED - The attendee or moderator password, depending on what's passed here
438
+                'meetingId' => $meetingData['remote_id'], //	-- REQUIRED - A unique id for the meeting
439
+                'username' => $this->userCompleteName, //-- REQUIRED - The name that will display for the user in the meeting
440
+                'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here
441 441
                 //'createTime' => api_get_utc_datetime(),			//-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
442
-                'userID' => api_get_user_id(),				//-- OPTIONAL - string
442
+                'userID' => api_get_user_id(), //-- OPTIONAL - string
443 443
                 'webVoiceConf' => ''	//	-- OPTIONAL - string
444 444
             );
445 445
             $url = $this->api->getJoinMeetingURL($joinParams);
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
             $url = $this->logoutUrl;
449 449
         }
450 450
         if ($this->debug) {
451
-            error_log("return url :" . $url);
451
+            error_log("return url :".$url);
452 452
         }
453 453
 
454 454
         return $url;
@@ -491,14 +491,14 @@  discard block
 block discarded – undo
491 491
         $conditions = [];
492 492
 
493 493
         if ($courseId || $sessionId || $groupId) {
494
-            $conditions =  array(
494
+            $conditions = array(
495 495
                 'where' => array(
496 496
                     'c_id = ? AND session_id = ? ' => array($courseId, $sessionId),
497 497
                 ),
498 498
             );
499 499
 
500 500
             if ($this->hasGroupSupport()) {
501
-                $conditions =  array(
501
+                $conditions = array(
502 502
                     'where' => array(
503 503
                         'c_id = ? AND session_id = ? AND group_id = ? ' => array($courseId, $sessionId, $groupId)
504 504
                     )
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
             }
534 534
             $meetingBBB['end_url'] = $this->endUrl($meetingDB);
535 535
 
536
-            if ((string)$meetingBBB['returncode'] == 'FAILED') {
536
+            if ((string) $meetingBBB['returncode'] == 'FAILED') {
537 537
                 if ($meetingDB['status'] == 1 && $this->isConferenceManager()) {
538 538
                     $this->endMeeting($meetingDB['id']);
539 539
                 }
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
                 }
591 591
 
592 592
                 $actionLinks = $this->getActionLinks($meetingDB, $record, $isGlobal, $isAdminReport);
593
-                $item['show_links']  = $recordLink;
593
+                $item['show_links'] = $recordLink;
594 594
                 $item['action_links'] = implode(PHP_EOL, $actionLinks);
595 595
             }
596 596
 
@@ -603,11 +603,11 @@  discard block
 block discarded – undo
603 603
 
604 604
             if ($meetingDB['status'] == 1) {
605 605
                 $joinParams = array(
606
-                    'meetingId' => $meetingDB['remote_id'],		//-- REQUIRED - A unique id for the meeting
607
-                    'username' => $this->userCompleteName,	//-- REQUIRED - The name that will display for the user in the meeting
608
-                    'password' => $pass,			//-- REQUIRED - The attendee or moderator password, depending on what's passed here
609
-                    'createTime' => '',			//-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
610
-                    'userID' => '',			//	-- OPTIONAL - string
606
+                    'meetingId' => $meetingDB['remote_id'], //-- REQUIRED - A unique id for the meeting
607
+                    'username' => $this->userCompleteName, //-- REQUIRED - The name that will display for the user in the meeting
608
+                    'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here
609
+                    'createTime' => '', //-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
610
+                    'userID' => '', //	-- OPTIONAL - string
611 611
                     'webVoiceConf' => ''	//	-- OPTIONAL - string
612 612
                 );
613 613
                 $item['go_url'] = $this->protocol.$this->api->getJoinMeetingURL($joinParams);
@@ -672,8 +672,8 @@  discard block
 block discarded – undo
672 672
         $pass = $this->getUserMeetingPassword();
673 673
 
674 674
         $endParams = array(
675
-            'meetingId' => $meetingData['remote_id'],   // REQUIRED - We have to know which meeting to end.
676
-            'password' => $pass,        // REQUIRED - Must match moderator pass for meeting.
675
+            'meetingId' => $meetingData['remote_id'], // REQUIRED - We have to know which meeting to end.
676
+            'password' => $pass, // REQUIRED - Must match moderator pass for meeting.
677 677
         );
678 678
         $this->api->endMeetingWithXmlResponseArray($endParams);
679 679
         Database::update(
@@ -898,7 +898,7 @@  discard block
 block discarded – undo
898 898
      */
899 899
     public function redirectToBBB($url)
900 900
     {
901
-        if (file_exists(__DIR__ . '/../config.vm.php')) {
901
+        if (file_exists(__DIR__.'/../config.vm.php')) {
902 902
             // Using VM
903 903
             echo Display::url(get_lang('ClickToContinue'), $url);
904 904
             exit;
@@ -1105,7 +1105,7 @@  discard block
 block discarded – undo
1105 1105
 
1106 1106
         $links[] = Display::url(
1107 1107
             Display::return_icon('save.png', get_lang('DownloadFile')),
1108
-            $recordInfo['playbackFormatUrl'] . '/capture.m4v',
1108
+            $recordInfo['playbackFormatUrl'].'/capture.m4v',
1109 1109
             ['target' => '_blank']
1110 1110
         );
1111 1111
 
Please login to merge, or discard this patch.