Completed
Push — 1.10.x ( a32a3a...6ee285 )
by
unknown
54:10
created
plugin/bbb/lib/bbb.lib.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -166,13 +166,13 @@  discard block
 block discarded – undo
166 166
         }
167 167
 
168 168
         $params['attendee_pw'] = isset($params['moderator_pw']) ? $params['moderator_pw'] : $courseCode;
169
-        $attendeePassword =  $params['attendee_pw'];
169
+        $attendeePassword = $params['attendee_pw'];
170 170
         $params['moderator_pw'] = isset($params['moderator_pw']) ? $params['moderator_pw'] : $this->getModMeetingPassword();
171 171
         $moderatorPassword = $params['moderator_pw'];
172 172
 
173 173
         $params['record'] = api_get_course_setting('big_blue_button_record_and_store', $courseCode) == 1 ? true : false;
174 174
         $max = api_get_course_setting('big_blue_button_max_students_allowed', $courseCode);
175
-        $max =  isset($max) ? $max : -1;
175
+        $max = isset($max) ? $max : -1;
176 176
 
177 177
         $params['status'] = 1;
178 178
         // Generate a pseudo-global-unique-id to avoid clash of conferences on
@@ -203,23 +203,23 @@  discard block
 block discarded – undo
203 203
             $duration = 300;
204 204
 
205 205
             $bbbParams = array(
206
-                'meetingId' => $params['remote_id'], 					// REQUIRED
207
-                'meetingName' => $meetingName, 	// REQUIRED
208
-                'attendeePw' => $attendeePassword, 					// Match this value in getJoinMeetingURL() to join as attendee.
209
-                'moderatorPw' => $moderatorPassword, 					// Match this value in getJoinMeetingURL() to join as moderator.
210
-                'welcomeMsg' => $welcomeMessage, 					// ''= use default. Change to customize.
211
-                'dialNumber' => '', 					// The main number to call into. Optional.
212
-                'voiceBridge' => $params['voice_bridge'], 					// PIN to join voice. Required.
213
-                'webVoice' => '', 						// Alphanumeric to join voice. Optional.
206
+                'meetingId' => $params['remote_id'], // REQUIRED
207
+                'meetingName' => $meetingName, // REQUIRED
208
+                'attendeePw' => $attendeePassword, // Match this value in getJoinMeetingURL() to join as attendee.
209
+                'moderatorPw' => $moderatorPassword, // Match this value in getJoinMeetingURL() to join as moderator.
210
+                'welcomeMsg' => $welcomeMessage, // ''= use default. Change to customize.
211
+                'dialNumber' => '', // The main number to call into. Optional.
212
+                'voiceBridge' => $params['voice_bridge'], // PIN to join voice. Required.
213
+                'webVoice' => '', // Alphanumeric to join voice. Optional.
214 214
                 'logoutUrl' =>  $this->logoutUrl,
215
-                'maxParticipants' => $max, 				// Optional. -1 = unlimitted. Not supported in BBB. [number]
216
-                'record' => $record, 					// New. 'true' will tell BBB to record the meeting.
217
-                'duration' => $duration, 				// Default = 0 which means no set duration in minutes. [number]
215
+                'maxParticipants' => $max, // Optional. -1 = unlimitted. Not supported in BBB. [number]
216
+                'record' => $record, // New. 'true' will tell BBB to record the meeting.
217
+                'duration' => $duration, // Default = 0 which means no set duration in minutes. [number]
218 218
                 //'meta_category' => '', 				// Use to pass additional info to BBB server. See API docs.
219 219
             );
220 220
 
221 221
             if ($this->debug) {
222
-                error_log("create_meeting params: ".print_r($bbbParams,1));
222
+                error_log("create_meeting params: ".print_r($bbbParams, 1));
223 223
             }
224 224
 
