Completed
Push — 1.10.x ( a47b7a...621fef )
by
unknown
89:08 queued 37:34
created
main/inc/lib/database.lib.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
      *
67 67
      * @param string $table
68 68
      *
69
-     * @return mixed
69
+     * @return string
70 70
      */
71 71
     public static function get_main_table($table)
72 72
     {
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
 
266 266
     /**
267 267
      * Frees all the memory associated with the provided result identifier.
268
-     * @return bool     Returns TRUE on success or FALSE on failure.
268
+     * @return boolean|null     Returns TRUE on success or FALSE on failure.
269 269
      * Notes: Use this method if you are concerned about how much memory is being used for queries that return large result sets.
270 270
      * Anyway, all associated result memory is automatically freed at the end of the script's execution.
271 271
      */
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
381 381
      * @param array     $attributes
382 382
      * @param bool      $show_query
383 383
      *
384
-     * @return bool|int
384
+     * @return false|string
385 385
      */
386 386
     public static function insert($table_name, $attributes, $show_query = false)
387 387
     {
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
     }
675 675
 
676 676
     /**
677
-     * @param $table
677
+     * @param string $table
678 678
      * @return \Doctrine\DBAL\Schema\Column[]
679 679
      */
680 680
     public static function listTableColumns($table) 
Please login to merge, or discard this patch.
plugin/bbb/lib/bbb.lib.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -154,13 +154,13 @@  discard block
 block discarded – undo
154 154
         }
155 155
 
156 156
         $params['attendee_pw'] = isset($params['moderator_pw']) ? $params['moderator_pw'] : $courseCode;
157
-        $attendeePassword =  $params['attendee_pw'];
157
+        $attendeePassword = $params['attendee_pw'];
158 158
         $params['moderator_pw'] = isset($params['moderator_pw']) ? $params['moderator_pw'] : $this->getModMeetingPassword();
159 159
         $moderatorPassword = $params['moderator_pw'];
160 160
 
161 161
         $params['record'] = api_get_course_setting('big_blue_button_record_and_store', $courseCode) == 1 ? true : false;
162 162
         $max = api_get_course_setting('big_blue_button_max_students_allowed', $courseCode);
163
-        $max =  isset($max) ? $max : -1;
163
+        $max = isset($max) ? $max : -1;
164 164
 
165 165
         $params['status'] = 1;
166 166
         // Generate a pseudo-global-unique-id to avoid clash of conferences on
@@ -191,23 +191,23 @@  discard block
 block discarded – undo
191 191
             $duration = 300;
192 192
 
193 193
             $bbbParams = array(
194
-                'meetingId' => $params['remote_id'], 					// REQUIRED
195
-                'meetingName' => $meetingName, 	// REQUIRED
196
-                'attendeePw' => $attendeePassword, 					// Match this value in getJoinMeetingURL() to join as attendee.
197
-                'moderatorPw' => $moderatorPassword, 					// Match this value in getJoinMeetingURL() to join as moderator.
198
-                'welcomeMsg' => $welcomeMessage, 					// ''= use default. Change to customize.
199
-                'dialNumber' => '', 					// The main number to call into. Optional.
200
-                'voiceBridge' => $params['voice_bridge'], 					// PIN to join voice. Required.
201
-                'webVoice' => '', 						// Alphanumeric to join voice. Optional.
194
+                'meetingId' => $params['remote_id'], // REQUIRED
195
+                'meetingName' => $meetingName, // REQUIRED
196
+                'attendeePw' => $attendeePassword, // Match this value in getJoinMeetingURL() to join as attendee.
197
+                'moderatorPw' => $moderatorPassword, // Match this value in getJoinMeetingURL() to join as moderator.
198
+                'welcomeMsg' => $welcomeMessage, // ''= use default. Change to customize.
199
+                'dialNumber' => '', // The main number to call into. Optional.
200
+                'voiceBridge' => $params['voice_bridge'], // PIN to join voice. Required.
201
+                'webVoice' => '', // Alphanumeric to join voice. Optional.
202 202
                 'logoutUrl' =>  $this->logoutUrl,
203
-                'maxParticipants' => $max, 				// Optional. -1 = unlimitted. Not supported in BBB. [number]
204
-                'record' => $record, 					// New. 'true' will tell BBB to record the meeting.
205
-                'duration' => $duration, 				// Default = 0 which means no set duration in minutes. [number]
203
+                'maxParticipants' => $max, // Optional. -1 = unlimitted. Not supported in BBB. [number]
204
+                'record' => $record, // New. 'true' will tell BBB to record the meeting.
205
+                'duration' => $duration, // Default = 0 which means no set duration in minutes. [number]
206 206
                 //'meta_category' => '', 				// Use to pass additional info to BBB server. See API docs.
207 207
             );
