Test Setup Failed
Pull Request — 1.10.x (#1502)
by
unknown
39:59 queued 02:14
created
plugin/bbb/lib/bbb.lib.php 3 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -611,8 +611,8 @@
 block discarded – undo
611 611
                 $item['show_links']  = $recordLink;
612 612
                 $item['action_links'] = implode(PHP_EOL, $actionLinks);
613 613
             }else{
614
-            	$isVisible = $meetingDB['visibility'] != 0;
615
-            	$linkVisibility = $isVisible
614
+                $isVisible = $meetingDB['visibility'] != 0;
615
+                $linkVisibility = $isVisible
616 616
                     ? Display::url(
617 617
                         Display::return_icon('visible.png', get_lang('MakeInvisible')),
618 618
                         $this->unPublishUrl($meetingDB)
Please login to merge, or discard this patch.
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -198,13 +198,13 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
                 }
@@ -608,9 +608,9 @@  discard block
 block discarded – undo
608 608
                 }
609 609
 
610 610
                 $actionLinks = $this->getActionLinks($meetingDB, $record, $isGlobal, $isAdminReport);
611
-                $item['show_links']  = $recordLink;
611
+                $item['show_links'] = $recordLink;
612 612
                 $item['action_links'] = implode(PHP_EOL, $actionLinks);
613
-            }else{
613
+            } else {
614 614
             	$isVisible = $meetingDB['visibility'] != 0;
615 615
             	$linkVisibility = $isVisible
616 616
                     ? Display::url(
@@ -648,11 +648,11 @@  discard block
 block discarded – undo
648 648
 
649 649
             if ($meetingDB['status'] == 1) {
650 650
                 $joinParams = array(
651
-                    'meetingId' => $meetingDB['remote_id'],		//-- REQUIRED - A unique id for the meeting
652
-                    'username' => $this->userCompleteName,	//-- REQUIRED - The name that will display for the user in the meeting
653
-                    'password' => $pass,			//-- REQUIRED - The attendee or moderator password, depending on what's passed here
654
-                    'createTime' => '',			//-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
655
-                    'userID' => '',			//	-- OPTIONAL - string
651
+                    'meetingId' => $meetingDB['remote_id'], //-- REQUIRED - A unique id for the meeting
652
+                    'username' => $this->userCompleteName, //-- REQUIRED - The name that will display for the user in the meeting
653
+                    'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here
654
+                    'createTime' => '', //-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
655
+                    'userID' => '', //	-- OPTIONAL - string
656 656
                     'webVoiceConf' => ''	//	-- OPTIONAL - string
657 657
                 );
658 658
                 $item['go_url'] = $this->protocol.$this->api->getJoinMeetingURL($joinParams);
@@ -717,8 +717,8 @@  discard block
 block discarded – undo
717 717
         $pass = $this->getUserMeetingPassword();
718 718
 
719 719
         $endParams = array(
720
-            'meetingId' => $meetingData['remote_id'],   // REQUIRED - We have to know which meeting to end.
721
-            'password' => $pass,        // REQUIRED - Must match moderator pass for meeting.
720
+            'meetingId' => $meetingData['remote_id'], // REQUIRED - We have to know which meeting to end.
721
+            'password' => $pass, // REQUIRED - Must match moderator pass for meeting.
722 722
         );
723 723
         $this->api->endMeetingWithXmlResponseArray($endParams);
724 724
         Database::update(
@@ -943,7 +943,7 @@  discard block
 block discarded – undo
943 943
      */
944 944
     public function redirectToBBB($url)
945 945
     {
946
-        if (file_exists(__DIR__ . '/../config.vm.php')) {
946
+        if (file_exists(__DIR__.'/../config.vm.php')) {
947 947
             // Using VM
948 948
             echo Display::url(get_lang('ClickToContinue'), $url);
949 949
             exit;
@@ -1170,7 +1170,7 @@  discard block
 block discarded – undo
1170 1170
         if ($meetingInfo['has_video_m4v']) {
1171 1171
             $links[] = Display::url(
1172 1172
                 Display::return_icon('save.png', get_lang('DownloadFile')),
1173
-                $recordInfo['playbackFormatUrl'] . '/capture.m4v',
1173
+                $recordInfo['playbackFormatUrl'].'/capture.m4v',
1174 1174
                 ['target' => '_blank']
1175 1175
             );
1176 1176
         } else {
@@ -1235,7 +1235,7 @@  discard block
 block discarded – undo
1235 1235
             return false;
1236 1236
         }
1237 1237
 
1238
-        $hasCapture = SocialManager::verifyUrl($meetingInfo['video_url'] . '/capture.m4v');
1238
+        $hasCapture = SocialManager::verifyUrl($meetingInfo['video_url'].'/capture.m4v');
1239 1239
 
1240 1240
         if ($hasCapture) {
1241 1241
             return Database::update(
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -610,7 +610,7 @@
 block discarded – undo
610 610
                 $actionLinks = $this->getActionLinks($meetingDB, $record, $isGlobal, $isAdminReport);
611 611
                 $item['show_links']  = $recordLink;
612 612
                 $item['action_links'] = implode(PHP_EOL, $actionLinks);
613
-            }else{
613
+            } else{
614 614
             	$isVisible = $meetingDB['visibility'] != 0;
615 615
             	$linkVisibility = $isVisible
616 616
                     ? Display::url(
Please login to merge, or discard this patch.