225 225
             $status = false;
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
                 if (isset($result) && strval($result['returncode']) == 'SUCCESS') {
233 233
                     if ($this->debug) {
234 234
                         error_log(
235
-                            "create_meeting result: " . print_r($result, 1)
235
+                            "create_meeting result: ".print_r($result, 1)
236 236
                         );
237 237
                     }
238 238
                     $meeting = $this->joinMeeting($meetingName, true);
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
 
264 264
         $courseId = api_get_course_int_id();
265 265
         $sessionId = api_get_session_id();
266
-        $conditions =  array(
266
+        $conditions = array(
267 267
             'where' => array(
268 268
                 'c_id = ? AND session_id = ? AND meeting_name = ? AND status = 1 ' =>
269 269
                     array($courseId, $sessionId, $meetingName)
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
 
273 273
         if ($this->hasGroupSupport()) {
274 274
             $groupId = api_get_group_id();
275
-            $conditions =  array(
275
+            $conditions = array(
276 276
                 'where' => array(
277 277
                     'c_id = ? AND session_id = ? AND meeting_name = ? AND group_id = ? AND status = 1 ' =>
278 278
                         array($courseId, $sessionId, $meetingName, $groupId)
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
 
370 370
             if ($this->debug) {
371 371
                 error_log(
372
-                    "meeting is running: " . intval($meetingInfoExists)
372
+                    "meeting is running: ".intval($meetingInfoExists)
373 373
                 );
374 374
             }
375 375
 
@@ -386,11 +386,11 @@  discard block
 block discarded – undo
386 386
 
387 387
         if ($meetingInfoExists) {
388 388
             $joinParams = array(
389
-                'meetingId' => $meetingData['remote_id'],	//	-- REQUIRED - A unique id for the meeting
390
-                'username' => $this->userCompleteName,	//-- REQUIRED - The name that will display for the user in the meeting
391
-                'password' => $pass,			//-- REQUIRED - The attendee or moderator password, depending on what's passed here
389
+                'meetingId' => $meetingData['remote_id'], //	-- REQUIRED - A unique id for the meeting
390
+                'username' => $this->userCompleteName, //-- REQUIRED - The name that will display for the user in the meeting
391
+                'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here
392 392
                 //'createTime' => api_get_utc_datetime(),			//-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
393
-                'userID' => api_get_user_id(),				//-- OPTIONAL - string
393
+                'userID' => api_get_user_id(), //-- OPTIONAL - string
394 394
                 'webVoiceConf' => ''	//	-- OPTIONAL - string
395 395
             );
396 396
             $url = $this->api->getJoinMeetingURL($joinParams);
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
             $url = $this->logoutUrl;
400 400
         }
401 401
         if ($this->debug) {
402
-            error_log("return url :" . $url);
402
+            error_log("return url :".$url);
403 403
         }
404 404
 
405 405
         return $url;
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
         $courseId = api_get_course_int_id();
442 442
         $sessionId = api_get_session_id();
443 443
 
444
-        $conditions =  array(
444
+        $conditions = array(
445 445
             'where' => array(
446 446
                 'c_id = ? AND session_id = ? ' => array(
447 447
                     $courseId,
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
 
453 453
         if ($this->hasGroupSupport()) {
454 454
             $groupId = api_get_group_id();
455
-            $conditions =  array(
455
+            $conditions = array(
456 456
                 'where' => array(
457 457
                     'c_id = ? AND session_id = ? AND group_id = ? ' =>
458 458
                         array($courseId, $sessionId, $groupId)
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
             }
488 488
             $meetingBBB['end_url'] = $this->endUrl($meetingDB);
489 489
 
490
-            if ((string)$meetingBBB['returncode'] == 'FAILED') {
490
+            if ((string) $meetingBBB['returncode'] == 'FAILED') {
491 491
                 if ($meetingDB['status'] == 1 && $this->isConferenceManager()) {
492 492
                     $this->endMeeting($meetingDB['id']);
493 493
                 }
@@ -657,7 +657,7 @@  discard block
 block discarded – undo
657 657
                     $item['action_links'] = implode('<br />', $actionLinksArray);
658 658
                 }
659 659
                 //var_dump($recordArray);
660
-                $item['show_links']  = implode('<br />', $recordArray);
660
+                $item['show_links'] = implode('<br />', $recordArray);
661 661
                 $item['action_links'] = implode('<br />', $actionLinksArray);
662 662
             }
663 663
 
@@ -670,11 +670,11 @@  discard block
 block discarded – undo
670 670
 
671 671
             if ($meetingDB['status'] == 1) {
672 672
                 $joinParams = array(
673
-                    'meetingId' => $meetingDB['remote_id'],		//-- REQUIRED - A unique id for the meeting
674
-                    'username' => $this->userCompleteName,	//-- REQUIRED - The name that will display for the user in the meeting
675
-                    'password' => $pass,			//-- REQUIRED - The attendee or moderator password, depending on what's passed here
676
-                    'createTime' => '',			//-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
677
-                    'userID' => '',			//	-- OPTIONAL - string
673
+                    'meetingId' => $meetingDB['remote_id'], //-- REQUIRED - A unique id for the meeting
674
+                    'username' => $this->userCompleteName, //-- REQUIRED - The name that will display for the user in the meeting
675
+                    'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here
676
+                    'createTime' => '', //-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
677
+                    'userID' => '', //	-- OPTIONAL - string
678 678
                     'webVoiceConf' => ''	//	-- OPTIONAL - string
679 679
                 );
680 680
                 $item['go_url'] = $this->protocol.$this->api->getJoinMeetingURL($joinParams);
@@ -735,8 +735,8 @@  discard block
 block discarded – undo
735 735
         $pass = $this->getUserMeetingPassword();
736 736
 
737 737
         $endParams = array(
738
-            'meetingId' => $meetingData['remote_id'],   // REQUIRED - We have to know which meeting to end.
739
-            'password' => $pass,        // REQUIRED - Must match moderator pass for meeting.
738
+            'meetingId' => $meetingData['remote_id'], // REQUIRED - We have to know which meeting to end.
739
+            'password' => $pass, // REQUIRED - Must match moderator pass for meeting.
740 740
         );
741 741
         $this->api->endMeetingWithXmlResponseArray($endParams);
742 742
         Database::update(
@@ -961,7 +961,7 @@  discard block
 block discarded – undo
961 961
      */
962 962
     public function redirectToBBB($url)
963 963
     {
964
-        if (file_exists(__DIR__ . '/../config.vm.php')) {
964
+        if (file_exists(__DIR__.'/../config.vm.php')) {
965 965
             // Using VM
966 966
             echo Display::url(get_lang('ClickToContinue'), $url);
967 967
             exit;
Please login to merge, or discard this patch.