Completed
Push — 1.10.x ( 7ba96a...85aec4 )
by Angel Fernando Quiroz
109:18 queued 69:54
created
plugin/bbb/ajax.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 $course_plugin = 'bbb'; //needed in order to load the plugin lang variables
8 8
 $cidReset = true;
9 9
 
10
-require_once __DIR__ . '/../../main/inc/global.inc.php';
10
+require_once __DIR__.'/../../main/inc/global.inc.php';
11 11
 
12 12
 $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : null;
13 13
 $meetingId = isset($_REQUEST['meeting']) ? intval($_REQUEST['meeting']) : 0;
@@ -33,10 +33,10 @@  discard block
 block discarded – undo
33 33
                 'first'
34 34
             );
35 35
 
36
-            $url = $meetingInfo['video_url'] . '/capture.m4v';
36
+            $url = $meetingInfo['video_url'].'/capture.m4v';
37 37
             $link = Display::url(
38 38
                 Display::return_icon('save.png', get_lang('DownloadFile')),
39
-                $meetingInfo['video_url'] . '/capture.m4v',
39
+                $meetingInfo['video_url'].'/capture.m4v',
40 40
                 ['target' => '_blank']
41 41
             );
42 42
 
Please login to merge, or discard this patch.
plugin/bbb/lib/bbb.lib.php 1 patch
Spacing   +37 added lines, -37 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
                 }
@@ -591,7 +591,7 @@  discard block
 block discarded – undo
591 591
                 }
592 592
 
593 593
                 $actionLinks = $this->getActionLinks($meetingDB, $record, $isGlobal, $isAdminReport);
594
-                $item['show_links']  = $recordLink;
594
+                $item['show_links'] = $recordLink;
595 595
                 $item['action_links'] = implode(PHP_EOL, $actionLinks);
596 596
             }
597 597
 
@@ -604,11 +604,11 @@  discard block
 block discarded – undo
604 604
 
605 605
             if ($meetingDB['status'] == 1) {
606 606
                 $joinParams = array(
607
-                    'meetingId' => $meetingDB['remote_id'],		//-- REQUIRED - A unique id for the meeting
608
-                    'username' => $this->userCompleteName,	//-- REQUIRED - The name that will display for the user in the meeting
609
-                    'password' => $pass,			//-- REQUIRED - The attendee or moderator password, depending on what's passed here
610
-                    'createTime' => '',			//-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
611
-                    'userID' => '',			//	-- OPTIONAL - string
607
+                    'meetingId' => $meetingDB['remote_id'], //-- REQUIRED - A unique id for the meeting
608
+                    'username' => $this->userCompleteName, //-- REQUIRED - The name that will display for the user in the meeting
609
+                    'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here
610
+                    'createTime' => '', //-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
611
+                    'userID' => '', //	-- OPTIONAL - string
612 612
                     'webVoiceConf' => ''	//	-- OPTIONAL - string
613 613
                 );
614 614
                 $item['go_url'] = $this->protocol.$this->api->getJoinMeetingURL($joinParams);
@@ -673,8 +673,8 @@  discard block
 block discarded – undo
673 673
         $pass = $this->getUserMeetingPassword();
674 674
 
675 675
         $endParams = array(
676
-            'meetingId' => $meetingData['remote_id'],   // REQUIRED - We have to know which meeting to end.
677
-            'password' => $pass,        // REQUIRED - Must match moderator pass for meeting.
676
+            'meetingId' => $meetingData['remote_id'], // REQUIRED - We have to know which meeting to end.
677
+            'password' => $pass, // REQUIRED - Must match moderator pass for meeting.
678 678
         );
679 679
         $this->api->endMeetingWithXmlResponseArray($endParams);
680 680
         Database::update(
@@ -899,7 +899,7 @@  discard block
 block discarded – undo
899 899
      */
900 900
     public function redirectToBBB($url)
901 901
     {
902
-        if (file_exists(__DIR__ . '/../config.vm.php')) {
902
+        if (file_exists(__DIR__.'/../config.vm.php')) {
903 903
             // Using VM
904 904
             echo Display::url(get_lang('ClickToContinue'), $url);
905 905
             exit;
@@ -1114,7 +1114,7 @@  discard block
 block discarded – undo
1114 1114
         if ($meetingInfo['has_video_m4v']) {
1115 1115
             $links[] = Display::url(
1116 1116
                 Display::return_icon('save.png', get_lang('DownloadFile')),
1117
-                $recordInfo['playbackFormatUrl'] . '/capture.m4v',
1117
+                $recordInfo['playbackFormatUrl'].'/capture.m4v',
1118 1118
                 ['target' => '_blank']
1119 1119
             );
1120 1120
         } else {
@@ -1179,7 +1179,7 @@  discard block
 block discarded – undo
1179 1179
             return false;
1180 1180
         }
1181 1181
 
1182
-        $hasCapture = SocialManager::verifyUrl($meetingInfo['video_url'] . '/capture.m4v');
1182
+        $hasCapture = SocialManager::verifyUrl($meetingInfo['video_url'].'/capture.m4v');
1183 1183
 
1184 1184
         if ($hasCapture) {
1185 1185
             return Database::update(
Please login to merge, or discard this patch.
plugin/bbb/admin.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 $course_plugin = 'bbb'; //needed in order to load the plugin lang variables
10 10
 $cidReset = true;
11 11
 
12
-require_once __DIR__ . '/../../main/inc/global.inc.php';
12
+require_once __DIR__.'/../../main/inc/global.inc.php';
13 13
 
14 14
 api_protect_admin_script();
15 15
 
@@ -73,9 +73,9 @@  discard block
 block discarded – undo
73 73
 }
74 74
 
75 75
 $htmlHeadXtra[] = api_get_js_simple(
76
-    api_get_path(WEB_PLUGIN_PATH) . 'bbb/resources/utils.js'
76
+    api_get_path(WEB_PLUGIN_PATH).'bbb/resources/utils.js'
77 77
 );
78
-$htmlHeadXtra[] = "<script>var _p = {web_plugin: '" . api_get_path(WEB_PLUGIN_PATH). "'}</script>";
78
+$htmlHeadXtra[] = "<script>var _p = {web_plugin: '".api_get_path(WEB_PLUGIN_PATH)."'}</script>";
79 79
 
80 80
 $tpl = new Template($tool_name);
81 81
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 if ($meetings) {
88 88
     $actions[] = Display::toolbarButton(
89 89
         get_lang('ExportInExcel'),
90
-        api_get_self() . '?action=export',
90
+        api_get_self().'?action=export',
91 91
         'file-excel-o',
92 92
         'success'
93 93
     );
Please login to merge, or discard this patch.