208 208
 
209 209
             if ($this->debug) {
210
-                error_log("create_meeting params: ".print_r($bbbParams,1));
210
+                error_log("create_meeting params: ".print_r($bbbParams, 1));
211 211
             }
212 212
 
213 213
             $status = false;
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
                 if (isset($result) && strval($result['returncode']) == 'SUCCESS') {
221 221
                     if ($this->debug) {
222 222
                         error_log(
223
-                            "create_meeting result: " . print_r($result, 1)
223
+                            "create_meeting result: ".print_r($result, 1)
224 224
                         );
225 225
                     }
226 226
                     $meeting = $this->joinMeeting($meetingName, true);
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 
252 252
         $courseId = api_get_course_int_id();
253 253
         $sessionId = api_get_session_id();
254
-        $conditions =  array(
254
+        $conditions = array(
255 255
             'where' => array(
256 256
                 'c_id = ? AND session_id = ? AND meeting_name = ? AND status = 1 ' =>
257 257
                     array($courseId, $sessionId, $meetingName)
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 
261 261
         if ($this->hasGroupSupport()) {
262 262
             $groupId = api_get_group_id();
263
-            $conditions =  array(
263
+            $conditions = array(
264 264
                 'where' => array(
265 265
                     'c_id = ? AND session_id = ? AND meeting_name = ? AND group_id = ? AND status = 1 ' =>
266 266
                         array($courseId, $sessionId, $meetingName, $groupId)
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
 
358 358
             if ($this->debug) {
359 359
                 error_log(
360
-                    "meeting is running: " . intval($meetingInfoExists)
360
+                    "meeting is running: ".intval($meetingInfoExists)
361 361
                 );
362 362
             }
363 363
 
@@ -374,11 +374,11 @@  discard block
 block discarded – undo
374 374
 
375 375
         if ($meetingInfoExists) {
376 376
             $joinParams = array(
377
-                'meetingId' => $meetingData['remote_id'],	//	-- REQUIRED - A unique id for the meeting
378
-                'username' => $this->user_complete_name,	//-- REQUIRED - The name that will display for the user in the meeting
379
-                'password' => $pass,			//-- REQUIRED - The attendee or moderator password, depending on what's passed here
377
+                'meetingId' => $meetingData['remote_id'], //	-- REQUIRED - A unique id for the meeting
378
+                'username' => $this->user_complete_name, //-- REQUIRED - The name that will display for the user in the meeting
379
+                'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here
380 380
                 //'createTime' => api_get_utc_datetime(),			//-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
381
-                'userID' => api_get_user_id(),				//-- OPTIONAL - string
381
+                'userID' => api_get_user_id(), //-- OPTIONAL - string
382 382
                 'webVoiceConf' => ''	//	-- OPTIONAL - string
383 383
             );
384 384
             $url = $this->api->getJoinMeetingURL($joinParams);
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
             $url = $this->logoutUrl;
388 388
         }
389 389
         if ($this->debug) {
390
-            error_log("return url :" . $url);
390
+            error_log("return url :".$url);
391 391
         }
392 392
 
393 393
         return $url;
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
         $courseId = api_get_course_int_id();
430 430
         $sessionId  = api_get_session_id();
431 431
 
432
-        $conditions =  array(
432
+        $conditions = array(
433 433
             'where' => array(
434 434
                 'c_id = ? AND session_id = ? ' => array(
435 435
                     $courseId,
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
440 440
 
441 441
         if ($this->hasGroupSupport()) {
442 442
             $groupId = api_get_group_id();
443
-            $conditions =  array(
443
+            $conditions = array(
444 444
                 'where' => array(
445 445
                     'c_id = ? AND session_id = ? AND group_id = ? ' =>
446 446
                         array($courseId, $sessionId, $groupId)
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
             }
476 476
             $meetingBBB['end_url'] = $this->endUrl($meetingDB);
477 477
 
478
-            if ((string)$meetingBBB['returncode'] == 'FAILED') {
478
+            if ((string) $meetingBBB['returncode'] == 'FAILED') {
479 479
                 if ($meetingDB['status'] == 1 && $this->isConferenceManager()) {
480 480
                     $this->endMeeting($meetingDB['id']);
481 481
                 }
@@ -645,7 +645,7 @@  discard block
 block discarded – undo
645 645
                     $item['action_links'] = implode('<br />', $actionLinksArray);
646 646
                 }
647 647
                 //var_dump($recordArray);
648
-                $item['show_links']  = implode('<br />', $recordArray);
648
+                $item['show_links'] = implode('<br />', $recordArray);
649 649
                 $item['action_links'] = implode('<br />', $actionLinksArray);
650 650
             }
651 651
 
@@ -658,11 +658,11 @@  discard block
 block discarded – undo
658 658
 
659 659
             if ($meetingDB['status'] == 1) {
660 660
                 $joinParams = array(
661
-                    'meetingId' => $meetingDB['remote_id'],		//-- REQUIRED - A unique id for the meeting
662
-                    'username' => $this->user_complete_name,	//-- REQUIRED - The name that will display for the user in the meeting
663
-                    'password' => $pass,			//-- REQUIRED - The attendee or moderator password, depending on what's passed here
664
-                    'createTime' => '',			//-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
665
-                    'userID' => '',			//	-- OPTIONAL - string
661
+                    'meetingId' => $meetingDB['remote_id'], //-- REQUIRED - A unique id for the meeting
662
+                    'username' => $this->user_complete_name, //-- REQUIRED - The name that will display for the user in the meeting
663
+                    'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here
664
+                    'createTime' => '', //-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
665
+                    'userID' => '', //	-- OPTIONAL - string
666 666
                     'webVoiceConf' => ''	//	-- OPTIONAL - string
667 667
                 );
668 668
                 $item['go_url'] = $this->protocol.$this->api->getJoinMeetingURL($joinParams);
@@ -723,8 +723,8 @@  discard block
 block discarded – undo
723 723
         $pass = $this->getUserMeetingPassword();
724 724
 
725 725
         $endParams = array(
726
-            'meetingId' => $meetingData['remote_id'],   // REQUIRED - We have to know which meeting to end.
727
-            'password' => $pass,        // REQUIRED - Must match moderator pass for meeting.
726
+            'meetingId' => $meetingData['remote_id'], // REQUIRED - We have to know which meeting to end.
727
+            'password' => $pass, // REQUIRED - Must match moderator pass for meeting.
728 728
         );
729 729
         $this->api->endMeetingWithXmlResponseArray($endParams);
730 730
         Database::update(
@@ -949,7 +949,7 @@  discard block
 block discarded – undo
949 949
      */
950 950
     public function redirectToBBB($url)
951 951
     {
952
-        if (file_exists(__DIR__ . '/../config.vm.php')) {
952
+        if (file_exists(__DIR__.'/../config.vm.php')) {
953 953
             // Using VM
954 954
             echo Display::url(get_lang('ClickToContinue'), $url);
955 955
             exit;
Please login to merge, or discard this patch.