Completed
Pull Request — v2.2-stable (#75)
by
unknown
02:00
created
bbb_broker.php 2 patches
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -440,26 +440,26 @@  discard block
 block discarded – undo
440 440
             return array(
441 441
                 'status' => false,
442 442
                 'message' => get_string('view_recording_publish_link_deleted', 'bigbluebuttonbn')
443
-              );
443
+                );
444 444
         }
445 445
         if ($realrecordings[$params['id']]['published'] !== 'true') {
446 446
             return array(
447 447
                 'status' => false,
448 448
                 'message' => get_string('view_recording_publish_link_not_published', 'bigbluebuttonbn')
449
-              );
449
+                );
450 450
         }
451 451
         return array(
452 452
             'status' => bigbluebuttonbn_publish_recording_imported(
453 453
                 $recordings[$params['id']]['imported'], true
454 454
             )
455
-          );
455
+            );
456 456
     }
457 457
     // As the recordingid was not identified as imported recording link, execute actual publish.
458 458
     return array(
459 459
         'status' => bigbluebuttonbn_publish_recordings(
460 460
             $params['id'], 'true'
461 461
         )
462
-      );
462
+        );
463 463
 }
464 464
 
465 465
 /**
@@ -480,26 +480,26 @@  discard block
 block discarded – undo
480 480
             return array(
481 481
                 'status' => false,
482 482
                 'message' => get_string('view_recording_unprotect_link_deleted', 'bigbluebuttonbn')
483
-              );
483
+                );
484 484
         }
485 485
         if ($realrecordings[$params['id']]['protected'] === 'true') {
486 486
             return array(
487 487
                 'status' => false,
488 488
                 'message' => get_string('view_recording_unprotect_link_not_unprotected', 'bigbluebuttonbn')
489
-              );
489
+                );
490 490
         }
491 491
         return array(
492 492
             'status' => bigbluebuttonbn_protect_recording_imported(
493 493
                 $recordings[$params['id']]['imported'], false
494 494
             )
495
-          );
495
+            );
496 496
     }
497 497
     // As the recordingid was not identified as imported recording link, execute actual uprotect.
498 498
     return array(
499 499
         'status' => bigbluebuttonbn_update_recordings(
500 500
             $params['id'], array('protect' => 'false')
501 501
         )
502
-      );
502
+        );
503 503
 }
504 504
 
505 505
 /**
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
             'status' => bigbluebuttonbn_publish_recording_imported(
519 519
                 $recordings[$params['id']]['imported'], false
520 520
             )
521
-          );
521
+            );
522 522
     }
523 523
     // As the recordingid was not identified as imported recording link, execute unpublish on a real recording.
524 524
     // First: Unpublish imported links associated to the recording.
@@ -536,7 +536,7 @@  discard block
 block discarded – undo
536 536
         'status' => bigbluebuttonbn_publish_recordings(
537 537
             $params['id'], 'false'
538 538
         )
539
-      );
539
+        );
540 540
 }
541 541
 
542 542
 /**
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
             'status' => bigbluebuttonbn_protect_recording_imported(
556 556
                 $recordings[$params['id']]['imported'], true
557 557
             )
558
-          );
558
+            );
559 559
     }
560 560
     // As the recordingid was not identified as imported recording link, execute protect on a real recording.
561 561
     // First: Protect imported links associated to the recording.
@@ -573,7 +573,7 @@  discard block
 block discarded – undo
573 573
         'status' => bigbluebuttonbn_update_recordings(
574 574
             $params['id'], array('protect' => 'true')
575 575
         )
576
-      );
576
+        );
577 577
 }
578 578
 
579 579
 /**
@@ -592,7 +592,7 @@  discard block
 block discarded – undo
592 592
             'status' => bigbluebuttonbn_delete_recording_imported(
593 593
                 $recordings[$params['id']]['imported']
594 594
             )
595
-          );
595
+            );
596 596
     }
597 597
     // As the recordingid was not identified as imported recording link, execute delete on a real recording.
598 598
     // First: Delete imported links associated to the recording.
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
     // Second: Execute the actual delete.
607 607
     return array(
608 608
         'status' => bigbluebuttonbn_delete_recordings($params['id'])
609
-      );
609
+        );
610 610
 }
611 611
 
612 612
 /**
@@ -624,7 +624,7 @@  discard block
 block discarded – undo
624 624
             'status' => bigbluebuttonbn_update_recording_imported(
625 625
                 $recordings[$params['id']]['imported'], json_decode($params['meta'], true)
626 626
             )
627
-          );
627
+            );
628 628
     }
629 629
 
630 630
     // As the recordingid was not identified as imported recording link, execute update on a real recording.
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
         'status' => bigbluebuttonbn_update_recordings(
635 635
             $params['id'], json_decode($params['meta'])
636 636
         )
637
-      );
637
+        );
638 638
 }
639 639
 
640 640
 /**
@@ -675,7 +675,7 @@  discard block
 block discarded – undo
675 675
             $meta = '{"recordid":'.$decodedparameters->record_id.'}';
676 676
             bigbluebuttonbn_log($bigbluebuttonbn, BIGBLUEBUTTON_LOG_EVENT_CALLBACK, $overrides, $meta);
677 677
         } else {
678
-          bigbluebuttonbn_send_notification_recording_ready($bigbluebuttonbn);
678
+            bigbluebuttonbn_send_notification_recording_ready($bigbluebuttonbn);
679 679
         }
680 680
         header('HTTP/1.0 202 Accepted');
681 681
     } catch (Exception $e) {
@@ -811,11 +811,11 @@  discard block
 block discarded – undo
811 811
     $params['recording_ready'] = [
812 812
             'bigbluebuttonbn' => 'An id for the bigbluebuttonbn instance should be included.',
813 813
             'signed_parameters' => 'A JWT encoded string must be included as [signed_parameters].'
814
-          ];
814
+            ];
815 815
     $params['live_session_events'] = [
816 816
             'bigbluebuttonbn' => 'An id for the bigbluebuttonbn instance should be included.',
817 817
             'signed_parameters' => 'A JWT encoded string must be included as [signed_parameters].'
818
-          ];
818
+            ];
819 819
     return $params;
820 820
 }
821 821
 
@@ -828,9 +828,9 @@  discard block
 block discarded – undo
828 828
  */
