blindsidenetworks / moodle-mod_bigbluebuttonbn

bbb_view.php

Switch Indentation +105 added lines, -105 removed lines

@@ -47,126 +47,126 @@
     $bbbsession = $SESSION->bigbluebuttonbn_bbbsession;
 }
 switch (strtolower($action)) {
-    case 'logout':
-        if (isset($errors) && $errors != '') {
-            bigbluebutton_bbb_view_errors($errors, $id);
+        case 'logout':
+            if (isset($errors) && $errors != '') {
+                bigbluebutton_bbb_view_errors($errors, $id);
 
-        } else if (isset($bbbsession) && !is_null($bbbsession)) {
-            /// Moodle event logger: Create an event for meeting left
-            bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_MEETING_LEFT, $bigbluebuttonbn, $context, $cm);
+            } else if (isset($bbbsession) && !is_null($bbbsession)) {
+                /// Moodle event logger: Create an event for meeting left
+                bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_MEETING_LEFT, $bigbluebuttonbn, $context, $cm);
 
-            /// Update the cache
-            $meeting_info = bigbluebuttonbn_bbb_broker_get_meeting_info($bbbsession['meetingid'], $bbbsession['modPW'], BIGBLUEBUTTONBN_FORCED);
+                /// Update the cache
+                $meeting_info = bigbluebuttonbn_bbb_broker_get_meeting_info($bbbsession['meetingid'], $bbbsession['modPW'], BIGBLUEBUTTONBN_FORCED);
 
-            /// Close the tab or window where BBB was opened
-            bigbluebutton_bbb_view_close_window();
-
-        } else {
-            bigbluebutton_bbb_view_close_window_manually();
-        }
-        break;
-    case 'join':
-        if (isset($bbbsession) && !is_null($bbbsession)) {
-            //See if the session is in progress
-            if (bigbluebuttonbn_isMeetingRunning($bbbsession['meetingid'], $bbbsession['endpoint'], $bbbsession['shared_secret'])) {
-                /// Since the meeting is already running, we just join the session
-                bigbluebutton_bbb_view_execute_join($bbbsession, $cm, $context, $bigbluebuttonbn);
+                /// Close the tab or window where BBB was opened
+                bigbluebutton_bbb_view_close_window();
 
             } else {
-                // If user is administrator, moderator or if is viewer and no waiting is required
-                if ($bbbsession['administrator'] || $bbbsession['moderator'] || !$bbbsession['wait']) {
-                    /// Prepare the metadata
-                    $metadata = array("meta_bbb-origin" => $bbbsession['origin'],
-                            "meta_bbb-origin-version" => $bbbsession['originVersion'],
-                            "meta_bbb-origin-server-name" => $bbbsession['originServerName'],
-                            "meta_bbb-origin-server-common-name" => $bbbsession['originServerCommonName'],
-                            "meta_bbb-origin-tag" => $bbbsession['originTag'],
-                            "meta_bbb-context" => $bbbsession['course']->fullname,
-                            "meta_bbb-recording-name" => (isset($name) && $name != '') ? $name : $bbbsession['contextActivityName'],
-                            "meta_bbb-recording-description" => (isset($description) && $description != '') ? $description : $bbbsession['contextActivityDescription'],
-                            "meta_bbb-recording-tags" => (isset($tags) && $tags != '') ? $tags : $bbbsession['contextActivityTags'],
-                    );
-
-                    if (bigbluebuttonbn_server_offers_bn_capabilities()) {
-                        if (bigbluebuttonbn_get_cfg_recordingready_enabled()) {
-                            $metadata["meta_bn-recording-ready-url"] = $bbbsession['recordingReadyURL'];
-                        }
+                bigbluebutton_bbb_view_close_window_manually();
+            }
+            break;
+        case 'join':
+            if (isset($bbbsession) && !is_null($bbbsession)) {
+                //See if the session is in progress
+                if (bigbluebuttonbn_isMeetingRunning($bbbsession['meetingid'], $bbbsession['endpoint'], $bbbsession['shared_secret'])) {
+                    /// Since the meeting is already running, we just join the session
+                    bigbluebutton_bbb_view_execute_join($bbbsession, $cm, $context, $bigbluebuttonbn);
 
-                        if (bigbluebuttonbn_get_cfg_meetingevents_enabled()) {
-                            $metadata["meta_bn-meeting-events-url"] = $bbbsession['meetingEventsURL'];
+                } else {
+                    // If user is administrator, moderator or if is viewer and no waiting is required
+                    if ($bbbsession['administrator'] || $bbbsession['moderator'] || !$bbbsession['wait']) {
+                        /// Prepare the metadata
+                        $metadata = array("meta_bbb-origin" => $bbbsession['origin'],
+                                "meta_bbb-origin-version" => $bbbsession['originVersion'],
+                                "meta_bbb-origin-server-name" => $bbbsession['originServerName'],
+                                "meta_bbb-origin-server-common-name" => $bbbsession['originServerCommonName'],
+                                "meta_bbb-origin-tag" => $bbbsession['originTag'],
+                                "meta_bbb-context" => $bbbsession['course']->fullname,
+                                "meta_bbb-recording-name" => (isset($name) && $name != '') ? $name : $bbbsession['contextActivityName'],
+                                "meta_bbb-recording-description" => (isset($description) && $description != '') ? $description : $bbbsession['contextActivityDescription'],
+                                "meta_bbb-recording-tags" => (isset($tags) && $tags != '') ? $tags : $bbbsession['contextActivityTags'],
+                        );
+
+                        if (bigbluebuttonbn_server_offers_bn_capabilities()) {
+                            if (bigbluebuttonbn_get_cfg_recordingready_enabled()) {
+                                $metadata["meta_bn-recording-ready-url"] = $bbbsession['recordingReadyURL'];
+                            }
+
+                            if (bigbluebuttonbn_get_cfg_meetingevents_enabled()) {
+                                $metadata["meta_bn-meeting-events-url"] = $bbbsession['meetingEventsURL'];
+                            }
                         }
-                    }
 
-                    /// Set the duration for the meeting
-                    if (bigbluebuttonbn_get_cfg_scheduled_duration_enabled()) {
-                        $durationtime = bigbluebuttonbn_get_duration($bigbluebuttonbn->openingtime, $bigbluebuttonbn->closingtime);
-                        if ($durationtime > 0) {
-                                                    $bbbsession['welcome'] .= '<br><br>' . str_replace("%duration%", '' . $durationtime, get_string('bbbdurationwarning', 'bigbluebuttonbn'));
-                        }
-                    } else {
-                        $durationtime = 0;
-                    }
-                    /// Execute the create command
-                    $response = bigbluebuttonbn_getCreateMeetingArray(
-                            $bbbsession['meetingname'],
-                            $bbbsession['meetingid'],
-                            $bbbsession['welcome'],
-                            $bbbsession['modPW'],
-                            $bbbsession['viewerPW'],
-                            $bbbsession['shared_secret'],
-                            $bbbsession['endpoint'],
-                            $bbbsession['logoutURL'],
-                            $bbbsession['record'] ? 'true' : 'false',
-                            $durationtime,
-                            $bbbsession['voicebridge'],
-                            $bbbsession['userlimit'],
-                            $metadata,
-                            $bbbsession['presentation']['name'],
-                            $bbbsession['presentation']['url']
-                    );
-
-                    if (!$response) {
-                        // If the server is unreachable, then prompts the user of the necessary action
-                        if ($bbbsession['administrator']) {
-                            print_error('view_error_unable_join', 'bigbluebuttonbn', $CFG->wwwroot . '/admin/settings.php?section=modsettingbigbluebuttonbn');
-                        } else if ($bbbsession['moderator']) {
-                            print_error('view_error_unable_join_teacher', 'bigbluebuttonbn', $CFG->wwwroot . '/admin/settings.php?section=modsettingbigbluebuttonbn');
+                        /// Set the duration for the meeting
+                        if (bigbluebuttonbn_get_cfg_scheduled_duration_enabled()) {
+                            $durationtime = bigbluebuttonbn_get_duration($bigbluebuttonbn->openingtime, $bigbluebuttonbn->closingtime);
+                            if ($durationtime > 0) {
+                                                        $bbbsession['welcome'] .= '<br><br>' . str_replace("%duration%", '' . $durationtime, get_string('bbbdurationwarning', 'bigbluebuttonbn'));
+                            }
                         } else {
-                            print_error('view_error_unable_join_student', 'bigbluebuttonbn', $CFG->wwwroot . '/admin/settings.php?section=modsettingbigbluebuttonbn');
+                            $durationtime = 0;
                         }
-
-                    } else if ($response['returncode'] == "FAILED") {
-                        // The meeting was not created
-                        $error_key = bigbluebuttonbn_get_error_key($response['messageKey'], 'view_error_create');
-                        if (!$error_key) {
-                            print_error($response['message'], 'bigbluebuttonbn');
-                        } else {
-                            print_error($error_key, 'bigbluebuttonbn');
+                        /// Execute the create command
+                        $response = bigbluebuttonbn_getCreateMeetingArray(
+                                $bbbsession['meetingname'],
+                                $bbbsession['meetingid'],
+                                $bbbsession['welcome'],
+                                $bbbsession['modPW'],
+                                $bbbsession['viewerPW'],
+                                $bbbsession['shared_secret'],
+                                $bbbsession['endpoint'],
+                                $bbbsession['logoutURL'],
+                                $bbbsession['record'] ? 'true' : 'false',
+                                $durationtime,
+                                $bbbsession['voicebridge'],
+                                $bbbsession['userlimit'],
+                                $metadata,
+                                $bbbsession['presentation']['name'],
+                                $bbbsession['presentation']['url']
+                        );
+
+                        if (!$response) {
+                            // If the server is unreachable, then prompts the user of the necessary action
+                            if ($bbbsession['administrator']) {
+                                print_error('view_error_unable_join', 'bigbluebuttonbn', $CFG->wwwroot . '/admin/settings.php?section=modsettingbigbluebuttonbn');
+                            } else if ($bbbsession['moderator']) {
+                                print_error('view_error_unable_join_teacher', 'bigbluebuttonbn', $CFG->wwwroot . '/admin/settings.php?section=modsettingbigbluebuttonbn');
+                            } else {
+                                print_error('view_error_unable_join_student', 'bigbluebuttonbn', $CFG->wwwroot . '/admin/settings.php?section=modsettingbigbluebuttonbn');
+                            }
+
+                        } else if ($response['returncode'] == "FAILED") {
+                            // The meeting was not created
+                            $error_key = bigbluebuttonbn_get_error_key($response['messageKey'], 'view_error_create');
+                            if (!$error_key) {
+                                print_error($response['message'], 'bigbluebuttonbn');
+                            } else {
+                                print_error($error_key, 'bigbluebuttonbn');
+                            }
+
+                        } else if ($response['hasBeenForciblyEnded'] == "true") {
+                            print_error(get_string('index_error_forciblyended', 'bigbluebuttonbn'));
+
+                        } else { ///////////////Everything is ok /////////////////////
+                            /// Moodle event logger: Create an event for meeting created
+                            bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_MEETING_CREATED, $bigbluebuttonbn, $context, $cm);
+                            /// Internal logger: Insert a record with the meeting created
+                            bigbluebuttonbn_logs($bbbsession, BIGBLUEBUTTONBN_LOG_EVENT_CREATE);
+                            /// Since the meeting is already running, we just join the session
+                            bigbluebutton_bbb_view_execute_join($bbbsession, $cm, $context, $bigbluebuttonbn);
                         }
 
-                    } else if ($response['hasBeenForciblyEnded'] == "true") {
-                        print_error(get_string('index_error_forciblyended', 'bigbluebuttonbn'));
-
-                    } else { ///////////////Everything is ok /////////////////////
-                        /// Moodle event logger: Create an event for meeting created
-                        bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_MEETING_CREATED, $bigbluebuttonbn, $context, $cm);
-                        /// Internal logger: Insert a record with the meeting created
-                        bigbluebuttonbn_logs($bbbsession, BIGBLUEBUTTONBN_LOG_EVENT_CREATE);
-                        /// Since the meeting is already running, we just join the session
-                        bigbluebutton_bbb_view_execute_join($bbbsession, $cm, $context, $bigbluebuttonbn);
+                    } else {
+                        header('Location: ' . $bbbsession['logoutURL']);
                     }
-
-                } else {
-                    header('Location: ' . $bbbsession['logoutURL']);
                 }
-            }
 
-        } else {
-            print_error('view_error_unable_join', 'bigbluebuttonbn');
-        }
-        break;
-    default:
-        bigbluebutton_bbb_view_close_window();
+            } else {
+                print_error('view_error_unable_join', 'bigbluebuttonbn');
+            }
+            break;
+        default:
+            bigbluebutton_bbb_view_close_window();
 }
 
 

Spacing +1 added lines, -1 removed lines

@@ -211,7 +211,7 @@
 function bigbluebutton_bbb_view_errors($sErrors, $id) {
     global $CFG, $OUTPUT, $PAGE;
 
-    $errors = (array) json_decode(urldecode($sErrors));
+    $errors = (array)json_decode(urldecode($sErrors));
     $msgErrors = "";
     foreach ($errors as $error) {
         $msgErrors .= html_writer::tag('p', $error->{"message"}, array('class' => 'alert alert-danger')) . "\n";

backup/moodle2/restore_bigbluebuttonbn_stepslib.php

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
     protected function process_bigbluebuttonbn($data) {
         global $DB;
 
-        $data = (object) $data;
+        $data = (object)$data;
         $data->course = $this->get_courseid();
 
         $data->timemodified = $this->apply_date_offset($data->timemodified);
@@ -60,7 +60,7 @@ 
     protected function process_bigbluebuttonbn_logs($data) {
         global $DB;
 
-        $data = (object) $data;
+        $data = (object)$data;
         // Apply modifications
         $data->courseid = $this->get_mappingid('course', $data->courseid);
         $data->bigbluebuttonbnid = $this->get_new_parentid('bigbluebuttonbn');

classes/event/bigbluebuttonbn_recording_published.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      */
     public function get_description() {
         $rid = isset($this->other['rid']) ? $this->other['rid'] : '';
-        $a = (object) array('userid' => $this->userid, 'recordingid' => $rid, 'courseid' => $this->contextinstanceid);
+        $a = (object)array('userid' => $this->userid, 'recordingid' => $rid, 'courseid' => $this->contextinstanceid);
         return "The user with id '$a->userid' has published a recording with id '$a->recordingid' in the course id '$a->courseid'.";
     }
 

classes/event/bigbluebuttonbn_meeting_event.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
      * @return string
      */
     public function get_description() {
-        $a = (object) array('userid' => $this->userid, 'bigbluebuttonbnid' => $this->objectid, 'courseid' => $this->contextinstanceid, 'action' => $this->other);
+        $a = (object)array('userid' => $this->userid, 'bigbluebuttonbnid' => $this->objectid, 'courseid' => $this->contextinstanceid, 'action' => $this->other);
         return "The user with id '$a->userid' triggered action $a->action in a bigbluebutton meeting for the bigbluebuttonbn activity with id '$a->bigbluebuttonbnid' for the course id '$a->courseid'.";
     }
 

classes/event/bigbluebuttonbn_recording_unpublished.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      */
     public function get_description() {
         $rid = isset($this->other['rid']) ? $this->other['rid'] : '';
-        $a = (object) array('userid' => $this->userid, 'recordingid' => $rid, 'courseid' => $this->contextinstanceid);
+        $a = (object)array('userid' => $this->userid, 'recordingid' => $rid, 'courseid' => $this->contextinstanceid);
         return "The user with id '$a->userid' has unpublished a recording with id '$a->recordingid' in the course id '$a->courseid'.";
     }
 

classes/event/bigbluebuttonbn_recording_deleted.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      */
     public function get_description() {
         $rid = isset($this->other['rid']) ? $this->other['rid'] : '';
-        $a = (object) array('userid' => $this->userid, 'recordingid' => $rid, 'courseid' => $this->contextinstanceid);
+        $a = (object)array('userid' => $this->userid, 'recordingid' => $rid, 'courseid' => $this->contextinstanceid);
         return "The user with id '$a->userid' has deleted a recording with id '$a->recordingid' from the course id '$a->courseid'.";
     }
 

classes/event/bigbluebuttonbn_recording_imported.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      */
     public function get_description() {
         $rid = isset($this->other['rid']) ? $this->other['rid'] : '';
-        $a = (object) array('userid' => $this->userid, 'recordingid' => $rid, 'courseid' => $this->contextinstanceid);
+        $a = (object)array('userid' => $this->userid, 'recordingid' => $rid, 'courseid' => $this->contextinstanceid);
         return "The user with id '$a->userid' has imported a recording with id '$a->recordingid' into the course id '$a->courseid'.";
     }