829 829
 function bigbluebuttonbn_broker_required_parameters_default($id) {
830 830
     return [
831
-              'id' => "The {$id} must be specified.",
832
-              'callback' => 'This call must include a javascript callback.'
833
-           ];
831
+                'id' => "The {$id} must be specified.",
832
+                'callback' => 'This call must include a javascript callback.'
833
+            ];
834 834
 }
835 835
 
836 836
 /**
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
24 24
  */
25 25
 
26 26
 
27
-require_once(dirname(dirname(dirname(__FILE__))).'/config.php');
28
-require_once(dirname(__FILE__).'/locallib.php');
27
+require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
28
+require_once(dirname(__FILE__) . '/locallib.php');
29 29
 
30 30
 use \Firebase\JWT\JWT;
31 31
 
@@ -41,13 +41,13 @@  discard block
 block discarded – undo
41 41
 $params['meta'] = optional_param('meta', '', PARAM_TEXT);
42 42
 
43 43
 if (empty($params['action'])) {
44
-    header('HTTP/1.0 400 Bad Request. Parameter ['.$params['action'].'] was not included');
44
+    header('HTTP/1.0 400 Bad Request. Parameter [' . $params['action'] . '] was not included');
45 45
     return;
46 46
 }
47 47
 
48 48
 $error = bigbluebuttonbn_broker_validate_parameters($params);
49 49
 if (!empty($error)) {
50
-    header('HTTP/1.0 400 Bad Request. '.$error);
50
+    header('HTTP/1.0 400 Bad Request. ' . $error);
51 51
     return;
52 52
 }
53 53
 
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
132 132
         bigbluebuttonbn_broker_live_session_events($params, $bigbluebuttonbn, $cm);
133 133
         return;
134 134
     }
135
-    header('HTTP/1.0 400 Bad request. The action '. $a . ' doesn\'t exist');
135
+    header('HTTP/1.0 400 Bad request. The action ' . $a . ' doesn\'t exist');
136 136
     return;
137 137
 
138 138
 } catch (Exception $e) {
139
-    header('HTTP/1.0 500 Internal Server Error. '.$e->getMessage());
139
+    header('HTTP/1.0 500 Internal Server Error. ' . $e->getMessage());
140 140
     return;
141 141
 }
142 142
 
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 function bigbluebuttonbn_broker_recording_info_current($recording, $params) {
323 323
     $callbackresponse['status'] = true;
324 324
     $callbackresponse['found'] = true;
325
-    $callbackresponse['published'] = (string) $recording['published'];
325
+    $callbackresponse['published'] = (string)$recording['published'];
326 326
     if (!isset($params['meta']) || empty($params['meta'])) {
327 327
         return $callbackresponse;
328 328
     }
@@ -651,8 +651,8 @@  discard block
 block discarded – undo
651 651
         $decodedparameters = JWT::decode($params['signed_parameters'],
652 652
             \mod_bigbluebuttonbn\locallib\config::get('shared_secret'), array('HS256'));
653 653
     } catch (Exception $e) {
654
-        $error = 'Caught exception: '.$e->getMessage();
655
-        header('HTTP/1.0 400 Bad Request. '.$error);
654
+        $error = 'Caught exception: ' . $e->getMessage();
655
+        header('HTTP/1.0 400 Bad Request. ' . $error);
656 656
         return;
657 657
     }
658 658
 
@@ -672,15 +672,15 @@  discard block
 block discarded – undo
672 672
                 bigbluebuttonbn_send_notification_recording_ready($bigbluebuttonbn);
673 673
             }
674 674
             $overrides = array('meetingid' => $decodedparameters->meeting_id);
675
-            $meta = '{"recordid":'.$decodedparameters->record_id.'}';
675
+            $meta = '{"recordid":' . $decodedparameters->record_id . '}';
676 676
             bigbluebuttonbn_log($bigbluebuttonbn, BIGBLUEBUTTON_LOG_EVENT_CALLBACK, $overrides, $meta);
677 677
         } else {
678 678
           bigbluebuttonbn_send_notification_recording_ready($bigbluebuttonbn);
679 679
         }
680 680
         header('HTTP/1.0 202 Accepted');
681 681
     } catch (Exception $e) {
682
-        $error = 'Caught exception: '.$e->getMessage();
683
-        header('HTTP/1.0 503 Service Unavailable. '.$error);
682
+        $error = 'Caught exception: ' . $e->getMessage();
683
+        header('HTTP/1.0 503 Service Unavailable. ' . $error);
684 684
     }
685 685
 }
686 686
 
@@ -701,13 +701,13 @@  discard block
 block discarded – undo
701 701
     $importrecordings = $SESSION->bigbluebuttonbn_importrecordings;
702 702
     if (!isset($importrecordings[$params['id']])) {
703 703
         $error = "Recording {$params['id']} could not be found. It can not be imported";
704
-        header('HTTP/1.0 404 Not found. '.$error);
704
+        header('HTTP/1.0 404 Not found. ' . $error);
705 705
         return;
706 706
     }
707 707
     $callbackresponse = array('status' => true);
708 708
     $importrecordings[$params['id']]['imported'] = true;
709 709
     $overrides = array('meetingid' => $importrecordings[$params['id']]['meetingID']);
710
-    $meta = '{"recording":'.json_encode($importrecordings[$params['id']]).'}';
710
+    $meta = '{"recording":' . json_encode($importrecordings[$params['id']]) . '}';
711 711
     bigbluebuttonbn_log($bbbsession['bigbluebuttonbn'], BIGBLUEBUTTONBN_LOG_EVENT_IMPORT, $overrides, $meta);
712 712
     // Moodle event logger: Create an event for recording imported.
713 713
     if (isset($bbbsession['bigbluebutton']) && isset($bbbsession['cm'])) {
@@ -733,8 +733,8 @@  discard block
 block discarded – undo
733 733
         $decodedparameters = JWT::decode($params['signed_parameters'],
734 734
             \mod_bigbluebuttonbn\locallib\config::get('shared_secret'), array('HS256'));
735 735
     } catch (Exception $e) {
736
-        $error = 'Caught exception: '.$e->getMessage();
737
-        header('HTTP/1.0 400 Bad Request. '.$error);
736
+        $error = 'Caught exception: ' . $e->getMessage();
737
+        header('HTTP/1.0 400 Bad Request. ' . $error);
738 738
         return;
739 739
     }
740 740
     // Validate that the bigbluebuttonbn activity corresponds to the meeting_id received.
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
769 769
     $requiredparams = bigbluebuttonbn_broker_required_parameters();
770 770
     $action = strtolower($params['action']);
771 771
     if (!array_key_exists($action, $requiredparams)) {
772
-        return 'Action '.$params['action'].' can not be performed.';
772
+        return 'Action ' . $params['action'] . ' can not be performed.';
773 773
     }
774 774
     return bigbluebuttonbn_broker_validate_parameters_message($params, $requiredparams[$action]);
775 775
 }
Please login to merge, or discard this patch.