blindsidenetworks / moodle-mod_bigbluebuttonbn

JWT.php

Doc Comments +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
      * Sign a string with a given key and algorithm.
      *
      * @param string $msg          The message to sign
-     * @param string|resource $key The secret key
+     * @param string $key The secret key
      * @param string $alg       The signing algorithm. Supported algorithms
      *                               are 'HS256', 'HS384', 'HS512' and 'RS256'
      *

Spacing +4 added lines, -4 removed lines

@@ -150,7 +150,7 @@ 
             throw new DomainException('Algorithm not supported');
         }
         list($function, $algorithm) = self::$supported_algs[$alg];
-        switch($function) {
+        switch ($function) {
             case 'hash_hmac':
                 return hash_hmac($algorithm, $msg, $key, true);
             case 'openssl':
@@ -181,7 +181,7 @@ 
         }
 
         list($function, $algorithm) = self::$supported_algs[$alg];
-        switch($function) {
+        switch ($function) {
             case 'openssl':
                 $success = openssl_verify($msg, $signature, $key, $algorithm);
                 if (!$success) {
@@ -228,8 +228,8 @@ 
              * manually detect large ints in the JSON string and quote them (thus converting
              *them to strings) before decoding, hence the preg_replace() call.
              */
-            $max_int_length = strlen((string) PHP_INT_MAX) - 1;
-            $json_without_bigints = preg_replace('/:\s*(-?\d{'.$max_int_length.',})/', ': "$1"', $input);
+            $max_int_length = strlen((string)PHP_INT_MAX) - 1;
+            $json_without_bigints = preg_replace('/:\s*(-?\d{' . $max_int_length . ',})/', ': "$1"', $input);
             $obj = json_decode($json_without_bigints);
         }
 

lib.php

Doc Comments +8 added lines, -10 removed lines

@@ -66,7 +66,6 @@ 
  * will create a new instance and return the id number
  * of the new instance.
  *
- * @param object $bigbluebuttonbn An object from the form in mod_form.php
  * @return int The id of the newly inserted bigbluebuttonbn record
  */
 function bigbluebuttonbn_add_instance($data, $mform) {
@@ -93,7 +92,6 @@ 
  * (defined by the form in mod_form.php) this function
  * will update an existing instance with new data.
  *
- * @param object $bigbluebuttonbn An object from the form in mod_form.php
  * @return boolean Success/Fail
  */
 function bigbluebuttonbn_update_instance($data, $mform) {
@@ -162,7 +160,7 @@ 
  * $return->time = the time they did it
  * $return->info = a short text description
  *
- * @return null
+ * @return boolean
  */
 function bigbluebuttonbn_user_outline($course, $user, $mod, $bigbluebuttonbn) {
     return true;
@@ -230,7 +228,7 @@ 
  * See other modules as example.
  *
  * @param int $bigbluebuttonbnid ID of an instance of this module
- * @return mixed boolean/array of students
+ * @return boolean boolean/array of students
  */
 function bigbluebuttonbn_get_participants($bigbluebuttonbnid) {
     return false;
@@ -238,7 +236,7 @@ 
 
 /**
  * Returns all other caps used in module
- * @return array
+ * @return string[]
  */
 function bigbluebuttonbn_get_extra_capabilities() {
     return array('moodle/site:accessallgroups');
@@ -255,7 +253,7 @@ 
  * as reference.
  *
  * @param int $bigbluebuttonbnid ID of an instance of this module
- * @return mixed
+ * @return boolean
  */
 function bigbluebuttonbn_scale_used($bigbluebuttonbnid, $scaleid) {
     $return = false;
@@ -288,7 +286,7 @@ 
 
 /**
  * List of view style log actions
- * @return array
+ * @return string[]
  */
 function bigbluebuttonbn_get_view_actions() {
     return array('view', 'view all');
@@ -296,7 +294,7 @@ 
 
 /**
  * List of update style log actions
- * @return array
+ * @return string[]
  */
 function bigbluebuttonbn_get_post_actions() {
     return array('update', 'add', 'create', 'join', 'end', 'left', 'publish', 'unpublish', 'delete');
@@ -310,7 +308,7 @@ 
  *
  * @global object
  * @param object $coursemodule
- * @return object|null
+ * @return null|cached_cm_info
  */
 function bigbluebuttonbn_get_coursemodule_info($coursemodule) {
     global $CFG, $DB;
@@ -502,7 +500,7 @@ 
  * @param array $args extra arguments
  * @param bool $forcedownload whether or not force download
  * @param array $options additional options affecting the file serving
- * @return bool false if file not found, does not return if found - justsend the file
+ * @return false|null false if file not found, does not return if found - justsend the file
  */
 function bigbluebuttonbn_pluginfile($course, $cm, $context, $filearea, $args, $forcedownload, array $options=array()) {
     global $CFG, $DB;

Indentation -1 removed lines

@@ -206,7 +206,6 @@
 
 /**
  * Prints single activity item prepared by {@see recordingsbn_get_recent_mod_activity()}
-
  * @return void
  */
 function bigbluebuttonbn_print_recent_mod_activity($activity, $courseid, $detail, $modnames, $viewfullnames) {

Spacing +83 added lines, -83 removed lines

@@ -13,23 +13,23 @@ 
 
 global $BIGBLUEBUTTONBN_CFG, $CFG;
 
-require_once($CFG->dirroot.'/calendar/lib.php');
-require_once($CFG->dirroot.'/message/lib.php');
-require_once($CFG->dirroot.'/mod/lti/OAuth.php');
-require_once($CFG->libdir.'/accesslib.php');
-require_once($CFG->libdir.'/completionlib.php');
-require_once($CFG->libdir.'/datalib.php');
-require_once($CFG->libdir.'/coursecatlib.php');
-require_once($CFG->libdir.'/enrollib.php');
-require_once($CFG->libdir.'/filelib.php');
-require_once($CFG->libdir.'/formslib.php');
-
-require_once(dirname(__FILE__).'/JWT.php');
-
-if( file_exists(dirname(__FILE__).'/config.php') ) {
-    require_once(dirname(__FILE__).'/config.php');
-    if( isset($BIGBLUEBUTTONBN_CFG) ) {
-        $CFG = (object) array_merge((array)$CFG, (array)$BIGBLUEBUTTONBN_CFG);
+require_once($CFG->dirroot . '/calendar/lib.php');
+require_once($CFG->dirroot . '/message/lib.php');
+require_once($CFG->dirroot . '/mod/lti/OAuth.php');
+require_once($CFG->libdir . '/accesslib.php');
+require_once($CFG->libdir . '/completionlib.php');
+require_once($CFG->libdir . '/datalib.php');
+require_once($CFG->libdir . '/coursecatlib.php');
+require_once($CFG->libdir . '/enrollib.php');
+require_once($CFG->libdir . '/filelib.php');
+require_once($CFG->libdir . '/formslib.php');
+
+require_once(dirname(__FILE__) . '/JWT.php');
+
+if (file_exists(dirname(__FILE__) . '/config.php')) {
+    require_once(dirname(__FILE__) . '/config.php');
+    if (isset($BIGBLUEBUTTONBN_CFG)) {
+        $CFG = (object)array_merge((array)$CFG, (array)$BIGBLUEBUTTONBN_CFG);
     }
 } else {
     $BIGBLUEBUTTONBN_CFG = new stdClass();
@@ -50,7 +50,7 @@ 
 const BIGBLUEBUTTONBN_LOG_EVENT_DELETE = "Delete";
 
 function bigbluebuttonbn_supports($feature) {
-    switch($feature) {
+    switch ($feature) {
         case FEATURE_IDNUMBER:                return true;
         case FEATURE_GROUPS:                  return true;
         case FEATURE_GROUPINGS:               return true;
@@ -79,7 +79,7 @@ 
 function bigbluebuttonbn_add_instance($data, $mform) {
     global $DB, $CFG;
 
-    $draftitemid = isset($data->presentation)? $data->presentation: null;
+    $draftitemid = isset($data->presentation) ? $data->presentation : null;
     $context = bigbluebuttonbn_get_context_module($data->coursemodule);
 
     bigbluebuttonbn_process_pre_save($data);
@@ -107,7 +107,7 @@ 
     global $DB, $CFG;
 
     $data->id = $data->instance;
-    $draftitemid = isset($data->presentation)? $data->presentation: null;
+    $draftitemid = isset($data->presentation) ? $data->presentation : null;
     $context = bigbluebuttonbn_get_context_module($data->coursemodule);
 
     bigbluebuttonbn_process_pre_save($data);
@@ -133,7 +133,7 @@ 
 function bigbluebuttonbn_delete_instance($id) {
     global $CFG, $DB, $USER;
 
-    if (! $bigbluebuttonbn = $DB->get_record('bigbluebuttonbn', array('id' => $id))) {
+    if (!$bigbluebuttonbn = $DB->get_record('bigbluebuttonbn', array('id' => $id))) {
         return false;
     }
 
@@ -151,11 +151,11 @@ 
     //if( bigbluebuttonbn_isMeetingRunning($meetingID, $url, $shared_secret) )
     //    $getArray = bigbluebuttonbn_doEndMeeting( $meetingID, $modPW, $url, $shared_secret );
 
-    if (! $DB->delete_records('bigbluebuttonbn', array('id' => $bigbluebuttonbn->id))) {
+    if (!$DB->delete_records('bigbluebuttonbn', array('id' => $bigbluebuttonbn->id))) {
         $result = false;
     }
 
-    if (! $DB->delete_records('event', array('modulename'=>'bigbluebuttonbn', 'instance'=>$bigbluebuttonbn->id))) {
+    if (!$DB->delete_records('event', array('modulename'=>'bigbluebuttonbn', 'instance'=>$bigbluebuttonbn->id))) {
         $result = false;
     }
 
@@ -171,19 +171,19 @@ 
     $logs = $DB->get_records('bigbluebuttonbn_logs', array('bigbluebuttonbnid' => $bigbluebuttonbn->id, 'log' => BIGBLUEBUTTONBN_LOG_EVENT_CREATE));
     error_log(json_encode($logs));
     $has_recordings = 'false';
-    if (! empty($logs) ) {
+    if (!empty($logs)) {
         error_log("IS not empty");
-        foreach ( $logs as $l ) {
+        foreach ($logs as $l) {
             error_log(json_encode($l));
             $meta = json_decode($l->meta);
-            if ( $meta->record ) {
+            if ($meta->record) {
                 $has_recordings = 'true';
             }
         }
     }
     $log->meta = "{\"has_recordings\":{$has_recordings}}";
 
-    if (! $returnid = $DB->insert_record('bigbluebuttonbn_logs', $log)) {
+    if (!$returnid = $DB->insert_record('bigbluebuttonbn_logs', $log)) {
         $result = false;
     }
 
@@ -221,7 +221,7 @@ 
  * @return boolean
  */
 function bigbluebuttonbn_print_recent_activity($course, $isteacher, $timestart) {
-    return false;  //  True if anything was printed, otherwise false
+    return false; //  True if anything was printed, otherwise false
 }
 
 /**
@@ -236,7 +236,7 @@ 
  * @param int $groupid defaults to 0
  * @return void adds items into $activities and increases $index
  */
-function bigbluebuttonbn_get_recent_mod_activity(&$activities, &$index, $timestart, $courseid, $cmid, $userid=0, $groupid=0) {
+function bigbluebuttonbn_get_recent_mod_activity(&$activities, &$index, $timestart, $courseid, $cmid, $userid = 0, $groupid = 0) {
 }
 
 /**
@@ -254,7 +254,7 @@ 
  *
  * @return boolean
  **/
-function bigbluebuttonbn_cron () {
+function bigbluebuttonbn_cron() {
     return true;
 }
 
@@ -350,7 +350,7 @@ 
 function bigbluebuttonbn_get_coursemodule_info($coursemodule) {
     global $CFG, $DB;
 
-    if ( !$bigbluebuttonbn = $DB->get_record('bigbluebuttonbn', array('id'=>$coursemodule->instance), 'id, name, intro, introformat, newwindow')) {
+    if (!$bigbluebuttonbn = $DB->get_record('bigbluebuttonbn', array('id'=>$coursemodule->instance), 'id, name, intro, introformat, newwindow')) {
         return NULL;
     }
 
@@ -376,10 +376,10 @@ 
 function bigbluebuttonbn_process_pre_save(&$bigbluebuttonbn) {
     global $DB, $CFG;
 
-    if ( !isset($bigbluebuttonbn->timecreated) || !$bigbluebuttonbn->timecreated ) {
+    if (!isset($bigbluebuttonbn->timecreated) || !$bigbluebuttonbn->timecreated) {
         $bigbluebuttonbn->timecreated = time();
         //Assign password only if it is a new activity
-        if( isset($bigbluebuttonbn->add) && !empty($bigbluebuttonbn->add) ) {
+        if (isset($bigbluebuttonbn->add) && !empty($bigbluebuttonbn->add)) {
             $bigbluebuttonbn->moderatorpass = bigbluebuttonbn_random_password(12);
             $bigbluebuttonbn->viewerpass = bigbluebuttonbn_random_password(12);
         }
@@ -388,13 +388,13 @@ 
         $bigbluebuttonbn->timemodified = time();
     }
 
-    if (! isset($bigbluebuttonbn->newwindow))
+    if (!isset($bigbluebuttonbn->newwindow))
         $bigbluebuttonbn->newwindow = 0;
-    if (! isset($bigbluebuttonbn->wait))
+    if (!isset($bigbluebuttonbn->wait))
         $bigbluebuttonbn->wait = 0;
-    if (! isset($bigbluebuttonbn->record))
+    if (!isset($bigbluebuttonbn->record))
         $bigbluebuttonbn->record = 0;
-    if (! isset($bigbluebuttonbn->tagging))
+    if (!isset($bigbluebuttonbn->tagging))
         $bigbluebuttonbn->tagging = 0;
 
     $bigbluebuttonbn->participants = htmlspecialchars_decode($bigbluebuttonbn->participants);
@@ -413,8 +413,8 @@ 
 
     // Now that an id was assigned, generate and set the meetingid property based on 
     // [Moodle Instance + Activity ID + BBB Secret] (but only for new activities)
-    if( isset($bigbluebuttonbn->add) && !empty($bigbluebuttonbn->add) ) {
-        $bigbluebuttonbn_meetingid = sha1($CFG->wwwroot.$bigbluebuttonbn->id.bigbluebuttonbn_get_cfg_shared_secret());
+    if (isset($bigbluebuttonbn->add) && !empty($bigbluebuttonbn->add)) {
+        $bigbluebuttonbn_meetingid = sha1($CFG->wwwroot . $bigbluebuttonbn->id . bigbluebuttonbn_get_cfg_shared_secret());
         $DB->set_field('bigbluebuttonbn', 'meetingid', $bigbluebuttonbn_meetingid, array('id' => $bigbluebuttonbn->id));
         $action = get_string('mod_form_field_notification_msg_created', 'bigbluebuttonbn');
     } else {
@@ -423,7 +423,7 @@ 
     $at = get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn');
 
     // Add evento to the calendar when if openingtime is set
-    if ( isset($bigbluebuttonbn->openingtime) && $bigbluebuttonbn->openingtime ){
+    if (isset($bigbluebuttonbn->openingtime) && $bigbluebuttonbn->openingtime) {
         $event = new stdClass();
         $event->name        = $bigbluebuttonbn->name;
         $event->courseid    = $bigbluebuttonbn->course;
@@ -433,13 +433,13 @@ 
         $event->instance    = $bigbluebuttonbn->id;
         $event->timestart   = $bigbluebuttonbn->openingtime;
 
-        if ( $bigbluebuttonbn->closingtime ){
+        if ($bigbluebuttonbn->closingtime) {
             $event->durationtime = $bigbluebuttonbn->closingtime - $bigbluebuttonbn->openingtime;
         } else {
             $event->durationtime = 0;
         }
 
-        if ( $event->id = $DB->get_field('event', 'id', array('modulename'=>'bigbluebuttonbn', 'instance'=>$bigbluebuttonbn->id)) ) {
+        if ($event->id = $DB->get_field('event', 'id', array('modulename'=>'bigbluebuttonbn', 'instance'=>$bigbluebuttonbn->id))) {
             $calendarevent = calendar_event::load($event->id);
             $calendarevent->update($event);
         } else {
@@ -450,7 +450,7 @@ 
         $DB->delete_records('event', array('modulename'=>'bigbluebuttonbn', 'instance'=>$bigbluebuttonbn->id));
     }
 
-    if( isset($bigbluebuttonbn->notification) && $bigbluebuttonbn->notification ) {
+    if (isset($bigbluebuttonbn->notification) && $bigbluebuttonbn->notification) {
         // Prepare message
         $msg = new stdClass();
 
@@ -458,35 +458,35 @@ 
         $msg->action = $action;
         $msg->activity_type = "";
         $msg->activity_title = $bigbluebuttonbn->name;
-        $message_text = '<p>'.$msg->activity_type.' &quot;'.$msg->activity_title.'&quot; '.get_string('email_body_notification_meeting_has_been', 'bigbluebuttonbn').' '.$msg->action.'.</p>';
+        $message_text = '<p>' . $msg->activity_type . ' &quot;' . $msg->activity_title . '&quot; ' . get_string('email_body_notification_meeting_has_been', 'bigbluebuttonbn') . ' ' . $msg->action . '.</p>';
 
         /// Add the meeting details to the message_body
         $msg->action = ucfirst($action);
         $msg->activity_description = "";
-        if( !empty($bigbluebuttonbn->intro) )
+        if (!empty($bigbluebuttonbn->intro))
             $msg->activity_description = trim($bigbluebuttonbn->intro);
         $msg->activity_openingtime = "";
         if ($bigbluebuttonbn->openingtime) {
-            $msg->activity_openingtime = calendar_day_representation($bigbluebuttonbn->openingtime).' '.$at.' '.calendar_time_representation($bigbluebuttonbn->openingtime);
+            $msg->activity_openingtime = calendar_day_representation($bigbluebuttonbn->openingtime) . ' ' . $at . ' ' . calendar_time_representation($bigbluebuttonbn->openingtime);
         }
         $msg->activity_closingtime = "";
-        if ($bigbluebuttonbn->closingtime ) {
-            $msg->activity_closingtime = calendar_day_representation($bigbluebuttonbn->closingtime).' '.$at.' '.calendar_time_representation($bigbluebuttonbn->closingtime);
+        if ($bigbluebuttonbn->closingtime) {
+            $msg->activity_closingtime = calendar_day_representation($bigbluebuttonbn->closingtime) . ' ' . $at . ' ' . calendar_time_representation($bigbluebuttonbn->closingtime);
         }
-        $msg->activity_owner = $USER->firstname.' '.$USER->lastname;
+        $msg->activity_owner = $USER->firstname . ' ' . $USER->lastname;
 
-        $message_text .= '<p><b>'.$msg->activity_title.'</b> '.get_string('email_body_notification_meeting_details', 'bigbluebuttonbn').':';
+        $message_text .= '<p><b>' . $msg->activity_title . '</b> ' . get_string('email_body_notification_meeting_details', 'bigbluebuttonbn') . ':';
         $message_text .= '<table border="0" style="margin: 5px 0 0 20px"><tbody>';
-        $message_text .= '<tr><td style="font-weight:bold;color:#555;">'.get_string('email_body_notification_meeting_title', 'bigbluebuttonbn').': </td><td>';
-        $message_text .= $msg->activity_title.'</td></tr>';
-        $message_text .= '<tr><td style="font-weight:bold;color:#555;">'.get_string('email_body_notification_meeting_description', 'bigbluebuttonbn').': </td><td>';
-        $message_text .= $msg->activity_description.'</td></tr>';
-        $message_text .= '<tr><td style="font-weight:bold;color:#555;">'.get_string('email_body_notification_meeting_start_date', 'bigbluebuttonbn').': </td><td>';
-        $message_text .= $msg->activity_openingtime.'</td></tr>';
-        $message_text .= '<tr><td style="font-weight:bold;color:#555;">'.get_string('email_body_notification_meeting_end_date', 'bigbluebuttonbn').': </td><td>';
-        $message_text .= $msg->activity_closingtime.'</td></tr>';
-        $message_text .= '<tr><td style="font-weight:bold;color:#555;">'.$msg->action.' '.get_string('email_body_notification_meeting_by', 'bigbluebuttonbn').': </td><td>';
-        $message_text .= $msg->activity_owner.'</td></tr></tbody></table></p>';
+        $message_text .= '<tr><td style="font-weight:bold;color:#555;">' . get_string('email_body_notification_meeting_title', 'bigbluebuttonbn') . ': </td><td>';
+        $message_text .= $msg->activity_title . '</td></tr>';
+        $message_text .= '<tr><td style="font-weight:bold;color:#555;">' . get_string('email_body_notification_meeting_description', 'bigbluebuttonbn') . ': </td><td>';
+        $message_text .= $msg->activity_description . '</td></tr>';
+        $message_text .= '<tr><td style="font-weight:bold;color:#555;">' . get_string('email_body_notification_meeting_start_date', 'bigbluebuttonbn') . ': </td><td>';
+        $message_text .= $msg->activity_openingtime . '</td></tr>';
+        $message_text .= '<tr><td style="font-weight:bold;color:#555;">' . get_string('email_body_notification_meeting_end_date', 'bigbluebuttonbn') . ': </td><td>';
+        $message_text .= $msg->activity_closingtime . '</td></tr>';
+        $message_text .= '<tr><td style="font-weight:bold;color:#555;">' . $msg->action . ' ' . get_string('email_body_notification_meeting_by', 'bigbluebuttonbn') . ': </td><td>';
+        $message_text .= $msg->activity_owner . '</td></tr></tbody></table></p>';
 
         // Send notification to all users enrolled
         bigbluebuttonbn_send_notification($USER, $bigbluebuttonbn, $message_text);
@@ -537,7 +537,7 @@ 
  * @param array $options additional options affecting the file serving
  * @return bool false if file not found, does not return if found - justsend the file
  */
-function bigbluebuttonbn_pluginfile($course, $cm, $context, $filearea, $args, $forcedownload, array $options=array()) {
+function bigbluebuttonbn_pluginfile($course, $cm, $context, $filearea, $args, $forcedownload, array $options = array()) {
     global $CFG, $DB;
 
     if ($context->contextlevel != CONTEXT_MODULE) {
@@ -553,21 +553,21 @@ 
         return false;
     }
 
-    if( sizeof($args) > 1 ) {
+    if (sizeof($args) > 1) {
         $cache = cache::make_from_params(cache_store::MODE_APPLICATION, 'mod_bigbluebuttonbn', 'presentation_cache');
         $presentation_nonce_key = sha1($bigbluebuttonbn->id);
         $presentation_nonce = $cache->get($presentation_nonce_key);
         $presentation_nonce_value = $presentation_nonce['value'];
         $presentation_nonce_counter = $presentation_nonce['counter'];
 
-        if( $args["0"] != $presentation_nonce_value ) {
+        if ($args["0"] != $presentation_nonce_value) {
             return false;
         }
 
         //The nonce value is actually used twice because BigBlueButton reads the file two times
         $presentation_nonce_counter += 1;
-        if( $presentation_nonce_counter < 2 ) {
-            $cache->set($presentation_nonce_key, array( "value" => $presentation_nonce_value, "counter" => $presentation_nonce_counter ));
+        if ($presentation_nonce_counter < 2) {
+            $cache->set($presentation_nonce_key, array("value" => $presentation_nonce_value, "counter" => $presentation_nonce_counter));
         } else {
             $cache->delete($presentation_nonce_key);
         }
@@ -585,7 +585,7 @@ 
     }
 
     if ($filearea === 'presentation') {
-        $fullpath = "/$context->id/mod_bigbluebuttonbn/$filearea/0/".$filename;
+        $fullpath = "/$context->id/mod_bigbluebuttonbn/$filearea/0/" . $filename;
     } else {
         return false;
     }
@@ -619,10 +619,10 @@ 
  * @package  mod_bigbluebuttonbn
  * @return array a list of available roles
  */
-function bigbluebuttonbn_get_db_moodle_roles($rolename='all') {
+function bigbluebuttonbn_get_db_moodle_roles($rolename = 'all') {
     global $DB;
 
-    if( $rolename != 'all')
+    if ($rolename != 'all')
         $roles = $DB->get_record('role', array('shortname' => $rolename));
     else
         $roles = $DB->get_records('role', array());
@@ -641,22 +641,22 @@ 
 
     $roles = bigbluebuttonbn_get_db_moodle_roles();
     $sqluserids = array();
-    foreach($roles as $role){
+    foreach ($roles as $role) {
         $users = get_role_users($role->id, $context);
-        foreach($users as $user) {
+        foreach ($users as $user) {
             array_push($sqluserids, $user->id);
         }
     }
 
     $users_array = array();
-    if( !empty($sqluserids) ) {
+    if (!empty($sqluserids)) {
         $users_array = $DB->get_records_select("user", "id IN (" . implode(', ', $sqluserids) . ") AND deleted = 0");
     }
 
     return $users_array;
 }
 
-function bigbluebuttonbn_send_notification($sender, $bigbluebuttonbn, $message="") {
+function bigbluebuttonbn_send_notification($sender, $bigbluebuttonbn, $message = "") {
     global $CFG, $DB;
 
     $context = bigbluebuttonbn_get_context_course($bigbluebuttonbn->course);
@@ -664,19 +664,19 @@ 
 
     //Complete message
     $msg = new stdClass();
-    $msg->user_name = $sender->firstname.' '.$sender->lastname;
+    $msg->user_name = $sender->firstname . ' ' . $sender->lastname;
     $msg->user_email = $sender->email;
     $msg->course_name = "$course->fullname";
-    $message .= '<p><hr/><br/>'.get_string('email_footer_sent_by', 'bigbluebuttonbn').' '.$msg->user_name.'('.$msg->user_email.') ';
-    $message .= get_string('email_footer_sent_from', 'bigbluebuttonbn').' '.$msg->course_name.'.</p>';
+    $message .= '<p><hr/><br/>' . get_string('email_footer_sent_by', 'bigbluebuttonbn') . ' ' . $msg->user_name . '(' . $msg->user_email . ') ';
+    $message .= get_string('email_footer_sent_from', 'bigbluebuttonbn') . ' ' . $msg->course_name . '.</p>';
     
     $users = bigbluebuttonbn_get_users($context);
-    foreach( $users as $user ) {
-        if( $user->id != $sender->id ){
-            error_log("Sending msg to ".$user->firstname." ".$user->lastname.".");
+    foreach ($users as $user) {
+        if ($user->id != $sender->id) {
+            error_log("Sending msg to " . $user->firstname . " " . $user->lastname . ".");
             $messageid = message_post_message($sender, $user, $message, FORMAT_HTML);
             if (!empty($messageid)) {
-                error_log("Msg sent to ".$user->firstname." ".$user->lastname.".");
+                error_log("Msg sent to " . $user->firstname . " " . $user->lastname . ".");
             } else {
                 error_log("Msg was NOT sent.");
             }
@@ -688,7 +688,7 @@ 
     global $CFG;
 
     $version_major = bigbluebuttonbn_get_moodle_version_major();
-    if ( $version_major < '2013111800' ) {
+    if ($version_major < '2013111800') {
         //This is valid before v2.6
         $context = get_context_instance(CONTEXT_MODULE, $id);
     } else {
@@ -703,7 +703,7 @@ 
     global $CFG;
 
     $version_major = bigbluebuttonbn_get_moodle_version_major();
-    if ( $version_major < '2013111800' ) {
+    if ($version_major < '2013111800') {
         //This is valid before v2.6
         $context = get_context_instance(CONTEXT_COURSE, $id);
     } else {
@@ -716,11 +716,11 @@ 
 
 function bigbluebuttonbn_get_cfg_server_url() {
     global $BIGBLUEBUTTONBN_CFG, $CFG;
-    return (isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_server_url)? trim(trim($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_server_url),'/').'/': (isset($CFG->bigbluebuttonbn_server_url)? trim(trim($CFG->bigbluebuttonbn_server_url),'/').'/': 'http://test-install.blindsidenetworks.com/bigbluebutton/'));
+    return (isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_server_url) ? trim(trim($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_server_url), '/') . '/' : (isset($CFG->bigbluebuttonbn_server_url) ? trim(trim($CFG->bigbluebuttonbn_server_url), '/') . '/' : 'http://test-install.blindsidenetworks.com/bigbluebutton/'));
 }
 
 function bigbluebuttonbn_get_cfg_shared_secret() {
     global $BIGBLUEBUTTONBN_CFG, $CFG;
-    return (isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_shared_secret)? trim($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_shared_secret): (isset($CFG->bigbluebuttonbn_shared_secret)? trim($CFG->bigbluebuttonbn_shared_secret): '8cd8ef52e8e101574e400365b55e11a6'));
+    return (isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_shared_secret) ? trim($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_shared_secret) : (isset($CFG->bigbluebuttonbn_shared_secret) ? trim($CFG->bigbluebuttonbn_shared_secret) : '8cd8ef52e8e101574e400365b55e11a6'));
 }
 

Braces +20 added lines, -14 removed lines

@@ -388,14 +388,18 @@ 
         $bigbluebuttonbn->timemodified = time();
     }
 
-    if (! isset($bigbluebuttonbn->newwindow))
-        $bigbluebuttonbn->newwindow = 0;
-    if (! isset($bigbluebuttonbn->wait))
-        $bigbluebuttonbn->wait = 0;
-    if (! isset($bigbluebuttonbn->record))
-        $bigbluebuttonbn->record = 0;
-    if (! isset($bigbluebuttonbn->tagging))
-        $bigbluebuttonbn->tagging = 0;
+    if (! isset($bigbluebuttonbn->newwindow)) {
+            $bigbluebuttonbn->newwindow = 0;
+    }
+    if (! isset($bigbluebuttonbn->wait)) {
+            $bigbluebuttonbn->wait = 0;
+    }
+    if (! isset($bigbluebuttonbn->record)) {
+            $bigbluebuttonbn->record = 0;
+    }
+    if (! isset($bigbluebuttonbn->tagging)) {
+            $bigbluebuttonbn->tagging = 0;
+    }
 
     $bigbluebuttonbn->participants = htmlspecialchars_decode($bigbluebuttonbn->participants);
 }
@@ -463,8 +467,9 @@ 
         /// Add the meeting details to the message_body
         $msg->action = ucfirst($action);
         $msg->activity_description = "";
-        if( !empty($bigbluebuttonbn->intro) )
-            $msg->activity_description = trim($bigbluebuttonbn->intro);
+        if( !empty($bigbluebuttonbn->intro) ) {
+                    $msg->activity_description = trim($bigbluebuttonbn->intro);
+        }
         $msg->activity_openingtime = "";
         if ($bigbluebuttonbn->openingtime) {
             $msg->activity_openingtime = calendar_day_representation($bigbluebuttonbn->openingtime).' '.$at.' '.calendar_time_representation($bigbluebuttonbn->openingtime);
@@ -622,10 +627,11 @@ 
 function bigbluebuttonbn_get_db_moodle_roles($rolename='all') {
     global $DB;
 
-    if( $rolename != 'all')
-        $roles = $DB->get_record('role', array('shortname' => $rolename));
-    else
-        $roles = $DB->get_records('role', array());
+    if( $rolename != 'all') {
+            $roles = $DB->get_record('role', array('shortname' => $rolename));
+    } else {
+            $roles = $DB->get_records('role', array());
+    }
 
     return $roles;
 }

view.php

Indentation +24 added lines, -24 removed lines

@@ -280,28 +280,28 @@ 
     echo $OUTPUT->box_end();
     if( $bbbsession['tagging'] && ($bbbsession['administrator'] || $bbbsession['moderator']) ){
         echo ''.
-          '<div id="panelContent" class="hidden">'.
-          '  <div class="yui3-widget-bd">'.
-          '    <form>'.
-          '      <fieldset>'.
-          '        <input type="hidden" name="join" id="meeting_join_url" value="">'.
-          '        <input type="hidden" name="message" id="meeting_message" value="">'.
-          '        <div>'.
-          '          <label for="name">'.get_string('view_recording_name', 'bigbluebuttonbn').'</label><br/>'.
-          '          <input type="text" name="name" id="recording_name" placeholder="">'.
-          '        </div><br>'.
-          '        <div>'.
-          '          <label for="description">'.get_string('view_recording_description', 'bigbluebuttonbn').'</label><br/>'.
-          '          <input type="text" name="description" id="recording_description" value="" placeholder="">'.
-          '        </div><br>'.
-          '        <div>'.
-          '          <label for="tags">'.get_string('view_recording_tags', 'bigbluebuttonbn').'</label><br/>'.
-          '          <input type="text" name="tags" id="recording_tags" value="" placeholder="">'.
-          '        </div>'.
-          '      </fieldset>'.
-          '    </form>'.
-          '  </div>'.
-          '</div>';
+            '<div id="panelContent" class="hidden">'.
+            '  <div class="yui3-widget-bd">'.
+            '    <form>'.
+            '      <fieldset>'.
+            '        <input type="hidden" name="join" id="meeting_join_url" value="">'.
+            '        <input type="hidden" name="message" id="meeting_message" value="">'.
+            '        <div>'.
+            '          <label for="name">'.get_string('view_recording_name', 'bigbluebuttonbn').'</label><br/>'.
+            '          <input type="text" name="name" id="recording_name" placeholder="">'.
+            '        </div><br>'.
+            '        <div>'.
+            '          <label for="description">'.get_string('view_recording_description', 'bigbluebuttonbn').'</label><br/>'.
+            '          <input type="text" name="description" id="recording_description" value="" placeholder="">'.
+            '        </div><br>'.
+            '        <div>'.
+            '          <label for="tags">'.get_string('view_recording_tags', 'bigbluebuttonbn').'</label><br/>'.
+            '          <input type="text" name="tags" id="recording_tags" value="" placeholder="">'.
+            '        </div>'.
+            '      </fieldset>'.
+            '    </form>'.
+            '  </div>'.
+            '</div>';
     }
 
     echo $OUTPUT->box_start('generalbox boxaligncenter', 'bigbluebuttonbn_view_action_button_box');
@@ -338,8 +338,8 @@ 
         $icon = new pix_icon($bbbsession['presentation']['icon'], $bbbsession['presentation']['mimetype_description']);
 
         echo '<h4>'.get_string('view_section_title_presentation', 'bigbluebuttonbn').'</h4>'.
-             ''.$OUTPUT->action_icon($bbbsession['presentation']['url'], $icon, null, array(), false).''.
-             ''.$OUTPUT->action_link($bbbsession['presentation']['url'], $bbbsession['presentation']['name'], null, $attributes).'<br><br>';
+                ''.$OUTPUT->action_icon($bbbsession['presentation']['url'], $icon, null, array(), false).''.
+                ''.$OUTPUT->action_link($bbbsession['presentation']['url'], $bbbsession['presentation']['name'], null, $attributes).'<br><br>';
     }
 
     bigbluebuttonbn_view_recordings($bbbsession);

Braces +21 added lines, -17 removed lines

@@ -85,8 +85,9 @@ 
 $bbbsession['voicebridge'] = ($bigbluebuttonbn->voicebridge > 0)? 70000 + $bigbluebuttonbn->voicebridge: $bigbluebuttonbn->voicebridge;
 $bbbsession['wait'] = $bigbluebuttonbn->wait;
 $bbbsession['record'] = $bigbluebuttonbn->record;
-if( $bigbluebuttonbn->record )
+if( $bigbluebuttonbn->record ) {
     $bbbsession['welcome'] .= '<br><br>'.get_string('bbbrecordwarning', 'bigbluebuttonbn');
+}
 $bbbsession['tagging'] = $bigbluebuttonbn->tagging;
 
 $bbbsession['openingtime'] = $bigbluebuttonbn->openingtime;
@@ -118,22 +119,24 @@ 
 // Validates if the BigBlueButton server is running
 $serverVersion = bigbluebuttonbn_getServerVersion($bbbsession['endpoint']);
 if ( !isset($serverVersion) ) { //Server is not working
-    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.'/course/view.php?id='.$bigbluebuttonbn->course );
-    else
-        print_error( 'view_error_unable_join_student', 'bigbluebuttonbn', $CFG->wwwroot.'/course/view.php?id='.$bigbluebuttonbn->course );
-} else {
-    $xml = bigbluebuttonbn_wrap_xml_load_file( bigbluebuttonbn_getMeetingsURL( $bbbsession['endpoint'], $bbbsession['shared_secret'] ) );
-    if ( !isset($xml) || !isset($xml->returncode) || $xml->returncode == 'FAILED' ){ // The shared secret is wrong
-        if ( $bbbsession['administrator'] )
+    if ( $bbbsession['administrator'] ) {
             print_error( 'view_error_unable_join', 'bigbluebuttonbn', $CFG->wwwroot.'/admin/settings.php?section=modsettingbigbluebuttonbn' );
-        else if ( $bbbsession['moderator'] )
+    } else if ( $bbbsession['moderator'] ) {
             print_error( 'view_error_unable_join_teacher', 'bigbluebuttonbn', $CFG->wwwroot.'/course/view.php?id='.$bigbluebuttonbn->course );
-        else
+    } else {
             print_error( 'view_error_unable_join_student', 'bigbluebuttonbn', $CFG->wwwroot.'/course/view.php?id='.$bigbluebuttonbn->course );
     }
+    } else {
+    $xml = bigbluebuttonbn_wrap_xml_load_file( bigbluebuttonbn_getMeetingsURL( $bbbsession['endpoint'], $bbbsession['shared_secret'] ) );
+    if ( !isset($xml) || !isset($xml->returncode) || $xml->returncode == 'FAILED' ){ // The shared secret is wrong
+        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.'/course/view.php?id='.$bigbluebuttonbn->course );
+        } else {
+                    print_error( 'view_error_unable_join_student', 'bigbluebuttonbn', $CFG->wwwroot.'/course/view.php?id='.$bigbluebuttonbn->course );
+        }
+    }
 }
 
 // Mark viewed by user (if required)
@@ -209,10 +212,11 @@ 
     }
 
     $bbbsession['meetingid'] = $bigbluebuttonbn->meetingid.'-'.$bbbsession['course']->id.'-'.$bbbsession['bigbluebuttonbnid'].'['.$bbbsession['group'].']';
-    if( $bbbsession['group'] > 0 )
-        $group_name = groups_get_group_name($bbbsession['group']);
-    else
-        $group_name = get_string('allparticipants');
+    if( $bbbsession['group'] > 0 ) {
+            $group_name = groups_get_group_name($bbbsession['group']);
+    } else {
+            $group_name = get_string('allparticipants');
+    }
     $bbbsession['meetingname'] = $bigbluebuttonbn->name.' ('.$group_name.')';
 }
 // Metadata (contextActivityName updated after meeting name is assigned)

Spacing +88 added lines, -88 removed lines

@@ -9,12 +9,12 @@ 
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v2 or later
  */
 
-require_once(dirname(dirname(dirname(__FILE__))).'/config.php');
-require_once(dirname(__FILE__).'/locallib.php');
+require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
+require_once(dirname(__FILE__) . '/locallib.php');
 
-$id = required_param('id', PARAM_INT);              // Course Module ID, or
-$b  = optional_param('n', 0, PARAM_INT);            // bigbluebuttonbn instance ID
-$group  = optional_param('group', 0, PARAM_INT);    // group instance ID
+$id = required_param('id', PARAM_INT); // Course Module ID, or
+$b  = optional_param('n', 0, PARAM_INT); // bigbluebuttonbn instance ID
+$group  = optional_param('group', 0, PARAM_INT); // group instance ID
 
 if ($id) {
     $cm = get_coursemodule_from_id('bigbluebuttonbn', $id, 0, false, MUST_EXIST);
@@ -31,7 +31,7 @@ 
 require_login($course, true, $cm);
 
 $version_major = bigbluebuttonbn_get_moodle_version_major();
-if ( $version_major < '2013111800' ) {
+if ($version_major < '2013111800') {
     //This is valid before v2.6
     $module = $DB->get_record('modules', array('name' => 'bigbluebuttonbn'));
     $module_version = $module->version;
@@ -56,7 +56,7 @@ 
 $bbbsession['roles'] = get_user_roles($context, $USER->id, true);
 
 // User roles
-if( $bigbluebuttonbn->participants == null || $bigbluebuttonbn->participants == "" || $bigbluebuttonbn->participants == "[]" ){
+if ($bigbluebuttonbn->participants == null || $bigbluebuttonbn->participants == "" || $bigbluebuttonbn->participants == "[]") {
     //The room that is being used comes from a previous version
     $bbbsession['moderator'] = has_capability('mod/bigbluebuttonbn:moderate', $context);
 } else {
@@ -76,16 +76,16 @@ 
 // Database info related to the activity
 $bbbsession['meetingdescription'] = $bigbluebuttonbn->intro;
 $bbbsession['welcome'] = $bigbluebuttonbn->welcome;
-if( !isset($bbbsession['welcome']) || $bbbsession['welcome'] == '') {
+if (!isset($bbbsession['welcome']) || $bbbsession['welcome'] == '') {
     $bbbsession['welcome'] = get_string('mod_form_field_welcome_default', 'bigbluebuttonbn'); 
 }
 
 $bbbsession['userlimit'] = intval($bigbluebuttonbn->userlimit);
-$bbbsession['voicebridge'] = ($bigbluebuttonbn->voicebridge > 0)? 70000 + $bigbluebuttonbn->voicebridge: $bigbluebuttonbn->voicebridge;
+$bbbsession['voicebridge'] = ($bigbluebuttonbn->voicebridge > 0) ? 70000 + $bigbluebuttonbn->voicebridge : $bigbluebuttonbn->voicebridge;
 $bbbsession['wait'] = $bigbluebuttonbn->wait;
 $bbbsession['record'] = $bigbluebuttonbn->record;
-if( $bigbluebuttonbn->record )
-    $bbbsession['welcome'] .= '<br><br>'.get_string('bbbrecordwarning', 'bigbluebuttonbn');
+if ($bigbluebuttonbn->record)
+    $bbbsession['welcome'] .= '<br><br>' . get_string('bbbrecordwarning', 'bigbluebuttonbn');
 $bbbsession['tagging'] = $bigbluebuttonbn->tagging;
 
 $bbbsession['openingtime'] = $bigbluebuttonbn->openingtime;
@@ -104,29 +104,29 @@ 
 $bbbsession['originServerName'] = $parsedUrl['host'];
 $bbbsession['originServerUrl'] = $CFG->wwwroot;
 $bbbsession['originServerCommonName'] = '';
-$bbbsession['originTag'] = 'moodle-mod_bigbluebuttonbn ('.$module_version.')';
+$bbbsession['originTag'] = 'moodle-mod_bigbluebuttonbn (' . $module_version . ')';
 ////////////////////////////////////////////////
 /////   BigBlueButton Session Setup Ends   /////
 ////////////////////////////////////////////////
 
 // Validates if the BigBlueButton server is running
 $serverVersion = bigbluebuttonbn_getServerVersion($bbbsession['endpoint']);
-if ( !isset($serverVersion) ) { //Server is not working
-    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.'/course/view.php?id='.$bigbluebuttonbn->course );
+if (!isset($serverVersion)) { //Server is not working
+    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 . '/course/view.php?id=' . $bigbluebuttonbn->course);
     else
-        print_error( 'view_error_unable_join_student', 'bigbluebuttonbn', $CFG->wwwroot.'/course/view.php?id='.$bigbluebuttonbn->course );
+        print_error('view_error_unable_join_student', 'bigbluebuttonbn', $CFG->wwwroot . '/course/view.php?id=' . $bigbluebuttonbn->course);
 } else {
-    $xml = bigbluebuttonbn_wrap_xml_load_file( bigbluebuttonbn_getMeetingsURL( $bbbsession['endpoint'], $bbbsession['shared_secret'] ) );
-    if ( !isset($xml) || !isset($xml->returncode) || $xml->returncode == 'FAILED' ){ // The shared secret is wrong
-        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.'/course/view.php?id='.$bigbluebuttonbn->course );
+    $xml = bigbluebuttonbn_wrap_xml_load_file(bigbluebuttonbn_getMeetingsURL($bbbsession['endpoint'], $bbbsession['shared_secret']));
+    if (!isset($xml) || !isset($xml->returncode) || $xml->returncode == 'FAILED') { // The shared secret is wrong
+        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 . '/course/view.php?id=' . $bigbluebuttonbn->course);
         else
-            print_error( 'view_error_unable_join_student', 'bigbluebuttonbn', $CFG->wwwroot.'/course/view.php?id='.$bigbluebuttonbn->course );
+            print_error('view_error_unable_join_student', 'bigbluebuttonbn', $CFG->wwwroot . '/course/view.php?id=' . $bigbluebuttonbn->course);
     }
 }
 
@@ -136,12 +136,12 @@ 
 
 // Print the page header
 $PAGE->set_context($context);
-$PAGE->set_url($CFG->wwwroot.'/mod/bigbluebuttonbn/view.php', array('id' => $cm->id));
+$PAGE->set_url($CFG->wwwroot . '/mod/bigbluebuttonbn/view.php', array('id' => $cm->id));
 $PAGE->set_title(format_string($bigbluebuttonbn->name));
 $PAGE->set_cacheable(false);
 $PAGE->set_heading($course->fullname);
 
-if( $bigbluebuttonbn->newwindow == 1 ) {
+if ($bigbluebuttonbn->newwindow == 1) {
     $PAGE->blocks->show_only_fake_blocks();
 
 } else {
@@ -149,14 +149,14 @@ 
 }
 
 // Validate if the user is in a role allowed to join
-if ( !has_capability('moodle/category:manage', $context) && !has_capability('mod/bigbluebuttonbn:join', $context) ) {
+if (!has_capability('moodle/category:manage', $context) && !has_capability('mod/bigbluebuttonbn:join', $context)) {
     echo $OUTPUT->header();
     if (isguestuser()) {
-        echo $OUTPUT->confirm('<p>'.get_string('view_noguests', 'bigbluebuttonbn').'</p>'.get_string('liketologin'),
-            get_login_url(), $CFG->wwwroot.'/course/view.php?id='.$course->id);
+        echo $OUTPUT->confirm('<p>' . get_string('view_noguests', 'bigbluebuttonbn') . '</p>' . get_string('liketologin'),
+            get_login_url(), $CFG->wwwroot . '/course/view.php?id=' . $course->id);
     } else { 
-        echo $OUTPUT->confirm('<p>'.get_string('view_nojoin', 'bigbluebuttonbn').'</p>'.get_string('liketologin'),
-            get_login_url(), $CFG->wwwroot.'/course/view.php?id='.$course->id);
+        echo $OUTPUT->confirm('<p>' . get_string('view_nojoin', 'bigbluebuttonbn') . '</p>' . get_string('liketologin'),
+            get_login_url(), $CFG->wwwroot . '/course/view.php?id=' . $course->id);
     }
 
     echo $OUTPUT->footer();
@@ -164,10 +164,10 @@ 
 }
 
 // Operation URLs
-$bbbsession['courseURL'] = $CFG->wwwroot.'/course/view.php?id='.$bigbluebuttonbn->course;
-$bbbsession['logoutURL'] = $CFG->wwwroot.'/mod/bigbluebuttonbn/bbb_view.php?action=logout&id='.$id.'&bn='.$bbbsession['bigbluebuttonbn']->id;
-$bbbsession['recordingReadyURL'] = $CFG->wwwroot.'/mod/bigbluebuttonbn/bbb_broker.php?action=recording_ready';
-$bbbsession['joinURL'] = $CFG->wwwroot.'/mod/bigbluebuttonbn/bbb_view.php?action=join&id='.$id.'&bigbluebuttonbn='.$bbbsession['bigbluebuttonbn']->id;
+$bbbsession['courseURL'] = $CFG->wwwroot . '/course/view.php?id=' . $bigbluebuttonbn->course;
+$bbbsession['logoutURL'] = $CFG->wwwroot . '/mod/bigbluebuttonbn/bbb_view.php?action=logout&id=' . $id . '&bn=' . $bbbsession['bigbluebuttonbn']->id;
+$bbbsession['recordingReadyURL'] = $CFG->wwwroot . '/mod/bigbluebuttonbn/bbb_broker.php?action=recording_ready';
+$bbbsession['joinURL'] = $CFG->wwwroot . '/mod/bigbluebuttonbn/bbb_view.php?action=join&id=' . $id . '&bigbluebuttonbn=' . $bbbsession['bigbluebuttonbn']->id;
 
 $bigbluebuttonbn_view = '';
 
@@ -176,20 +176,20 @@ 
 
 /// find out current groups mode
 $groupmode = groups_get_activity_groupmode($bbbsession['cm']);
-if ($groupmode == NOGROUPS ) {  //No groups mode
-    $bbbsession['meetingid'] = $bigbluebuttonbn->meetingid.'-'.$bbbsession['course']->id.'-'.$bbbsession['bigbluebuttonbn']->id;
+if ($groupmode == NOGROUPS) {  //No groups mode
+    $bbbsession['meetingid'] = $bigbluebuttonbn->meetingid . '-' . $bbbsession['course']->id . '-' . $bbbsession['bigbluebuttonbn']->id;
     $bbbsession['meetingname'] = $bigbluebuttonbn->name;
 
 } else {                                        // Separate or visible groups mode
     echo $OUTPUT->box_start('generalbox boxaligncenter');
-    echo '<br><div class="alert alert-warning">'.get_string('view_groups_selection_warning', 'bigbluebuttonbn').'</div>';
+    echo '<br><div class="alert alert-warning">' . get_string('view_groups_selection_warning', 'bigbluebuttonbn') . '</div>';
     echo $OUTPUT->box_end();
 
     $bbbsession['group'] = groups_get_activity_group($bbbsession['cm'], true);
-    if ($groupmode == SEPARATEGROUPS ) {
-        groups_print_activity_menu($cm, $CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bbbsession['cm']->id, false, true);
-        if( $bbbsession['group'] == 0 ) {
-            if ( $bbbsession['administrator'] ) {
+    if ($groupmode == SEPARATEGROUPS) {
+        groups_print_activity_menu($cm, $CFG->wwwroot . '/mod/bigbluebuttonbn/view.php?id=' . $bbbsession['cm']->id, false, true);
+        if ($bbbsession['group'] == 0) {
+            if ($bbbsession['administrator']) {
                 $my_groups = groups_get_all_groups($bbbsession['course']->id);
             } else {
                 $my_groups = groups_get_activity_allowed_groups($bbbsession['cm']);
@@ -199,15 +199,15 @@ 
         }
 
     } else {
-        groups_print_activity_menu($cm, $CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bbbsession['cm']->id);
+        groups_print_activity_menu($cm, $CFG->wwwroot . '/mod/bigbluebuttonbn/view.php?id=' . $bbbsession['cm']->id);
     }
 
-    $bbbsession['meetingid'] = $bigbluebuttonbn->meetingid.'-'.$bbbsession['course']->id.'-'.$bbbsession['bigbluebuttonbn']->id.'['.$bbbsession['group'].']';
-    if( $bbbsession['group'] > 0 )
+    $bbbsession['meetingid'] = $bigbluebuttonbn->meetingid . '-' . $bbbsession['course']->id . '-' . $bbbsession['bigbluebuttonbn']->id . '[' . $bbbsession['group'] . ']';
+    if ($bbbsession['group'] > 0)
         $group_name = groups_get_group_name($bbbsession['group']);
     else
         $group_name = get_string('allparticipants');
-    $bbbsession['meetingname'] = $bigbluebuttonbn->name.' ('.$group_name.')';
+    $bbbsession['meetingname'] = $bigbluebuttonbn->name . ' (' . $group_name . ')';
 }
 // Metadata (context)
 $bbbsession['contextActivityName'] = $bbbsession['meetingname'];
@@ -215,7 +215,7 @@ 
 $bbbsession['contextActivityTags'] = "";
 
 $now = time();
-if (!empty($bigbluebuttonbn->openingtime) && $now < $bigbluebuttonbn->openingtime ) {
+if (!empty($bigbluebuttonbn->openingtime) && $now < $bigbluebuttonbn->openingtime) {
     //CALLING BEFORE
     $bigbluebuttonbn_view = 'before';
 
@@ -247,7 +247,7 @@ 
         'action' => $bigbluebuttonbn_view,
         'meetingid' => $bbbsession['meetingid'],
         'bigbluebuttonbnid' => $bbbsession['bigbluebuttonbn']->id,
-        'ping_interval' => ($waitformoderator_ping_interval > 0? $waitformoderator_ping_interval * 1000: 15000),
+        'ping_interval' => ($waitformoderator_ping_interval > 0 ? $waitformoderator_ping_interval * 1000 : 15000),
         'userlimit' => $bbbsession['userlimit'],
         'locales' => bigbluebuttonbn_get_locales_for_ui()
     );
@@ -264,7 +264,7 @@ 
 // Finish the page
 echo $OUTPUT->footer();
 
-function bigbluebuttonbn_view_joining($bbbsession){
+function bigbluebuttonbn_view_joining($bbbsession) {
     global $CFG, $DB, $OUTPUT;
 
     echo $OUTPUT->heading($bbbsession['meetingname'], 3);
@@ -273,29 +273,29 @@ 
     echo '<br><span id="status_bar"></span><br>';
     echo '<span id="control_panel"></span>';
     echo $OUTPUT->box_end();
-    if( $bbbsession['tagging'] && ($bbbsession['administrator'] || $bbbsession['moderator']) ){
-        echo ''.
-          '<div id="panelContent" class="hidden">'.
-          '  <div class="yui3-widget-bd">'.
-          '    <form>'.
-          '      <fieldset>'.
-          '        <input type="hidden" name="join" id="meeting_join_url" value="">'.
-          '        <input type="hidden" name="message" id="meeting_message" value="">'.
-          '        <div>'.
-          '          <label for="name">'.get_string('view_recording_name', 'bigbluebuttonbn').'</label><br/>'.
-          '          <input type="text" name="name" id="recording_name" placeholder="">'.
-          '        </div><br>'.
-          '        <div>'.
-          '          <label for="description">'.get_string('view_recording_description', 'bigbluebuttonbn').'</label><br/>'.
-          '          <input type="text" name="description" id="recording_description" value="" placeholder="">'.
-          '        </div><br>'.
-          '        <div>'.
-          '          <label for="tags">'.get_string('view_recording_tags', 'bigbluebuttonbn').'</label><br/>'.
-          '          <input type="text" name="tags" id="recording_tags" value="" placeholder="">'.
-          '        </div>'.
-          '      </fieldset>'.
-          '    </form>'.
-          '  </div>'.
+    if ($bbbsession['tagging'] && ($bbbsession['administrator'] || $bbbsession['moderator'])) {
+        echo '' .
+          '<div id="panelContent" class="hidden">' .
+          '  <div class="yui3-widget-bd">' .
+          '    <form>' .
+          '      <fieldset>' .
+          '        <input type="hidden" name="join" id="meeting_join_url" value="">' .
+          '        <input type="hidden" name="message" id="meeting_message" value="">' .
+          '        <div>' .
+          '          <label for="name">' . get_string('view_recording_name', 'bigbluebuttonbn') . '</label><br/>' .
+          '          <input type="text" name="name" id="recording_name" placeholder="">' .
+          '        </div><br>' .
+          '        <div>' .
+          '          <label for="description">' . get_string('view_recording_description', 'bigbluebuttonbn') . '</label><br/>' .
+          '          <input type="text" name="description" id="recording_description" value="" placeholder="">' .
+          '        </div><br>' .
+          '        <div>' .
+          '          <label for="tags">' . get_string('view_recording_tags', 'bigbluebuttonbn') . '</label><br/>' .
+          '          <input type="text" name="tags" id="recording_tags" value="" placeholder="">' .
+          '        </div>' .
+          '      </fieldset>' .
+          '    </form>' .
+          '  </div>' .
           '</div>';
     }
 
@@ -306,19 +306,19 @@ 
     bigbluebuttonbn_view_recordings($bbbsession);
 }
 
-function bigbluebuttonbn_view_before( $bbbsession ){
+function bigbluebuttonbn_view_before($bbbsession) {
     global $CFG, $DB, $OUTPUT;
 
     echo $OUTPUT->heading(get_string('view_message_conference_not_started', 'bigbluebuttonbn'), 3);
 
     echo '<table>';
     if ($bbbsession['openingtime']) {
-        echo '<tr><td class="c0">'.get_string('mod_form_field_openingtime','bigbluebuttonbn').':</td>';
-        echo '    <td class="c1">'.userdate($bbbsession['openingtime']).'</td></tr>';
+        echo '<tr><td class="c0">' . get_string('mod_form_field_openingtime', 'bigbluebuttonbn') . ':</td>';
+        echo '    <td class="c1">' . userdate($bbbsession['openingtime']) . '</td></tr>';
     }
     if ($bbbsession['closingtime']) {
-        echo '<tr><td class="c0">'.get_string('mod_form_field_closingtime','bigbluebuttonbn').':</td>';
-        echo '    <td class="c1">'.userdate($bbbsession['closingtime']).'</td></tr>';
+        echo '<tr><td class="c0">' . get_string('mod_form_field_closingtime', 'bigbluebuttonbn') . ':</td>';
+        echo '    <td class="c1">' . userdate($bbbsession['closingtime']) . '</td></tr>';
     }
     echo '</table>';
 }
@@ -328,13 +328,13 @@ 
 
     echo $OUTPUT->heading(get_string('view_message_conference_has_ended', 'bigbluebuttonbn'), 3);
 
-    if( !is_null($bbbsession['presentation']['url']) ) {
+    if (!is_null($bbbsession['presentation']['url'])) {
         $attributes = array('title' => $bbbsession['presentation']['name']);
         $icon = new pix_icon($bbbsession['presentation']['icon'], $bbbsession['presentation']['mimetype_description']);
 
-        echo '<h4>'.get_string('view_section_title_presentation', 'bigbluebuttonbn').'</h4>'.
-             ''.$OUTPUT->action_icon($bbbsession['presentation']['url'], $icon, null, array(), false).''.
-             ''.$OUTPUT->action_link($bbbsession['presentation']['url'], $bbbsession['presentation']['name'], null, $attributes).'<br><br>';
+        echo '<h4>' . get_string('view_section_title_presentation', 'bigbluebuttonbn') . '</h4>' .
+             '' . $OUTPUT->action_icon($bbbsession['presentation']['url'], $icon, null, array(), false) . '' .
+             '' . $OUTPUT->action_link($bbbsession['presentation']['url'], $bbbsession['presentation']['name'], null, $attributes) . '<br><br>';
     }
 
     bigbluebuttonbn_view_recordings($bbbsession);
@@ -343,20 +343,20 @@ 
 function bigbluebuttonbn_view_recordings($bbbsession) {
     global $CFG;
 
-    if( isset($bbbsession['record']) && $bbbsession['record'] ) {
-        $output = html_writer::tag('h4', get_string('view_section_title_recordings', 'bigbluebuttonbn') );
+    if (isset($bbbsession['record']) && $bbbsession['record']) {
+        $output = html_writer::tag('h4', get_string('view_section_title_recordings', 'bigbluebuttonbn'));
 
         // Get actual recordings
         $recordings = bigbluebuttonbn_getRecordingsArray($bbbsession['meetingid'], $bbbsession['endpoint'], $bbbsession['shared_secret']);
         // Get recording links
         $recordings_imported = bigbluebuttonbn_getRecordingsImportedArray($bbbsession['course']->id, $bbbsession['bigbluebuttonbn']->id);
         // Merge the recordings
-        $recordings = array_merge( $recordings, $recordings_imported );
+        $recordings = array_merge($recordings, $recordings_imported);
         // Render the table
-        $output .= bigbluebutton_output_recording_table($bbbsession, $recordings)."\n";
+        $output .= bigbluebutton_output_recording_table($bbbsession, $recordings) . "\n";
 
-        if ( $bbbsession['managerecordings'] && bigbluebuttonbn_get_cfg_importrecordings_enabled() ) {
-            $button_import_recordings = html_writer::tag( 'input', '', array('type' => 'button', 'value' => get_string('view_recording_button_import', 'bigbluebuttonbn'), 'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/import_view.php?bn='.$bbbsession['bigbluebuttonbn']->id.'\'') );
+        if ($bbbsession['managerecordings'] && bigbluebuttonbn_get_cfg_importrecordings_enabled()) {
+            $button_import_recordings = html_writer::tag('input', '', array('type' => 'button', 'value' => get_string('view_recording_button_import', 'bigbluebuttonbn'), 'onclick' => 'window.location=\'' . $CFG->wwwroot . '/mod/bigbluebuttonbn/import_view.php?bn=' . $bbbsession['bigbluebuttonbn']->id . '\''));
             $output .= html_writer::start_tag('br');
             $output .= html_writer::tag('span', $button_import_recordings, ['id'=>"import_recording_links_button"]);
             $output .= html_writer::tag('span', '', ['id'=>"import_recording_links_table"]);

bbb_view.php

Braces +3 added lines, -2 removed lines

@@ -88,8 +88,9 @@
                     /// 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'));
+                        if( $durationtime > 0 ) {
+                                                    $bbbsession['welcome'] .= '<br><br>'.str_replace("%duration%", ''.$durationtime, get_string('bbbdurationwarning', 'bigbluebuttonbn'));
+                        }
                     } else {
                         $durationtime = 0;
                     }

Indentation +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 switch (strtolower($action)) {
     case 'logout':
         if (isset($errors) && $errors != '') {
-          bigbluebutton_bbb_view_errors($errors, $id);
+            bigbluebutton_bbb_view_errors($errors, $id);
 
         } else if ( isset($bbbsession) && !is_null($bbbsession) ) {
             /// Moodle event logger: Create an event for meeting left

Switch Indentation +99 added lines, -99 removed lines

@@ -47,119 +47,119 @@
     $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_bn-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() && 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);
 
-                    /// 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' );
-                        } else {
-                            print_error( 'view_error_unable_join_student', 'bigbluebuttonbn', $CFG->wwwroot.'/admin/settings.php?section=modsettingbigbluebuttonbn' );
+                } 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_bn-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() && bigbluebuttonbn_get_cfg_recordingready_enabled() ) {
+                            $metadata["meta_bn-recording-ready-url"] = $bbbsession['recordingReadyURL'];
                         }
 
-                    } 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' );
+                        /// 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( $error_key, 'bigbluebuttonbn' );
+                            $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' );
+                            } 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: Instert 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: Instert 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 +38 added lines, -38 removed lines

@@ -8,11 +8,11 @@ 
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v2 or later
  */
 
-require_once(dirname(dirname(dirname(__FILE__))).'/config.php');
-require_once(dirname(__FILE__).'/locallib.php');
+require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
+require_once(dirname(__FILE__) . '/locallib.php');
 
-$id = optional_param('id', 0, PARAM_INT);  // course_module ID, or
-$bn = optional_param('bn', 0, PARAM_INT);  // bigbluebuttonbn instance ID
+$id = optional_param('id', 0, PARAM_INT); // course_module ID, or
+$bn = optional_param('bn', 0, PARAM_INT); // bigbluebuttonbn instance ID
 $action = required_param('action', PARAM_TEXT);
 $name = optional_param('name', '', PARAM_TEXT);
 $description = optional_param('description', '', PARAM_TEXT);
@@ -43,7 +43,7 @@ 
 
 require_login($course, true, $cm);
 
-if ( isset($SESSION) && isset($SESSION->bigbluebuttonbn_bbbsession)) {
+if (isset($SESSION) && isset($SESSION->bigbluebuttonbn_bbbsession)) {
     $bbbsession = $SESSION->bigbluebuttonbn_bbbsession;
 }
 switch (strtolower($action)) {
@@ -51,7 +51,7 @@ 
         if (isset($errors) && $errors != '') {
           bigbluebutton_bbb_view_errors($errors, $id);
 
-        } else if ( isset($bbbsession) && !is_null($bbbsession) ) {
+        } 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);
 
@@ -66,15 +66,15 @@ 
         }
         break;
     case 'join':
-        if ( isset($bbbsession) && !is_null($bbbsession) ) {
+        if (isset($bbbsession) && !is_null($bbbsession)) {
             //See if the session is in progress
-            if( bigbluebuttonbn_isMeetingRunning( $bbbsession['meetingid'], $bbbsession['endpoint'], $bbbsession['shared_secret'] ) ) {
+            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);
 
             } else {
                 // If user is administrator, moderator or if is viewer and no waiting is required
-                if( $bbbsession['administrator'] || $bbbsession['moderator'] || !$bbbsession['wait'] ) {
+                if ($bbbsession['administrator'] || $bbbsession['moderator'] || !$bbbsession['wait']) {
                     /// Prepare the metadata
                     $metadata = array("meta_bn-origin" => $bbbsession['origin'],
                             "meta_bbb-origin-version" => $bbbsession['originVersion'],
@@ -82,20 +82,20 @@ 
                             "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'],
+                            "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() && bigbluebuttonbn_get_cfg_recordingready_enabled() ) {
+                    if (bigbluebuttonbn_server_offers_bn_capabilities() && bigbluebuttonbn_get_cfg_recordingready_enabled()) {
                         $metadata["meta_bn-recording-ready-url"] = $bbbsession['recordingReadyURL'];
                     }
 
                     /// Set the duration for the meeting
-                    if ( bigbluebuttonbn_get_cfg_scheduled_duration_enabled() ) {
+                    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'));
+                        if ($durationtime > 0)
+                            $bbbsession['welcome'] .= '<br><br>' . str_replace("%duration%", '' . $durationtime, get_string('bbbdurationwarning', 'bigbluebuttonbn'));
                     } else {
                         $durationtime = 0;
                     }
@@ -109,7 +109,7 @@ 
                             $bbbsession['shared_secret'],
                             $bbbsession['endpoint'],
                             $bbbsession['logoutURL'],
-                            $bbbsession['record']? 'true': 'false',
+                            $bbbsession['record'] ? 'true' : 'false',
                             $durationtime,
                             $bbbsession['voicebridge'],
                             $bbbsession['userlimit'],
@@ -120,25 +120,25 @@ 
 
                     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' );
+                        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' );
+                            print_error('view_error_unable_join_student', 'bigbluebuttonbn', $CFG->wwwroot . '/admin/settings.php?section=modsettingbigbluebuttonbn');
                         }
 
-                    } else if( $response['returncode'] == "FAILED" ) {
+                    } 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' );
+                        $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' );
+                            print_error($error_key, 'bigbluebuttonbn');
                         }
 
-                    } else if ($response['hasBeenForciblyEnded'] == "true"){
-                        print_error( get_string( 'index_error_forciblyended', '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
@@ -150,12 +150,12 @@ 
                     }
 
                 } else {
-                    header('Location: '.$bbbsession['logoutURL'] );
+                    header('Location: ' . $bbbsession['logoutURL']);
                 }
             }
 
         } else {
-            print_error( 'view_error_unable_join', 'bigbluebuttonbn' );
+            print_error('view_error_unable_join', 'bigbluebuttonbn');
         }
         break;
     default:
@@ -179,9 +179,9 @@ 
 function bigbluebutton_bbb_view_execute_join($bbbsession, $cm, $context, $bigbluebuttonbn) {
     //// Update the cache
     $meeting_info = bigbluebuttonbn_bbb_broker_get_meeting_info($bbbsession['meetingid'], $bbbsession['modPW'], true);
-    if( $bbbsession['userlimit'] == 0 || intval($meeting_info['participantCount']) < $bbbsession['userlimit']  ) {
+    if ($bbbsession['userlimit'] == 0 || intval($meeting_info['participantCount']) < $bbbsession['userlimit']) {
         //// Build the URL
-        if( $bbbsession['administrator'] || $bbbsession['moderator'] ) {
+        if ($bbbsession['administrator'] || $bbbsession['moderator']) {
             $password = $bbbsession['modPW'];
         } else {
             $password = $bbbsession['viewerPW'];
@@ -192,25 +192,25 @@ 
         /// Internal logger: Instert a record with the meeting created
         bigbluebuttonbn_logs($bbbsession, BIGBLUEBUTTONBN_LOG_EVENT_JOIN);
         //// Before executing the redirect, increment the number of participants
-        bigbluebuttonbn_bbb_broker_participant_joined($bbbsession['meetingid'], ($bbbsession['administrator'] || $bbbsession['moderator']) );
+        bigbluebuttonbn_bbb_broker_participant_joined($bbbsession['meetingid'], ($bbbsession['administrator'] || $bbbsession['moderator']));
         //// Execute the redirect
-        header('Location: '.$join_url );
+        header('Location: ' . $join_url);
 
     } else {
-        header('Location: '.$bbbsession['logoutURL'] );
+        header('Location: ' . $bbbsession['logoutURL']);
     }
 }
 
 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";
     }
 
     echo $OUTPUT->header();
-    print_error( 'view_error_bigbluebutton', 'bigbluebuttonbn', $CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$id, $msgErrors, $sErrors );
+    print_error('view_error_bigbluebutton', 'bigbluebuttonbn', $CFG->wwwroot . '/mod/bigbluebuttonbn/view.php?id=' . $id, $msgErrors, $sErrors);
     echo $OUTPUT->footer();
 }

index.php

Indentation +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
         } else {
             $getArray = bigbluebuttonbn_wrap_xml_load_file(bigbluebuttonbn_getEndMeetingURL( $meetingID, $modPW, $endpoint, $shared_secret ));
         }
-	   redirect('index.php?id='.$id);
+        redirect('index.php?id='.$id);
     }
 }
 

Spacing +50 added lines, -50 removed lines

@@ -8,12 +8,12 @@ 
  * @copyright 2010-2015 Blindside Networks Inc.
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v2 or later
  */
-require_once(dirname(dirname(dirname(__FILE__))).'/config.php');
-require_once(dirname(__FILE__).'/locallib.php');
+require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
+require_once(dirname(__FILE__) . '/locallib.php');
 
-$id = required_param('id', PARAM_INT);      // Course Module ID, or
-$a  = optional_param('a', 0, PARAM_INT);    // bigbluebuttonbn instance ID
-$g  = optional_param('g', 0, PARAM_INT);    // group instance ID
+$id = required_param('id', PARAM_INT); // Course Module ID, or
+$a  = optional_param('a', 0, PARAM_INT); // bigbluebuttonbn instance ID
+$g  = optional_param('g', 0, PARAM_INT); // group instance ID
 
 if ($id) {
     $course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
@@ -36,7 +36,7 @@ 
 $PAGE->navbar->add(get_string('modulename', 'bigbluebuttonbn'), "index.php?id=$course->id");
 
 /// Get all the appropriate data
-if (! $bigbluebuttonbns = get_all_instances_in_course('bigbluebuttonbn', $course)) {
+if (!$bigbluebuttonbns = get_all_instances_in_course('bigbluebuttonbn', $course)) {
     notice('There are no instances of bigbluebuttonbn', "../../course/view.php?id=$course->id");
 }
 
@@ -44,18 +44,18 @@ 
 $timenow            = time();
 $strweek            = get_string('week');
 $strtopic           = get_string('topic');
-$heading_name       = get_string('index_heading_name', 'bigbluebuttonbn' );
-$heading_group      = get_string('index_heading_group', 'bigbluebuttonbn' );
+$heading_name       = get_string('index_heading_name', 'bigbluebuttonbn');
+$heading_group      = get_string('index_heading_group', 'bigbluebuttonbn');
 $heading_users      = get_string('index_heading_users', 'bigbluebuttonbn');
 $heading_viewer     = get_string('index_heading_viewer', 'bigbluebuttonbn');
-$heading_moderator  = get_string('index_heading_moderator', 'bigbluebuttonbn' );
-$heading_actions    = get_string('index_heading_actions', 'bigbluebuttonbn' );
-$heading_recording  = get_string('index_heading_recording', 'bigbluebuttonbn' );
+$heading_moderator  = get_string('index_heading_moderator', 'bigbluebuttonbn');
+$heading_actions    = get_string('index_heading_actions', 'bigbluebuttonbn');
+$heading_recording  = get_string('index_heading_recording', 'bigbluebuttonbn');
 
 $table = new html_table();
 
-$table->head  = array ($strweek, $heading_name, $heading_group, $heading_users, $heading_viewer, $heading_moderator, $heading_recording, $heading_actions );
-$table->align = array ('center', 'left', 'center', 'center', 'center',  'center', 'center' );
+$table->head  = array($strweek, $heading_name, $heading_group, $heading_users, $heading_viewer, $heading_moderator, $heading_recording, $heading_actions);
+$table->align = array('center', 'left', 'center', 'center', 'center', 'center', 'center');
 
 $endpoint = bigbluebuttonbn_get_cfg_server_url();
 $shared_secret = bigbluebuttonbn_get_cfg_shared_secret();
@@ -66,14 +66,14 @@ 
     //
     // A request to end the meeting
     //
-    if (! $bigbluebuttonbn = $DB->get_record('bigbluebuttonbn', array('id' => $a), '*', MUST_EXIST) ) {
+    if (!$bigbluebuttonbn = $DB->get_record('bigbluebuttonbn', array('id' => $a), '*', MUST_EXIST)) {
         print_error("BigBlueButton ID $a is incorrect");
     }
     $course = $DB->get_record('course', array('id' => $bigbluebuttonbn->course), '*', MUST_EXIST);
     $cm = get_coursemodule_from_instance('bigbluebuttonbn', $bigbluebuttonbn->id, $course->id, false, MUST_EXIST);
 
     //User roles
-    if( $bigbluebuttonbn->participants == null || $bigbluebuttonbn->participants == "" || $bigbluebuttonbn->participants == "[]" ){
+    if ($bigbluebuttonbn->participants == null || $bigbluebuttonbn->participants == "" || $bigbluebuttonbn->participants == "[]") {
         //The room that is being used comes from a previous version
         $moderator = has_capability('mod/bigbluebuttonbn:moderate', $context);
     } else {
@@ -81,19 +81,19 @@ 
     }
     $administrator = has_capability('moodle/category:manage', $context);
 
-    if( $moderator || $administrator ) {
+    if ($moderator || $administrator) {
         bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_MEETING_ENDED, $bigbluebuttonbn, $context, $cm);
 
         echo get_string('index_ending', 'bigbluebuttonbn');
 
-        $meetingID = $bigbluebuttonbn->meetingid.'-'.$course->id.'-'.$bigbluebuttonbn->id;
+        $meetingID = $bigbluebuttonbn->meetingid . '-' . $course->id . '-' . $bigbluebuttonbn->id;
         $modPW = $bigbluebuttonbn->moderatorpass;
-        if( $g != '0'  ) {
-            $getArray = bigbluebuttonbn_wrap_xml_load_file( bigbluebuttonbn_getEndMeetingURL( $meetingID.'['.$g.']', $modPW, $endpoint, $shared_secret ) );
+        if ($g != '0') {
+            $getArray = bigbluebuttonbn_wrap_xml_load_file(bigbluebuttonbn_getEndMeetingURL($meetingID . '[' . $g . ']', $modPW, $endpoint, $shared_secret));
         } else {
-            $getArray = bigbluebuttonbn_wrap_xml_load_file(bigbluebuttonbn_getEndMeetingURL( $meetingID, $modPW, $endpoint, $shared_secret ));
+            $getArray = bigbluebuttonbn_wrap_xml_load_file(bigbluebuttonbn_getEndMeetingURL($meetingID, $modPW, $endpoint, $shared_secret));
         }
-	   redirect('index.php?id='.$id);
+	   redirect('index.php?id=' . $id);
     }
 }
 
@@ -101,7 +101,7 @@ 
     $cm = get_coursemodule_from_id('bigbluebuttonbn', $bigbluebuttonbn->coursemodule, 0, false, MUST_EXIST);
 
     //User roles
-    if( $bigbluebuttonbn->participants == null || $bigbluebuttonbn->participants == "" || $bigbluebuttonbn->participants == "[]" ){
+    if ($bigbluebuttonbn->participants == null || $bigbluebuttonbn->participants == "" || $bigbluebuttonbn->participants == "[]") {
         //The room that is being used comes from a previous version
         $moderator = has_capability('mod/bigbluebuttonbn:moderate', $context);
     } else {
@@ -109,11 +109,11 @@ 
     }
     $administrator = has_capability('moodle/category:manage', $context);
 
-    if ( groups_get_activity_groupmode($cm) > 0 ){
-        $table->data[] = displayBigBlueButtonRooms($endpoint, $shared_secret, ($administrator || $moderator), $course, $bigbluebuttonbn, (object) array('id'=>0, 'name'=>get_string('allparticipants')));
+    if (groups_get_activity_groupmode($cm) > 0) {
+        $table->data[] = displayBigBlueButtonRooms($endpoint, $shared_secret, ($administrator || $moderator), $course, $bigbluebuttonbn, (object)array('id'=>0, 'name'=>get_string('allparticipants')));
         $groups = groups_get_activity_allowed_groups($cm);
-        if( isset($groups)) {
-            foreach( $groups as $group){
+        if (isset($groups)) {
+            foreach ($groups as $group) {
                 $table->data[] = displayBigBlueButtonRooms($endpoint, $shared_secret, ($administrator || $moderator), $course, $bigbluebuttonbn, $group);
             }
         }
@@ -130,7 +130,7 @@ 
 echo $OUTPUT->footer();
 
 /// Functions
-function displayBigBlueButtonRooms($endpoint, $shared_secret, $moderator, $course, $bigbluebuttonbn, $groupObj = null ){
+function displayBigBlueButtonRooms($endpoint, $shared_secret, $moderator, $course, $bigbluebuttonbn, $groupObj = null) {
     $joinURL = null;
     $group = "-";
     $users = "-";
@@ -140,22 +140,22 @@ 
     $moderatorList = "-";
     $recording = "-";
 
-    if ( !$bigbluebuttonbn->visible ) {
+    if (!$bigbluebuttonbn->visible) {
         // Nothing to do
     } else {
         $modPW = $bigbluebuttonbn->moderatorpass;
         $attPW = $bigbluebuttonbn->viewerpass;
 
-        $meetingID = $bigbluebuttonbn->meetingid.'-'.$course->id.'-'.$bigbluebuttonbn->id;
+        $meetingID = $bigbluebuttonbn->meetingid . '-' . $course->id . '-' . $bigbluebuttonbn->id;
         //
         // Output Users in the meeting
         //
-        if( $groupObj == null ){
-            $meetingInfo = bigbluebuttonbn_getMeetingInfoArray( $meetingID, $modPW, $endpoint, $shared_secret );
-            $joinURL = '<a href="view.php?id='.$bigbluebuttonbn->coursemodule.'">'.format_string($bigbluebuttonbn->name).'</a>';
+        if ($groupObj == null) {
+            $meetingInfo = bigbluebuttonbn_getMeetingInfoArray($meetingID, $modPW, $endpoint, $shared_secret);
+            $joinURL = '<a href="view.php?id=' . $bigbluebuttonbn->coursemodule . '">' . format_string($bigbluebuttonbn->name) . '</a>';
         } else {
-            $meetingInfo = bigbluebuttonbn_getMeetingInfoArray( $meetingID.'['.$groupObj->id.']', $modPW, $endpoint, $shared_secret );
-            $joinURL = '<a href="view.php?id='.$bigbluebuttonbn->coursemodule.'&group='.$groupObj->id.'">'.format_string($bigbluebuttonbn->name).'</a>';
+            $meetingInfo = bigbluebuttonbn_getMeetingInfoArray($meetingID . '[' . $groupObj->id . ']', $modPW, $endpoint, $shared_secret);
+            $joinURL = '<a href="view.php?id=' . $bigbluebuttonbn->coursemodule . '&group=' . $groupObj->id . '">' . format_string($bigbluebuttonbn->name) . '</a>';
             $group = $groupObj->name;
         }
         
@@ -163,7 +163,7 @@ 
             //
             // The server was unreachable
             //
-            print_error( get_string( 'index_error_unable_display', 'bigbluebuttonbn' ));
+            print_error(get_string('index_error_unable_display', 'bigbluebuttonbn'));
             return;
         }
 
@@ -172,7 +172,7 @@ 
             // There was an error returned
             //
             if ($meetingInfo['messageKey'] == "checksumError") {
-                print_error( get_string( 'index_error_checksum', 'bigbluebuttonbn' ));
+                print_error(get_string('index_error_checksum', 'bigbluebuttonbn'));
                 return;
             }
 
@@ -184,39 +184,39 @@ 
                 //
                 // There was an error
                 //
-                $users = $meetingInfo['messageKey'].": ".$meetingInfo['message'];
+                $users = $meetingInfo['messageKey'] . ": " . $meetingInfo['message'];
             }
         } else {
             //
             // The meeting info was returned
             //
             if ($meetingInfo['running'] == 'true') {
-                if ( $moderator ) {
-                    if( $groupObj == null ) {
-                        $actions = '<form name="form1" method="post" action=""><INPUT type="hidden" name="id" value="'.$course->id.'"><INPUT type="hidden" name="a" value="'.$bigbluebuttonbn->id.'"><INPUT type="submit" name="submit" value="end" onclick="return confirm(\''. get_string('index_confirm_end', 'bigbluebuttonbn' ).'\')"></form>';
+                if ($moderator) {
+                    if ($groupObj == null) {
+                        $actions = '<form name="form1" method="post" action=""><INPUT type="hidden" name="id" value="' . $course->id . '"><INPUT type="hidden" name="a" value="' . $bigbluebuttonbn->id . '"><INPUT type="submit" name="submit" value="end" onclick="return confirm(\'' . get_string('index_confirm_end', 'bigbluebuttonbn') . '\')"></form>';
                     } else {
-                        $actions = '<form name="form1" method="post" action=""><INPUT type="hidden" name="id" value="'.$course->id.'"><INPUT type="hidden" name="a" value="'.$bigbluebuttonbn->id.'"><INPUT type="hidden" name="g" value="'.$groupObj->id.'"><INPUT type="submit" name="submit" value="end" onclick="return confirm(\''. get_string('index_confirm_end', 'bigbluebuttonbn' ).'\')"></form>';
+                        $actions = '<form name="form1" method="post" action=""><INPUT type="hidden" name="id" value="' . $course->id . '"><INPUT type="hidden" name="a" value="' . $bigbluebuttonbn->id . '"><INPUT type="hidden" name="g" value="' . $groupObj->id . '"><INPUT type="submit" name="submit" value="end" onclick="return confirm(\'' . get_string('index_confirm_end', 'bigbluebuttonbn') . '\')"></form>';
                     }
                 }
-                if ( isset($meetingInfo['recording']) && $meetingInfo['recording'] == 'true' ){ // if it has been set when meeting created, set the variable on/off
-                    $recording = get_string('index_enabled', 'bigbluebuttonbn' );
+                if (isset($meetingInfo['recording']) && $meetingInfo['recording'] == 'true') { // if it has been set when meeting created, set the variable on/off
+                    $recording = get_string('index_enabled', 'bigbluebuttonbn');
                 }
                  
                 $xml = $meetingInfo['attendees'];
-                if (count( $xml ) && count( $xml->attendee ) ) {
-                    $users = count( $xml->attendee );
+                if (count($xml) && count($xml->attendee)) {
+                    $users = count($xml->attendee);
                     $viewer_count = 0;
                     $moderator_count = 0;
-                    foreach ( $xml->attendee as $attendee ) {
-                        if ($attendee->role == "MODERATOR" ) {
-                            if ( $viewer_count++ > 0 ) {
+                    foreach ($xml->attendee as $attendee) {
+                        if ($attendee->role == "MODERATOR") {
+                            if ($viewer_count++ > 0) {
                                 $moderatorList .= ", ";
                             } else {
                                 $moderatorList = "";
                             }
                             $moderatorList .= $attendee->fullName;
                         } else {
-                            if ( $moderator_count++ > 0 ) {
+                            if ($moderator_count++ > 0) {
                                 $viewerList .= ", ";
                             } else {
                                 $viewerList = "";
@@ -228,6 +228,6 @@ 
             }
         }
 
-        return array ($bigbluebuttonbn->section, $joinURL, $group, $users, $viewerList, $moderatorList, $recording, $actions );
+        return array($bigbluebuttonbn->section, $joinURL, $group, $users, $viewerList, $moderatorList, $recording, $actions);
     }
 }
\ No newline at end of file

classes/event/bigbluebuttonbn_recording_deleted.php

Spacing +1 added lines, -1 removed lines

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

bbb_broker.php

Braces +3 added lines, -2 removed lines

@@ -119,8 +119,9 @@
                         //Execute the end command
                         $meeting_info = bigbluebuttonbn_bbb_broker_do_end_meeting($params['id'], $bbbsession['modPW']);
                         // Moodle event logger: Create an event for meeting ended
-                        if( isset($bigbluebuttonbn) )
-                            bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_MEETING_ENDED, $bigbluebuttonbn, $context, $cm);
+                        if( isset($bigbluebuttonbn) ) {
+                                                    bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_MEETING_ENDED, $bigbluebuttonbn, $context, $cm);
+                        }
                         /// Update the cache
                         $meeting_info = bigbluebuttonbn_bbb_broker_get_meeting_info($params['id'], $bbbsession['modPW'], true);
 

Spacing +64 added lines, -64 removed lines

@@ -8,15 +8,15 @@ 
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v2 or later
  */
 
-require_once(dirname(dirname(dirname(__FILE__))).'/config.php');
-require_once(dirname(__FILE__).'/locallib.php');
+require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
+require_once(dirname(__FILE__) . '/locallib.php');
 
 global $PAGE, $USER, $CFG, $SESSION, $DB;
 
-$params['action']  = optional_param('action', '', PARAM_TEXT);
+$params['action'] = optional_param('action', '', PARAM_TEXT);
 $params['callback'] = optional_param('callback', '', PARAM_TEXT);
-$params['id'] = optional_param('id', '', PARAM_TEXT);    //recordID, the BBB recordID
-$params['idx'] = optional_param('idx', '', PARAM_TEXT);  //meetingID, the BBB meetingID
+$params['id'] = optional_param('id', '', PARAM_TEXT); //recordID, the BBB recordID
+$params['idx'] = optional_param('idx', '', PARAM_TEXT); //meetingID, the BBB meetingID
 $params['bigbluebuttonbn'] = optional_param('bigbluebuttonbn', 0, PARAM_INT);
 $params['signed_parameters'] = optional_param('signed_parameters', '', PARAM_TEXT);
 
@@ -25,13 +25,13 @@ 
 
 $error = '';
 
-if( empty($params['action']) ) {
+if (empty($params['action'])) {
     $error = bigbluebuttonbn_bbb_broker_add_error($error, "Parameter [action] was not included");
 
 } else {
     $error = bigbluebuttonbn_bbb_broker_validate_parameters($params);
 
-    if( empty($error) && $params['action'] != "recording_ready" ) {
+    if (empty($error) && $params['action'] != "recording_ready") {
 
         if ($params['bigbluebuttonbn'] != 0) {
             $bigbluebuttonbn = $DB->get_record('bigbluebuttonbn', array('id' => $params['bigbluebuttonbn']), '*', MUST_EXIST);
@@ -40,7 +40,7 @@ 
             $context = bigbluebuttonbn_get_context_module($cm->id);
         }
 
-        if ( isset($SESSION->bigbluebuttonbn_bbbsession) && !is_null($SESSION->bigbluebuttonbn_bbbsession) ) {
+        if (isset($SESSION->bigbluebuttonbn_bbbsession) && !is_null($SESSION->bigbluebuttonbn_bbbsession)) {
             $bbbsession = $SESSION->bigbluebuttonbn_bbbsession;
         } else {
             $error = bigbluebuttonbn_bbb_broker_add_error($error, "No session variable set");
@@ -49,7 +49,7 @@ 
 }
 
 header('Content-Type: application/javascript; charset=utf-8');
-if ( empty($error) ) {
+if (empty($error)) {
 
     if (!isloggedin() && $PAGE->course->id == SITEID) {
         $userid = guest_user()->id;
@@ -58,21 +58,21 @@ 
     }
     $hascourseaccess = ($PAGE->course->id == SITEID) || can_access_course($PAGE->course, $userid);
 
-    if( !$hascourseaccess ){
+    if (!$hascourseaccess) {
         header("HTTP/1.0 401 Unauthorized");
         return;
     } else {
         try {
-            switch ( strtolower($params['action']) ){
+            switch (strtolower($params['action'])) {
                 case 'meeting_info':
                     $meeting_info = bigbluebuttonbn_bbb_broker_get_meeting_info($params['id'], $bbbsession['modPW']);
                     $meeting_running = bigbluebuttonbn_bbb_broker_is_meeting_running($meeting_info); 
 
                     $status_can_end = '';
                     $status_can_tag = '';
-                    if( $meeting_running ) {
+                    if ($meeting_running) {
                         $join_button_text = get_string('view_conference_action_join', 'bigbluebuttonbn');
-                        if( $bbbsession['userlimit'] == 0 || $meeting_info->participantCount < $bbbsession['userlimit'] ) {
+                        if ($bbbsession['userlimit'] == 0 || $meeting_info->participantCount < $bbbsession['userlimit']) {
                             $initial_message = get_string('view_message_conference_in_progress', 'bigbluebuttonbn');
                             $can_join = true;
 
@@ -81,50 +81,50 @@ 
                             $can_join = false;
                         }
 
-                        if( $bbbsession['administrator'] || $bbbsession['moderator'] ) {
+                        if ($bbbsession['administrator'] || $bbbsession['moderator']) {
                             $end_button_text = get_string('view_conference_action_end', 'bigbluebuttonbn');
                             $can_end = true;
-                            $status_can_end = '"can_end": true, "end_button_text": "'.$end_button_text.'", ';
+                            $status_can_end = '"can_end": true, "end_button_text": "' . $end_button_text . '", ';
                         }
 
                     } else {
                         // If user is administrator, moderator or if is viewer and no waiting is required
-                        if ( $bbbsession['administrator'] || $bbbsession['moderator'] || !$bbbsession['wait'] ) {
+                        if ($bbbsession['administrator'] || $bbbsession['moderator'] || !$bbbsession['wait']) {
                             $initial_message = get_string('view_message_conference_room_ready', 'bigbluebuttonbn');
                             $join_button_text = get_string('view_conference_action_join', 'bigbluebuttonbn');
                             $can_join = true;
 
                         } else {
                             $initial_message = get_string('view_message_conference_not_started', 'bigbluebuttonbn');
-                            if ( $bbbsession['wait'] ) {
-                                $initial_message .= ' '.get_string('view_message_conference_wait_for_moderator', 'bigbluebuttonbn');
+                            if ($bbbsession['wait']) {
+                                $initial_message .= ' ' . get_string('view_message_conference_wait_for_moderator', 'bigbluebuttonbn');
                             }
                             $join_button_text = get_string('view_conference_action_lineup', 'bigbluebuttonbn');
                             $can_join = false;
                         }
 
-                        if( $bbbsession['tagging'] && ($bbbsession['administrator'] || $bbbsession['moderator']) ) {
+                        if ($bbbsession['tagging'] && ($bbbsession['administrator'] || $bbbsession['moderator'])) {
                             $can_tag = true;
 
                         } else {
                             $can_tag = false;
                         }
-                        $status_can_end = '"can_tag": '.($can_tag? 'true': 'false').', ';
+                        $status_can_end = '"can_tag": ' . ($can_tag ? 'true' : 'false') . ', ';
                     }
 
-                    echo $params['callback'].'({ "running": '.($meeting_running? 'true':'false').', "info": '.json_encode($meeting_info).', "status": {"can_join": '.($can_join? 'true':'false').',"join_url": "'.$bbbsession['joinURL'].'","join_button_text": "'.$join_button_text.'", '.$status_can_end.$status_can_tag.'"message": "'.$initial_message.'"} });';
+                    echo $params['callback'] . '({ "running": ' . ($meeting_running ? 'true' : 'false') . ', "info": ' . json_encode($meeting_info) . ', "status": {"can_join": ' . ($can_join ? 'true' : 'false') . ',"join_url": "' . $bbbsession['joinURL'] . '","join_button_text": "' . $join_button_text . '", ' . $status_can_end . $status_can_tag . '"message": "' . $initial_message . '"} });';
                     break;
                 case 'meeting_end':
-                    if( $bbbsession['administrator'] || $bbbsession['moderator'] ) {
+                    if ($bbbsession['administrator'] || $bbbsession['moderator']) {
                         //Execute the end command
                         $meeting_info = bigbluebuttonbn_bbb_broker_do_end_meeting($params['id'], $bbbsession['modPW']);
                         // Moodle event logger: Create an event for meeting ended
-                        if( isset($bigbluebuttonbn) )
+                        if (isset($bigbluebuttonbn))
                             bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_MEETING_ENDED, $bigbluebuttonbn, $context, $cm);
                         // Update the cache
                         $meeting_info = bigbluebuttonbn_bbb_broker_get_meeting_info($params['id'], $bbbsession['modPW'], true);
 
-                        echo $params['callback'].'({ "status": true });';
+                        echo $params['callback'] . '({ "status": true });';
                     } else {
                         error_log("ERROR: User not authorized to execute end command");
                         header("HTTP/1.0 401 Unauthorized. User not authorized to execute end command");
@@ -133,26 +133,26 @@ 
                 case 'recording_list':
                     break;
                 case 'recording_info':
-                    if( $bbbsession['managerecordings'] ) {
+                    if ($bbbsession['managerecordings']) {
                         //Retrieve the array of imported recordings
-                        $recordings_imported = bigbluebuttonbn_getRecordingsImportedArray($bbbsession['course']->id, isset($bbbsession['bigbluebuttonbn'])?$bbbsession['bigbluebuttonbn']->id: NULL);
+                        $recordings_imported = bigbluebuttonbn_getRecordingsImportedArray($bbbsession['course']->id, isset($bbbsession['bigbluebuttonbn']) ? $bbbsession['bigbluebuttonbn']->id : NULL);
                         $recordings_indexed = bigbluebuttonbn_index_recordings($recordings_imported);
-                        if( isset($recordings_indexed[$params['id']]) ) {
+                        if (isset($recordings_indexed[$params['id']])) {
                             //Look up for an update on the imported recording
                             $recording = $recordings_indexed[$params['id']];
-                            if ( isset($recording) && !empty($recording) && !array_key_exists('messageKey', $recording)) {  // The recording was found
-                                echo $params['callback'].'({ "status": "true", "published": "'.$recording['published'].'"});';
+                            if (isset($recording) && !empty($recording) && !array_key_exists('messageKey', $recording)) {  // The recording was found
+                                echo $params['callback'] . '({ "status": "true", "published": "' . $recording['published'] . '"});';
                             } else {
-                                echo $params['callback'].'({ "status": "false" });';
+                                echo $params['callback'] . '({ "status": "false" });';
                             }
 
                         // As the recordingid was not identified as imported recording link, look up for a real recording
                         } else {
                             $recording = bigbluebuttonbn_getRecordingArray($params['id'], $params['idx'], $endpoint, $shared_secret);
-                            if ( isset($recording) && !empty($recording) && !array_key_exists('messageKey', $recording)) {  // The recording was found
-                                echo $params['callback'].'({ "status": "true", "published": "'.$recording['published'].'"});';
+                            if (isset($recording) && !empty($recording) && !array_key_exists('messageKey', $recording)) {  // The recording was found
+                                echo $params['callback'] . '({ "status": "true", "published": "' . $recording['published'] . '"});';
                             } else {
-                                echo $params['callback'].'({ "status": "false" });';
+                                echo $params['callback'] . '({ "status": "false" });';
                             }
                         }
 
@@ -162,16 +162,16 @@ 
                     }
                     break;
                 case 'recording_publish':
-                    if( $bbbsession['managerecordings'] ) {
+                    if ($bbbsession['managerecordings']) {
                         $status = true;
                         //Retrieve the array of imported recordings for the current course and activity
-                        $recordings_imported = bigbluebuttonbn_getRecordingsImportedArray($bbbsession['course']->id, isset($bbbsession['bigbluebuttonbn'])?$bbbsession['bigbluebuttonbn']->id: NULL);
+                        $recordings_imported = bigbluebuttonbn_getRecordingsImportedArray($bbbsession['course']->id, isset($bbbsession['bigbluebuttonbn']) ? $bbbsession['bigbluebuttonbn']->id : NULL);
                         $recordings_imported_indexed = bigbluebuttonbn_index_recordings($recordings_imported);
-                        if( isset($recordings_imported_indexed[$params['id']]) ) {
+                        if (isset($recordings_imported_indexed[$params['id']])) {
                             $recordings = bigbluebuttonbn_getRecordingsArray($recordings_imported_indexed[$params['id']]['meetingID'], $bbbsession['endpoint'], $bbbsession['shared_secret']);
                             $recordings_indexed = bigbluebuttonbn_index_recordings($recordings);
                             $recording = $recordings_indexed[$params['id']];
-                            if ( $recording['published'] === 'true' ) {
+                            if ($recording['published'] === 'true') {
                                 // Only if the physical recording is published, execute publish on imported recording link
                                 $meeting_info = bigbluebuttonbn_bbb_broker_do_publish_recording_imported($params['id'], $bbbsession['course']->id, $bbbsession['bigbluebuttonbn']->id, true);
                             } else {
@@ -183,11 +183,11 @@ 
                             $meeting_info = bigbluebuttonbn_bbb_broker_do_publish_recording($params['id'], true);
                         }
 
-                        if ( $status ) {
+                        if ($status) {
                             $callback_response['status'] = "true";
 
                             // Moodle event logger: Create an event for recording published
-                            if( isset($bigbluebuttonbn) ) {
+                            if (isset($bigbluebuttonbn)) {
                                 bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_RECORDING_PUBLISHED, $bigbluebuttonbn, $context, $cm);
                             }
 
@@ -205,11 +205,11 @@ 
                     }
                     break;
                 case 'recording_unpublish':
-                    if( $bbbsession['managerecordings'] ) {
+                    if ($bbbsession['managerecordings']) {
                         //Retrieve the array of imported recordings for the current course and activity
-                        $recordings_imported = bigbluebuttonbn_getRecordingsImportedArray($bbbsession['course']->id, isset($bbbsession['bigbluebuttonbn'])?$bbbsession['bigbluebuttonbn']->id: NULL);
+                        $recordings_imported = bigbluebuttonbn_getRecordingsImportedArray($bbbsession['course']->id, isset($bbbsession['bigbluebuttonbn']) ? $bbbsession['bigbluebuttonbn']->id : NULL);
                         $recordings_indexed = bigbluebuttonbn_index_recordings($recordings_imported);
-                        if( isset($recordings_indexed[$params['id']]) ) {
+                        if (isset($recordings_indexed[$params['id']])) {
                             // Execute unpublish on imported recording link
                             $meeting_info = bigbluebuttonbn_bbb_broker_do_publish_recording_imported($params['id'], $bbbsession['course']->id, $bbbsession['bigbluebuttonbn']->id, false);
                         } else {
@@ -217,7 +217,7 @@ 
                             // First: Unpublish imported links associated to the recording 
                             $recordings_imported_all = bigbluebuttonbn_getRecordingsImportedAllInstances($params['id']);
 
-                            if( count($recordings_imported_all) > 0 ) {
+                            if (count($recordings_imported_all) > 0) {
                                 foreach ($recordings_imported_all as $key => $record) {
                                     $meta = json_decode($record->meta, true);
                                     // Prepare data for the update
@@ -233,7 +233,7 @@ 
                         }
 
                         // Moodle event logger: Create an event for recording unpublished
-                        if( isset($bigbluebuttonbn) ) {
+                        if (isset($bigbluebuttonbn)) {
                             bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_RECORDING_UNPUBLISHED, $bigbluebuttonbn, $context, $cm);
                         }
 
@@ -247,11 +247,11 @@ 
                     }
                     break;
                 case 'recording_delete':
-                    if( $bbbsession['managerecordings'] ) {
+                    if ($bbbsession['managerecordings']) {
                         //Retrieve the array of imported recordings
-                        $recordings_imported = bigbluebuttonbn_getRecordingsImportedArray($bbbsession['course']->id, isset($bbbsession['bigbluebuttonbn'])?$bbbsession['bigbluebuttonbn']->id: NULL);
+                        $recordings_imported = bigbluebuttonbn_getRecordingsImportedArray($bbbsession['course']->id, isset($bbbsession['bigbluebuttonbn']) ? $bbbsession['bigbluebuttonbn']->id : NULL);
                         $recordings_indexed = bigbluebuttonbn_index_recordings($recordings_imported);
-                        if( isset($recordings_indexed[$params['id']]) ) {
+                        if (isset($recordings_indexed[$params['id']])) {
                             // Execute unpublish on imported recording link
                             bigbluebuttonbn_bbb_broker_do_delete_recording_imported($params['id'], $bbbsession['course']->id, $bbbsession['bigbluebuttonbn']->id);
                         } else {
@@ -259,7 +259,7 @@ 
                             // First: Delete imported links associated to the recording 
                             $recordings_imported_all = bigbluebuttonbn_getRecordingsImportedAllInstances($params['id']);
 
-                            if( count($recordings_imported_all) > 0 ) {
+                            if (count($recordings_imported_all) > 0) {
                                 foreach ($recordings_imported_all as $key => $record) {
                                     // Execute delete
                                     $DB->delete_records("bigbluebuttonbn_logs", array('id' => $key));
@@ -270,7 +270,7 @@ 
                         }
 
                         // Moodle event logger: Create an event for recording deleted
-                        if( isset($bigbluebuttonbn) ) {
+                        if (isset($bigbluebuttonbn)) {
                             bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_RECORDING_DELETED, $bigbluebuttonbn, $context, $cm);
                         }
 
@@ -289,9 +289,9 @@ 
                         $decoded_parameters = JWT::decode($params['signed_parameters'], $shared_secret, array('HS256'));
 
                     } catch (Exception $e) {
-                        $error = 'Caught exception: '.$e->getMessage();
+                        $error = 'Caught exception: ' . $e->getMessage();
                         error_log($error);
-                        header("HTTP/1.0 400 Bad Request. ".$error);
+                        header("HTTP/1.0 400 Bad Request. " . $error);
                         return;
                     }
 
@@ -302,9 +302,9 @@ 
                         $bigbluebuttonbn = $DB->get_record('bigbluebuttonbn', array('id' => $meeting_id_elements[2]), '*', MUST_EXIST);
 
                     } catch (Exception $e) {
-                        $error = 'Caught exception: '.$e->getMessage();
+                        $error = 'Caught exception: ' . $e->getMessage();
                         error_log($error);
-                        header("HTTP/1.0 410 Gone. ".$error);
+                        header("HTTP/1.0 410 Gone. " . $error);
                         return;
                     }
 
@@ -314,22 +314,22 @@ 
                         header("HTTP/1.0 202 Accepted");
                         return;
                     } catch (Exception $e) {
-                        $error = 'Caught exception: '.$e->getMessage();
+                        $error = 'Caught exception: ' . $e->getMessage();
                         error_log($error);
-                        header("HTTP/1.0 503 Service Unavailable. ".$error);
+                        header("HTTP/1.0 503 Service Unavailable. " . $error);
                         return;
                     }
                     break;
                 case 'recording_import':
-                    if( $bbbsession['managerecordings'] ) {
+                    if ($bbbsession['managerecordings']) {
                         $importrecordings = $SESSION->bigbluebuttonbn_importrecordings;
-                        if( isset($importrecordings[$params['id']]) ) {
+                        if (isset($importrecordings[$params['id']])) {
                             $importrecordings[$params['id']]['imported'] = true;
                             $overrides['meetingid'] = $importrecordings[$params['id']]['meetingID'];
-                            $meta = '{"recording":'.json_encode($importrecordings[$params['id']]).'}';
+                            $meta = '{"recording":' . json_encode($importrecordings[$params['id']]) . '}';
                             bigbluebuttonbn_logs($bbbsession, BIGBLUEBUTTONBN_LOG_EVENT_IMPORT, $overrides, $meta);
                             // Moodle event logger: Create an event for recording imported
-                            if( isset($bigbluebuttonbn) ) {
+                            if (isset($bigbluebuttonbn)) {
                                 bigbluebuttonbn_event_log(BIGBLUEBUTTON_EVENT_RECORDING_IMPORTED, $bigbluebuttonbn, $context, $cm);
                             }
 
@@ -340,7 +340,7 @@ 
                         } else {
                             $error = "Recording {$params['id']} could not be found. It can not be imported";
                             error_log($error);
-                            header("HTTP/1.0 404 Not found. ".$error);
+                            header("HTTP/1.0 404 Not found. " . $error);
                             return;
                         }
                     }
@@ -351,14 +351,14 @@ 
                     break;
             }
 
-        } catch(Exception $e) {
-            error_log("BBB_BROKER ERROR: ".$e->getCode().", ".$e->getMessage());
-            header("HTTP/1.0 502 Bad Gateway. ".$e->getMessage());
+        } catch (Exception $e) {
+            error_log("BBB_BROKER ERROR: " . $e->getCode() . ", " . $e->getMessage());
+            header("HTTP/1.0 502 Bad Gateway. " . $e->getMessage());
             return;
         }
     }
 
 } else {
-    header("HTTP/1.0 400 Bad Request. ".$error);
+    header("HTTP/1.0 400 Bad Request. " . $error);
     return;
 }
\ No newline at end of file

settings.php

Indentation +18 added lines, -18 removed lines

@@ -190,27 +190,27 @@
 
     //// Configuration for "scheduled duration" feature
     if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_scheduled_duration_enabled) ) {
-      $settings->add( new admin_setting_heading('config_scheduled',
-              get_string('config_scheduled', 'bigbluebuttonbn'),
-              get_string('config_scheduled_description', 'bigbluebuttonbn')));
+        $settings->add( new admin_setting_heading('config_scheduled',
+                get_string('config_scheduled', 'bigbluebuttonbn'),
+                get_string('config_scheduled_description', 'bigbluebuttonbn')));
 
-      // calculated duration for 'scheduled session' feature
-      $settings->add(new admin_setting_configcheckbox('bigbluebuttonbn_scheduled_duration_enabled',
-              get_string('config_scheduled_duration_enabled', 'bigbluebuttonbn'),
-              get_string('config_scheduled_duration_enabled_description', 'bigbluebuttonbn'),
-              1));
+        // calculated duration for 'scheduled session' feature
+        $settings->add(new admin_setting_configcheckbox('bigbluebuttonbn_scheduled_duration_enabled',
+                get_string('config_scheduled_duration_enabled', 'bigbluebuttonbn'),
+                get_string('config_scheduled_duration_enabled_description', 'bigbluebuttonbn'),
+                1));
 
-      // compensatory time for 'scheduled session' feature
-      $settings->add(new admin_setting_configtext('bigbluebuttonbn_scheduled_duration_compensation',
-              get_string('config_scheduled_duration_compensation', 'bigbluebuttonbn'),
-              get_string('config_scheduled_duration_compensation_description', 'bigbluebuttonbn'),
-              10, PARAM_INT));
+        // compensatory time for 'scheduled session' feature
+        $settings->add(new admin_setting_configtext('bigbluebuttonbn_scheduled_duration_compensation',
+                get_string('config_scheduled_duration_compensation', 'bigbluebuttonbn'),
+                get_string('config_scheduled_duration_compensation_description', 'bigbluebuttonbn'),
+                10, PARAM_INT));
 
-      // pre-opening time for 'scheduled session' feature
-      $settings->add(new admin_setting_configtext('bigbluebuttonbn_scheduled_pre_opening',
-              get_string('config_scheduled_pre_opening', 'bigbluebuttonbn'),
-              get_string('config_scheduled_pre_opening_description', 'bigbluebuttonbn'),
-              10, PARAM_INT));
+        // pre-opening time for 'scheduled session' feature
+        $settings->add(new admin_setting_configtext('bigbluebuttonbn_scheduled_pre_opening',
+                get_string('config_scheduled_pre_opening', 'bigbluebuttonbn'),
+                get_string('config_scheduled_pre_opening_description', 'bigbluebuttonbn'),
+                10, PARAM_INT));
     }
       
     //// Configuration for defining the default role/user that will be moderator on new activities

Spacing +53 added lines, -53 removed lines

@@ -13,52 +13,52 @@ 
 
 global $BIGBLUEBUTTONBN_CFG;
 
-require_once(dirname(__FILE__).'/locallib.php');
+require_once(dirname(__FILE__) . '/locallib.php');
 
 if ($ADMIN->fulltree) {
-    if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_server_url) || 
-        !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_shared_secret) ) {
-        $settings->add( new admin_setting_heading('bigbluebuttonbn_config_general',
+    if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_server_url) || 
+        !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_shared_secret)) {
+        $settings->add(new admin_setting_heading('bigbluebuttonbn_config_general',
                 get_string('config_general', 'bigbluebuttonbn'),
                 get_string('config_general_description', 'bigbluebuttonbn')));
 
-        if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_server_url) ) {
-            $settings->add( new admin_setting_configtext( 'bigbluebuttonbn_server_url',
-                    get_string( 'config_server_url', 'bigbluebuttonbn' ),
-                    get_string( 'config_server_url_description', 'bigbluebuttonbn' ),
+        if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_server_url)) {
+            $settings->add(new admin_setting_configtext('bigbluebuttonbn_server_url',
+                    get_string('config_server_url', 'bigbluebuttonbn'),
+                    get_string('config_server_url_description', 'bigbluebuttonbn'),
                     bigbluebuttonbn_get_cfg_server_url_default()));
         }
-        if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_shared_secret) ) {
-            $settings->add( new admin_setting_configtext( 'bigbluebuttonbn_shared_secret',
-                    get_string( 'config_shared_secret', 'bigbluebuttonbn' ),
-                    get_string( 'config_shared_secret_description', 'bigbluebuttonbn' ),
+        if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_shared_secret)) {
+            $settings->add(new admin_setting_configtext('bigbluebuttonbn_shared_secret',
+                    get_string('config_shared_secret', 'bigbluebuttonbn'),
+                    get_string('config_shared_secret_description', 'bigbluebuttonbn'),
                     bigbluebuttonbn_get_cfg_shared_secret_default()));
         }
     }
 
     //// Configuration for 'recording' feature
-    if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recording_default) || 
+    if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recording_default) || 
         !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recording_editable) || 
-        !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recording_icons_enabled) ) {
-        $settings->add( new admin_setting_heading('bigbluebuttonbn_recording',
+        !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recording_icons_enabled)) {
+        $settings->add(new admin_setting_heading('bigbluebuttonbn_recording',
                 get_string('config_feature_recording', 'bigbluebuttonbn'),
                 get_string('config_feature_recording_description', 'bigbluebuttonbn')));
 
-        if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recording_default) ) {
+        if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recording_default)) {
             // default value for 'recording' feature
             $settings->add(new admin_setting_configcheckbox('bigbluebuttonbn_recording_default',
                     get_string('config_feature_recording_default', 'bigbluebuttonbn'),
                     get_string('config_feature_recording_default_description', 'bigbluebuttonbn'),
                     1));
         }
-        if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recording_editable) ) {
+        if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recording_editable)) {
             // UI for 'recording' feature
             $settings->add(new admin_setting_configcheckbox('bigbluebuttonbn_recording_editable',
                     get_string('config_feature_recording_editable', 'bigbluebuttonbn'),
                     get_string('config_feature_recording_editable_description', 'bigbluebuttonbn'),
                     1));
         }
-        if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recording_icons_enabled) ) {
+        if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recording_icons_enabled)) {
             // Front panel for 'recording' managment feature
             $settings->add(new admin_setting_configcheckbox('bigbluebuttonbn_recording_icons_enabled',
                     get_string('config_feature_recording_icons_enabled', 'bigbluebuttonbn'),
@@ -68,13 +68,13 @@ 
     }
     
     //// Configuration for 'recording tagging' feature
-    if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recordingtagging_default) || 
-        !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recordingtagging_editable) ) {
-        $settings->add( new admin_setting_heading('bigbluebuttonbn_recordingtagging',
+    if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recordingtagging_default) || 
+        !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recordingtagging_editable)) {
+        $settings->add(new admin_setting_heading('bigbluebuttonbn_recordingtagging',
                 get_string('config_feature_recordingtagging', 'bigbluebuttonbn'),
                 get_string('config_feature_recordingtagging_description', 'bigbluebuttonbn')));
 
-        if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recordingtagging_default) ) {
+        if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recordingtagging_default)) {
             // default value for 'recording tagging' feature
             $settings->add(new admin_setting_configcheckbox('bigbluebuttonbn_recordingtagging_default',
                     get_string('config_feature_recordingtagging_default', 'bigbluebuttonbn'),
@@ -82,7 +82,7 @@ 
                     0));
         }
         // UI for 'recording tagging' feature
-        if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recordingtagging_editable) ) {
+        if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recordingtagging_editable)) {
             $settings->add(new admin_setting_configcheckbox('bigbluebuttonbn_recordingtagging_editable',
                     get_string('config_feature_recordingtagging_editable', 'bigbluebuttonbn'),
                     get_string('config_feature_recordingtagging_editable_description', 'bigbluebuttonbn'),
@@ -91,8 +91,8 @@ 
     }
 
     //// Configuration for 'import recordings' feature
-    if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_importrecordings_enabled) ) {
-        $settings->add( new admin_setting_heading('bigbluebuttonbn_importrecordings',
+    if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_importrecordings_enabled)) {
+        $settings->add(new admin_setting_heading('bigbluebuttonbn_importrecordings',
                 get_string('config_feature_importrecordings', 'bigbluebuttonbn'),
                 get_string('config_feature_importrecordings_description', 'bigbluebuttonbn')));
 
@@ -104,36 +104,36 @@ 
     }
 
     //// Configuration for wait for moderator feature
-    if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_waitformoderator_default) ||
+    if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_waitformoderator_default) ||
         !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_waitformoderator_editable) || 
         !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_waitformoderator_ping_interval) || 
-        !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_waitformoderator_cache_ttl) ) {
-        $settings->add( new admin_setting_heading('bigbluebuttonbn_feature_waitformoderator',
+        !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_waitformoderator_cache_ttl)) {
+        $settings->add(new admin_setting_heading('bigbluebuttonbn_feature_waitformoderator',
                 get_string('config_feature_waitformoderator', 'bigbluebuttonbn'),
                 get_string('config_feature_waitformoderator_description', 'bigbluebuttonbn')));
 
-        if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_waitformoderator_default) ) {
+        if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_waitformoderator_default)) {
             //default value for 'wait for moderator' feature
             $settings->add(new admin_setting_configcheckbox('bigbluebuttonbn_waitformoderator_default',
                     get_string('config_feature_waitformoderator_default', 'bigbluebuttonbn'),
                     get_string('config_feature_waitformoderator_default_description', 'bigbluebuttonbn'),
                     0));
         }
-        if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_waitformoderator_editable) ) {
+        if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_waitformoderator_editable)) {
             // UI for 'wait for moderator' feature
             $settings->add(new admin_setting_configcheckbox('bigbluebuttonbn_waitformoderator_editable',
                     get_string('config_feature_waitformoderator_editable', 'bigbluebuttonbn'),
                     get_string('config_feature_waitformoderator_editable_description', 'bigbluebuttonbn'),
                     1));
         }
-        if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_waitformoderator_ping_interval) ) {
+        if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_waitformoderator_ping_interval)) {
             //ping interval value for 'wait for moderator' feature
             $settings->add(new admin_setting_configtext('bigbluebuttonbn_waitformoderator_ping_interval',
                     get_string('config_feature_waitformoderator_ping_interval', 'bigbluebuttonbn'),
                     get_string('config_feature_waitformoderator_ping_interval_description', 'bigbluebuttonbn'),
                     10, PARAM_INT));
         }
-        if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_waitformoderator_cache_ttl) ) {
+        if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_waitformoderator_cache_ttl)) {
             //cache TTL value for 'wait for moderator' feature
             $settings->add(new admin_setting_configtext('bigbluebuttonbn_waitformoderator_cache_ttl',
                     get_string('config_feature_waitformoderator_cache_ttl', 'bigbluebuttonbn'),
@@ -143,8 +143,8 @@ 
     }
 
     //// Configuration for "static voice bridge" feature
-    if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_voicebridge_editable) ) {
-        $settings->add( new admin_setting_heading('bigbluebuttonbn_feature_voicebridge',
+    if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_voicebridge_editable)) {
+        $settings->add(new admin_setting_heading('bigbluebuttonbn_feature_voicebridge',
                 get_string('config_feature_voicebridge', 'bigbluebuttonbn'),
                 get_string('config_feature_voicebridge_description', 'bigbluebuttonbn')));
 
@@ -156,10 +156,10 @@ 
     }
 
     //// Configuration for "preupload presentation" feature
-    if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_preuploadpresentation_enabled) ) {
+    if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_preuploadpresentation_enabled)) {
         // This feature only works if curl is installed
         if (extension_loaded('curl')) {
-            $settings->add( new admin_setting_heading('bigbluebuttonbn_feature_preuploadpresentation',
+            $settings->add(new admin_setting_heading('bigbluebuttonbn_feature_preuploadpresentation',
                 get_string('config_feature_preuploadpresentation', 'bigbluebuttonbn'),
                 get_string('config_feature_preuploadpresentation_description', 'bigbluebuttonbn')
                 ));
@@ -170,29 +170,29 @@ 
                 get_string('config_feature_preuploadpresentation_enabled_description', 'bigbluebuttonbn'),
                 0));
         } else {
-            $settings->add( new admin_setting_heading('bigbluebuttonbn_feature_preuploadpresentation',
+            $settings->add(new admin_setting_heading('bigbluebuttonbn_feature_preuploadpresentation',
                 get_string('config_feature_preuploadpresentation', 'bigbluebuttonbn'),
-                get_string('config_feature_preuploadpresentation_description', 'bigbluebuttonbn').'<br><br>'.
-                '<div class="form-defaultinfo">'.get_string('config_warning_curl_not_installed', 'bigbluebuttonbn').'</div><br>'
+                get_string('config_feature_preuploadpresentation_description', 'bigbluebuttonbn') . '<br><br>' .
+                '<div class="form-defaultinfo">' . get_string('config_warning_curl_not_installed', 'bigbluebuttonbn') . '</div><br>'
                 ));
         }
     }
 
     //// Configuration for "user limit" feature
-    if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_userlimit_default) || 
-        !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_userlimit_editable) ) {
-        $settings->add( new admin_setting_heading('config_userlimit',
+    if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_userlimit_default) || 
+        !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_userlimit_editable)) {
+        $settings->add(new admin_setting_heading('config_userlimit',
                 get_string('config_feature_userlimit', 'bigbluebuttonbn'),
                 get_string('config_feature_userlimit_description', 'bigbluebuttonbn')));
 
-        if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_userlimit_default) ) {
+        if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_userlimit_default)) {
             //default value for 'user limit' feature
             $settings->add(new admin_setting_configtext('bigbluebuttonbn_userlimit_default',
                     get_string('config_feature_userlimit_default', 'bigbluebuttonbn'),
                     get_string('config_feature_userlimit_default_description', 'bigbluebuttonbn'),
                     0, PARAM_INT));
         }
-        if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_userlimit_editable) ) {
+        if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_userlimit_editable)) {
             // UI for 'user limit' feature
             $settings->add(new admin_setting_configcheckbox('bigbluebuttonbn_userlimit_editable',
                     get_string('config_feature_userlimit_editable', 'bigbluebuttonbn'),
@@ -202,8 +202,8 @@ 
     }
 
     //// Configuration for "scheduled duration" feature
-    if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_scheduled_duration_enabled) ) {
-      $settings->add( new admin_setting_heading('config_scheduled',
+    if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_scheduled_duration_enabled)) {
+      $settings->add(new admin_setting_heading('config_scheduled',
               get_string('config_scheduled', 'bigbluebuttonbn'),
               get_string('config_scheduled_description', 'bigbluebuttonbn')));
 
@@ -227,8 +227,8 @@ 
     }
       
     //// Configuration for defining the default role/user that will be moderator on new activities
-    if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_moderator_default) ) {
-        $settings->add( new admin_setting_heading('bigbluebuttonbn_permission',
+    if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_moderator_default)) {
+        $settings->add(new admin_setting_heading('bigbluebuttonbn_permission',
                 get_string('config_permission', 'bigbluebuttonbn'),
                 get_string('config_permission_description', 'bigbluebuttonbn')));
 
@@ -242,8 +242,8 @@ 
     }
 
     //// Configuration for "send notifications" feature
-    if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_sendnotifications_enabled) ) {
-        $settings->add( new admin_setting_heading('bigbluebuttonbn_feature_sendnotifications',
+    if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_sendnotifications_enabled)) {
+        $settings->add(new admin_setting_heading('bigbluebuttonbn_feature_sendnotifications',
                 get_string('config_feature_sendnotifications', 'bigbluebuttonbn'),
                 get_string('config_feature_sendnotifications_description', 'bigbluebuttonbn')));
 
@@ -255,10 +255,10 @@ 
     }
 
     //// Configuration for extended BN capabilities
-    if( bigbluebuttonbn_server_offers_bn_capabilities() ) {
+    if (bigbluebuttonbn_server_offers_bn_capabilities()) {
         //// Configuration for 'notify users when recording ready' feature
-        if( !isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recordingready_enabled) ) {
-            $settings->add( new admin_setting_heading('bigbluebuttonbn_extended_capabilities',
+        if (!isset($BIGBLUEBUTTONBN_CFG->bigbluebuttonbn_recordingready_enabled)) {
+            $settings->add(new admin_setting_heading('bigbluebuttonbn_extended_capabilities',
                     get_string('config_extended_capabilities', 'bigbluebuttonbn'),
                     get_string('config_extended_capabilities_description', 'bigbluebuttonbn')));
 

mod_form.php

Indentation +32 added lines, -32 removed lines

@@ -183,30 +183,30 @@ 
         $mform->setType('participants', PARAM_TEXT);
 
         $html_participant_selection = ''.
-             '<div id="fitem_bigbluebuttonbn_participant_selection" class="fitem fitem_fselect">'."\n".
-             '  <div class="fitemtitle">'."\n".
-             '    <label for="bigbluebuttonbn_participant_selectiontype">'.get_string('mod_form_field_participant_add', 'bigbluebuttonbn').' </label>'."\n".
-             '  </div>'."\n".
-             '  <div class="felement fselect">'."\n".
-             '    <select id="bigbluebuttonbn_participant_selection_type" onchange="bigbluebuttonbn_participant_selection_set(); return 0;">'."\n".
-             '      <option value="all" selected="selected">'.get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn').'</option>'."\n".
-             '      <option value="role">'.get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn').'</option>'."\n".
-             '      <option value="user">'.get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn').'</option>'."\n".
-             '    </select>'."\n".
-             '    &nbsp;&nbsp;'."\n".
-             '    <select id="bigbluebuttonbn_participant_selection" disabled="disabled">'."\n".
-             '      <option value="all" selected="selected">---------------</option>'."\n".
-             '    </select>'."\n".
-             '    &nbsp;&nbsp;'."\n".
-             '    <input value="'.get_string('mod_form_field_participant_list_action_add', 'bigbluebuttonbn').'" type="button" id="id_addselectionid" onclick="bigbluebuttonbn_participant_add(); return 0;" />'."\n".
-             '  </div>'."\n".
-             '</div>'."\n".
-             '<div id="fitem_bigbluebuttonbn_participant_list" class="fitem">'."\n".
-             '  <div class="fitemtitle">'."\n".
-             '    <label for="bigbluebuttonbn_participant_list">'.get_string('mod_form_field_participant_list', 'bigbluebuttonbn').' </label>'."\n".
-             '  </div>'."\n".
-             '  <div class="felement fselect">'."\n".
-             '    <table id="participant_list_table">'."\n";
+                '<div id="fitem_bigbluebuttonbn_participant_selection" class="fitem fitem_fselect">'."\n".
+                '  <div class="fitemtitle">'."\n".
+                '    <label for="bigbluebuttonbn_participant_selectiontype">'.get_string('mod_form_field_participant_add', 'bigbluebuttonbn').' </label>'."\n".
+                '  </div>'."\n".
+                '  <div class="felement fselect">'."\n".
+                '    <select id="bigbluebuttonbn_participant_selection_type" onchange="bigbluebuttonbn_participant_selection_set(); return 0;">'."\n".
+                '      <option value="all" selected="selected">'.get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn').'</option>'."\n".
+                '      <option value="role">'.get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn').'</option>'."\n".
+                '      <option value="user">'.get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn').'</option>'."\n".
+                '    </select>'."\n".
+                '    &nbsp;&nbsp;'."\n".
+                '    <select id="bigbluebuttonbn_participant_selection" disabled="disabled">'."\n".
+                '      <option value="all" selected="selected">---------------</option>'."\n".
+                '    </select>'."\n".
+                '    &nbsp;&nbsp;'."\n".
+                '    <input value="'.get_string('mod_form_field_participant_list_action_add', 'bigbluebuttonbn').'" type="button" id="id_addselectionid" onclick="bigbluebuttonbn_participant_add(); return 0;" />'."\n".
+                '  </div>'."\n".
+                '</div>'."\n".
+                '<div id="fitem_bigbluebuttonbn_participant_list" class="fitem">'."\n".
+                '  <div class="fitemtitle">'."\n".
+                '    <label for="bigbluebuttonbn_participant_list">'.get_string('mod_form_field_participant_list', 'bigbluebuttonbn').' </label>'."\n".
+                '  </div>'."\n".
+                '  <div class="felement fselect">'."\n".
+                '    <table id="participant_list_table">'."\n";
 
         // Add participant list
         foreach($participant_list as $participant){
@@ -243,11 +243,11 @@ 
         }
 
         $html_participant_selection .= ''.
-             '    </table>'."\n".
-             '  </div>'."\n".
-             '</div>'."\n".
-             '<script type="text/javascript" src="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/mod_form.js">'."\n".
-             '</script>'."\n";
+                '    </table>'."\n".
+                '  </div>'."\n".
+                '</div>'."\n".
+                '<script type="text/javascript" src="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/mod_form.js">'."\n".
+                '</script>'."\n";
 
         $mform->addElement('html', $html_participant_selection);
 
@@ -255,9 +255,9 @@ 
         $mform->addElement('html', '<script type="text/javascript">var bigbluebuttonbn_participant_selection = {"all": [], "role": '.json_encode($roles).', "user": '.bigbluebuttonbn_get_users_json($users).'}; </script>');
         $mform->addElement('html', '<script type="text/javascript">var bigbluebuttonbn_participant_list = '.json_encode($participant_list).'; </script>');
         $bigbluebuttonbn_strings = Array( "as" => get_string('mod_form_field_participant_list_text_as', 'bigbluebuttonbn'),
-                                          "viewer" => get_string('mod_form_field_participant_bbb_role_viewer', 'bigbluebuttonbn'),
-                                          "moderator" => get_string('mod_form_field_participant_bbb_role_moderator', 'bigbluebuttonbn'),
-                                          "remove" => get_string('mod_form_field_participant_list_action_remove', 'bigbluebuttonbn'),
+                                            "viewer" => get_string('mod_form_field_participant_bbb_role_viewer', 'bigbluebuttonbn'),
+                                            "moderator" => get_string('mod_form_field_participant_bbb_role_moderator', 'bigbluebuttonbn'),
+                                            "remove" => get_string('mod_form_field_participant_list_action_remove', 'bigbluebuttonbn'),
                                     );
         $mform->addElement('html', '<script type="text/javascript">var bigbluebuttonbn_strings = '.json_encode($bigbluebuttonbn_strings).'; </script>');
         //-------------------------------------------------------------------------------

Braces +3 added lines, -2 removed lines

@@ -269,8 +269,9 @@
         // Fourth block starts here
         //-------------------------------------------------------------------------------
         $mform->addElement('header', 'schedule', get_string('mod_form_block_schedule', 'bigbluebuttonbn'));
-        if( isset($current_activity->openingtime) && $current_activity->openingtime != 0 || isset($current_activity->closingtime) && $current_activity->closingtime != 0 )
-            $mform->setExpanded('schedule');
+        if( isset($current_activity->openingtime) && $current_activity->openingtime != 0 || isset($current_activity->closingtime) && $current_activity->closingtime != 0 ) {
+                    $mform->setExpanded('schedule');
+        }
 
         $mform->addElement('date_time_selector', 'openingtime', get_string('mod_form_field_openingtime', 'bigbluebuttonbn'), array('optional' => true));
         $mform->setDefault('openingtime', 0);

Spacing +89 added lines, -89 removed lines

@@ -11,8 +11,8 @@ 
 
 defined('MOODLE_INTERNAL') || die();
 
-require_once(dirname(__FILE__).'/locallib.php');
-require_once($CFG->dirroot.'/course/moodleform_mod.php');
+require_once(dirname(__FILE__) . '/locallib.php');
+require_once($CFG->dirroot . '/course/moodleform_mod.php');
 
 class mod_bigbluebuttonbn_mod_form extends moodleform_mod {
 
@@ -50,24 +50,24 @@ 
 
         //Validates if the BigBlueButton server is running 
         $serverVersion = bigbluebuttonbn_getServerVersion($endpoint);
-        if ( !isset($serverVersion) ) {
-            print_error( 'general_error_unable_connect', 'bigbluebuttonbn', $CFG->wwwroot.'/admin/settings.php?section=modsettingbigbluebuttonbn' );
+        if (!isset($serverVersion)) {
+            print_error('general_error_unable_connect', 'bigbluebuttonbn', $CFG->wwwroot . '/admin/settings.php?section=modsettingbigbluebuttonbn');
         }
 
-        $mform =& $this->_form;
-        $current_activity =& $this->current;
+        $mform = & $this->_form;
+        $current_activity = & $this->current;
 
         //-------------------------------------------------------------------------------
         // First block starts here
         //-------------------------------------------------------------------------------
         $mform->addElement('header', 'general', get_string('mod_form_block_general', 'bigbluebuttonbn'));
 
-        $mform->addElement('text', 'name', get_string('mod_form_field_name','bigbluebuttonbn'), 'maxlength="64" size="32"');
+        $mform->addElement('text', 'name', get_string('mod_form_field_name', 'bigbluebuttonbn'), 'maxlength="64" size="32"');
         $mform->setType('name', PARAM_TEXT);
         $mform->addRule('name', null, 'required', null, 'client');
 
         $version_major = bigbluebuttonbn_get_moodle_version_major();
-        if ( $version_major < '2015051100' ) {
+        if ($version_major < '2015051100') {
             //This is valid before v2.9
             $this->add_intro_editor(false, get_string('mod_form_field_intro', 'bigbluebuttonbn'));
         } else {
@@ -77,60 +77,60 @@ 
         $mform->setAdvanced('introeditor');
         $mform->setAdvanced('showdescription');
 
-        $mform->addElement('textarea', 'welcome', get_string('mod_form_field_welcome','bigbluebuttonbn'), 'wrap="virtual" rows="5" cols="60"');
+        $mform->addElement('textarea', 'welcome', get_string('mod_form_field_welcome', 'bigbluebuttonbn'), 'wrap="virtual" rows="5" cols="60"');
         $mform->addHelpButton('welcome', 'mod_form_field_welcome', 'bigbluebuttonbn');
         $mform->setType('welcome', PARAM_TEXT);
         $mform->setAdvanced('welcome');
 
-        if ( $voicebridge_editable ) {
-            $mform->addElement('text', 'voicebridge', get_string('mod_form_field_voicebridge','bigbluebuttonbn'), array('maxlength'=>4, 'size'=>6));
+        if ($voicebridge_editable) {
+            $mform->addElement('text', 'voicebridge', get_string('mod_form_field_voicebridge', 'bigbluebuttonbn'), array('maxlength'=>4, 'size'=>6));
             $mform->addRule('voicebridge', get_string('mod_form_field_voicebridge_format_error', 'bigbluebuttonbn'), 'numeric', '####', 'server');
-            $mform->setDefault( 'voicebridge', 0 );
+            $mform->setDefault('voicebridge', 0);
             $mform->addHelpButton('voicebridge', 'mod_form_field_voicebridge', 'bigbluebuttonbn');
             $mform->setAdvanced('voicebridge');
         }
         $mform->setType('voicebridge', PARAM_INT);
 
-        if ( $waitformoderator_editable ) {
+        if ($waitformoderator_editable) {
             $mform->addElement('checkbox', 'wait', get_string('mod_form_field_wait', 'bigbluebuttonbn'));
             $mform->addHelpButton('wait', 'mod_form_field_wait', 'bigbluebuttonbn');
-            $mform->setDefault( 'wait', $waitformoderator_default );
+            $mform->setDefault('wait', $waitformoderator_default);
             $mform->setAdvanced('wait');
         } else {
-            $mform->addElement('hidden', 'wait', $waitformoderator_default );
+            $mform->addElement('hidden', 'wait', $waitformoderator_default);
         }
         $mform->setType('wait', PARAM_INT);
 
-        if ( $userlimit_editable ) {
-            $mform->addElement('text', 'userlimit', get_string('mod_form_field_userlimit','bigbluebuttonbn'), 'maxlength="3" size="5"' );
+        if ($userlimit_editable) {
+            $mform->addElement('text', 'userlimit', get_string('mod_form_field_userlimit', 'bigbluebuttonbn'), 'maxlength="3" size="5"');
             $mform->addHelpButton('userlimit', 'mod_form_field_userlimit', 'bigbluebuttonbn');
-            $mform->setDefault( 'userlimit', $userlimit_default );
+            $mform->setDefault('userlimit', $userlimit_default);
         } else {
-            $mform->addElement('hidden', 'userlimit', $userlimit_default );
+            $mform->addElement('hidden', 'userlimit', $userlimit_default);
         }
         $mform->setType('userlimit', PARAM_TEXT);
 
-        if ( floatval($serverVersion) >= 0.8 ) {
-            if ( $recording_editable ) {
+        if (floatval($serverVersion) >= 0.8) {
+            if ($recording_editable) {
                 $mform->addElement('checkbox', 'record', get_string('mod_form_field_record', 'bigbluebuttonbn'));
-                $mform->setDefault( 'record', $recording_default );
+                $mform->setDefault('record', $recording_default);
                 $mform->setAdvanced('record');
             } else {
                 $mform->addElement('hidden', 'record', $recording_default);
             }
             $mform->setType('record', PARAM_INT);
 
-            if ( $recording_tagging_editable ) {
+            if ($recording_tagging_editable) {
                 $mform->addElement('checkbox', 'tagging', get_string('mod_form_field_recordingtagging', 'bigbluebuttonbn'));
                 $mform->setDefault('tagging', $recording_tagging_default);
                 $mform->setAdvanced('tagging');
             } else {
-                $mform->addElement('hidden', 'tagging', $recording_tagging_default );
+                $mform->addElement('hidden', 'tagging', $recording_tagging_default);
             }
             $mform->setType('tagging', PARAM_INT);
         }
 
-        if ( $sendnotifications_enabled ) {
+        if ($sendnotifications_enabled) {
             $mform->addElement('checkbox', 'notification', get_string('mod_form_field_notification', 'bigbluebuttonbn'));
             if ($this->current->instance) {
                 $mform->addHelpButton('notification', 'mod_form_field_notification', 'bigbluebuttonbn');
@@ -148,7 +148,7 @@ 
         //-------------------------------------------------------------------------------
         // Second block starts here
         //-------------------------------------------------------------------------------
-        if ( $preuploadpresentation_enabled ) {
+        if ($preuploadpresentation_enabled) {
             $mform->addElement('header', 'preupload', get_string('mod_form_block_presentation', 'bigbluebuttonbn'));
             $mform->setExpanded('preupload');
 
@@ -180,84 +180,84 @@ 
         $mform->addElement('hidden', 'participants', json_encode($participant_list));
         $mform->setType('participants', PARAM_TEXT);
 
-        $html_participant_selection = ''.
-             '<div id="fitem_bigbluebuttonbn_participant_selection" class="fitem fitem_fselect">'."\n".
-             '  <div class="fitemtitle">'."\n".
-             '    <label for="bigbluebuttonbn_participant_selectiontype">'.get_string('mod_form_field_participant_add', 'bigbluebuttonbn').' </label>'."\n".
-             '  </div>'."\n".
-             '  <div class="felement fselect">'."\n".
-             '    <select id="bigbluebuttonbn_participant_selection_type" onchange="bigbluebuttonbn_participant_selection_set(); return 0;">'."\n".
-             '      <option value="all" selected="selected">'.get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn').'</option>'."\n".
-             '      <option value="role">'.get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn').'</option>'."\n".
-             '      <option value="user">'.get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn').'</option>'."\n".
-             '    </select>'."\n".
-             '    &nbsp;&nbsp;'."\n".
-             '    <select id="bigbluebuttonbn_participant_selection" disabled="disabled">'."\n".
-             '      <option value="all" selected="selected">---------------</option>'."\n".
-             '    </select>'."\n".
-             '    &nbsp;&nbsp;'."\n".
-             '    <input value="'.get_string('mod_form_field_participant_list_action_add', 'bigbluebuttonbn').'" type="button" id="id_addselectionid" onclick="bigbluebuttonbn_participant_add(); return 0;" />'."\n".
-             '  </div>'."\n".
-             '</div>'."\n".
-             '<div id="fitem_bigbluebuttonbn_participant_list" class="fitem">'."\n".
-             '  <div class="fitemtitle">'."\n".
-             '    <label for="bigbluebuttonbn_participant_list">'.get_string('mod_form_field_participant_list', 'bigbluebuttonbn').' </label>'."\n".
-             '  </div>'."\n".
-             '  <div class="felement fselect">'."\n".
-             '    <table id="participant_list_table">'."\n";
+        $html_participant_selection = '' .
+             '<div id="fitem_bigbluebuttonbn_participant_selection" class="fitem fitem_fselect">' . "\n" .
+             '  <div class="fitemtitle">' . "\n" .
+             '    <label for="bigbluebuttonbn_participant_selectiontype">' . get_string('mod_form_field_participant_add', 'bigbluebuttonbn') . ' </label>' . "\n" .
+             '  </div>' . "\n" .
+             '  <div class="felement fselect">' . "\n" .
+             '    <select id="bigbluebuttonbn_participant_selection_type" onchange="bigbluebuttonbn_participant_selection_set(); return 0;">' . "\n" .
+             '      <option value="all" selected="selected">' . get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn') . '</option>' . "\n" .
+             '      <option value="role">' . get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn') . '</option>' . "\n" .
+             '      <option value="user">' . get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn') . '</option>' . "\n" .
+             '    </select>' . "\n" .
+             '    &nbsp;&nbsp;' . "\n" .
+             '    <select id="bigbluebuttonbn_participant_selection" disabled="disabled">' . "\n" .
+             '      <option value="all" selected="selected">---------------</option>' . "\n" .
+             '    </select>' . "\n" .
+             '    &nbsp;&nbsp;' . "\n" .
+             '    <input value="' . get_string('mod_form_field_participant_list_action_add', 'bigbluebuttonbn') . '" type="button" id="id_addselectionid" onclick="bigbluebuttonbn_participant_add(); return 0;" />' . "\n" .
+             '  </div>' . "\n" .
+             '</div>' . "\n" .
+             '<div id="fitem_bigbluebuttonbn_participant_list" class="fitem">' . "\n" .
+             '  <div class="fitemtitle">' . "\n" .
+             '    <label for="bigbluebuttonbn_participant_list">' . get_string('mod_form_field_participant_list', 'bigbluebuttonbn') . ' </label>' . "\n" .
+             '  </div>' . "\n" .
+             '  <div class="felement fselect">' . "\n" .
+             '    <table id="participant_list_table">' . "\n";
 
         // Add participant list
-        foreach($participant_list as $participant){
+        foreach ($participant_list as $participant) {
             $participant_selectionid = '';
             $participant_selectiontype = $participant['selectiontype'];
-            if( $participant_selectiontype == 'all') {
-                $participant_selectiontype = '<b><i>'.get_string('mod_form_field_participant_list_type_'.$participant_selectiontype, 'bigbluebuttonbn').'</i></b>';
+            if ($participant_selectiontype == 'all') {
+                $participant_selectiontype = '<b><i>' . get_string('mod_form_field_participant_list_type_' . $participant_selectiontype, 'bigbluebuttonbn') . '</i></b>';
             } else {
-                if ( $participant_selectiontype == 'role') {
+                if ($participant_selectiontype == 'role') {
                     $participant_selectionid = bigbluebuttonbn_get_role_name($participant['selectionid']);
                 } else {
-                    foreach($users as $user){
-                        if( $user->id == $participant['selectionid']) {
-                            $participant_selectionid = $user->firstname.' '.$user->lastname;
+                    foreach ($users as $user) {
+                        if ($user->id == $participant['selectionid']) {
+                            $participant_selectionid = $user->firstname . ' ' . $user->lastname;
                             break;
                         }
                     }
                 }
-                $participant_selectiontype = '<b><i>'.get_string('mod_form_field_participant_list_type_'.$participant_selectiontype, 'bigbluebuttonbn').':</i></b>&nbsp;';
+                $participant_selectiontype = '<b><i>' . get_string('mod_form_field_participant_list_type_' . $participant_selectiontype, 'bigbluebuttonbn') . ':</i></b>&nbsp;';
             }
-            $participant_role = get_string('mod_form_field_participant_bbb_role_'.$participant['role'], 'bigbluebuttonbn');
-
-            $html_participant_selection .= ''.
-                '      <tr id="participant_list_tr_'.$participant['selectiontype'].'-'.$participant['selectionid'].'">'."\n".
-                '        <td width="20px"><a onclick="bigbluebuttonbn_participant_remove(\''.$participant['selectiontype'].'\', \''.$participant['selectionid'].'\'); return 0;" title="'.get_string('mod_form_field_participant_list_action_remove', 'bigbluebuttonbn').'">x</a></td>'."\n".
-                '        <td width="125px">'.$participant_selectiontype.'</td>'."\n".
-                '        <td>'.$participant_selectionid.'</td>'."\n".
-                '        <td><i>&nbsp;'.get_string('mod_form_field_participant_list_text_as', 'bigbluebuttonbn').'&nbsp;</i>'."\n".
-                '          <select id="participant_list_role_'.$participant['selectiontype'].'-'.$participant['selectionid'].'" onchange="bigbluebuttonbn_participant_list_role_update(\''.$participant['selectiontype'].'\', \''.$participant['selectionid'].'\'); return 0;">'."\n".
-                '            <option value="'.BIGBLUEBUTTONBN_ROLE_VIEWER.'" '.($participant['role'] == BIGBLUEBUTTONBN_ROLE_VIEWER? 'selected="selected" ': '').'>'.get_string('mod_form_field_participant_bbb_role_'.BIGBLUEBUTTONBN_ROLE_VIEWER, 'bigbluebuttonbn').'</option>'."\n".
-                '            <option value="'.BIGBLUEBUTTONBN_ROLE_MODERATOR.'" '.($participant['role'] == BIGBLUEBUTTONBN_ROLE_MODERATOR? 'selected="selected" ': '').'>'.get_string('mod_form_field_participant_bbb_role_'.BIGBLUEBUTTONBN_ROLE_MODERATOR, 'bigbluebuttonbn').'</option><select>'."\n".
-                '        </td>'."\n".
-                '      </tr>'."\n";
+            $participant_role = get_string('mod_form_field_participant_bbb_role_' . $participant['role'], 'bigbluebuttonbn');
+
+            $html_participant_selection .= '' .
+                '      <tr id="participant_list_tr_' . $participant['selectiontype'] . '-' . $participant['selectionid'] . '">' . "\n" .
+                '        <td width="20px"><a onclick="bigbluebuttonbn_participant_remove(\'' . $participant['selectiontype'] . '\', \'' . $participant['selectionid'] . '\'); return 0;" title="' . get_string('mod_form_field_participant_list_action_remove', 'bigbluebuttonbn') . '">x</a></td>' . "\n" .
+                '        <td width="125px">' . $participant_selectiontype . '</td>' . "\n" .
+                '        <td>' . $participant_selectionid . '</td>' . "\n" .
+                '        <td><i>&nbsp;' . get_string('mod_form_field_participant_list_text_as', 'bigbluebuttonbn') . '&nbsp;</i>' . "\n" .
+                '          <select id="participant_list_role_' . $participant['selectiontype'] . '-' . $participant['selectionid'] . '" onchange="bigbluebuttonbn_participant_list_role_update(\'' . $participant['selectiontype'] . '\', \'' . $participant['selectionid'] . '\'); return 0;">' . "\n" .
+                '            <option value="' . BIGBLUEBUTTONBN_ROLE_VIEWER . '" ' . ($participant['role'] == BIGBLUEBUTTONBN_ROLE_VIEWER ? 'selected="selected" ' : '') . '>' . get_string('mod_form_field_participant_bbb_role_' . BIGBLUEBUTTONBN_ROLE_VIEWER, 'bigbluebuttonbn') . '</option>' . "\n" .
+                '            <option value="' . BIGBLUEBUTTONBN_ROLE_MODERATOR . '" ' . ($participant['role'] == BIGBLUEBUTTONBN_ROLE_MODERATOR ? 'selected="selected" ' : '') . '>' . get_string('mod_form_field_participant_bbb_role_' . BIGBLUEBUTTONBN_ROLE_MODERATOR, 'bigbluebuttonbn') . '</option><select>' . "\n" .
+                '        </td>' . "\n" .
+                '      </tr>' . "\n";
         }
 
-        $html_participant_selection .= ''.
-             '    </table>'."\n".
-             '  </div>'."\n".
-             '</div>'."\n".
-             '<script type="text/javascript" src="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/mod_form.js">'."\n".
-             '</script>'."\n";
+        $html_participant_selection .= '' .
+             '    </table>' . "\n" .
+             '  </div>' . "\n" .
+             '</div>' . "\n" .
+             '<script type="text/javascript" src="' . $CFG->wwwroot . '/mod/bigbluebuttonbn/mod_form.js">' . "\n" .
+             '</script>' . "\n";
 
         $mform->addElement('html', $html_participant_selection);
 
         // Add data
-        $mform->addElement('html', '<script type="text/javascript">var bigbluebuttonbn_participant_selection = {"all": [], "role": '.json_encode($roles).', "user": '.bigbluebuttonbn_get_users_json($users).'}; </script>');
-        $mform->addElement('html', '<script type="text/javascript">var bigbluebuttonbn_participant_list = '.json_encode($participant_list).'; </script>');
-        $bigbluebuttonbn_strings = Array( "as" => get_string('mod_form_field_participant_list_text_as', 'bigbluebuttonbn'),
+        $mform->addElement('html', '<script type="text/javascript">var bigbluebuttonbn_participant_selection = {"all": [], "role": ' . json_encode($roles) . ', "user": ' . bigbluebuttonbn_get_users_json($users) . '}; </script>');
+        $mform->addElement('html', '<script type="text/javascript">var bigbluebuttonbn_participant_list = ' . json_encode($participant_list) . '; </script>');
+        $bigbluebuttonbn_strings = Array("as" => get_string('mod_form_field_participant_list_text_as', 'bigbluebuttonbn'),
                                           "viewer" => get_string('mod_form_field_participant_bbb_role_viewer', 'bigbluebuttonbn'),
                                           "moderator" => get_string('mod_form_field_participant_bbb_role_moderator', 'bigbluebuttonbn'),
                                           "remove" => get_string('mod_form_field_participant_list_action_remove', 'bigbluebuttonbn'),
                                     );
-        $mform->addElement('html', '<script type="text/javascript">var bigbluebuttonbn_strings = '.json_encode($bigbluebuttonbn_strings).'; </script>');
+        $mform->addElement('html', '<script type="text/javascript">var bigbluebuttonbn_strings = ' . json_encode($bigbluebuttonbn_strings) . '; </script>');
         //-------------------------------------------------------------------------------
         // Third block ends here
         //-------------------------------------------------------------------------------
@@ -267,7 +267,7 @@ 
         // Fourth block starts here
         //-------------------------------------------------------------------------------
         $mform->addElement('header', 'schedule', get_string('mod_form_block_schedule', 'bigbluebuttonbn'));
-        if( isset($current_activity->openingtime) && $current_activity->openingtime != 0 || isset($current_activity->closingtime) && $current_activity->closingtime != 0 )
+        if (isset($current_activity->openingtime) && $current_activity->openingtime != 0 || isset($current_activity->closingtime) && $current_activity->closingtime != 0)
             $mform->setExpanded('schedule');
 
         $mform->addElement('date_time_selector', 'openingtime', get_string('mod_form_field_openingtime', 'bigbluebuttonbn'), array('optional' => true));
@@ -295,8 +295,8 @@ 
                 $draftitemid = file_get_submitted_draft_itemid('presentation');
                 file_prepare_draft_area($draftitemid, $this->context->id, 'mod_bigbluebuttonbn', 'presentation', 0, array('subdirs'=>0, 'maxbytes' => 0, 'maxfiles' => 1, 'mainfile' => true));
                 $default_values['presentation'] = $draftitemid;
-            } catch (Exception $e){
-                error_log("Presentation could not be loaded: ".$e->getMessage());
+            } catch (Exception $e) {
+                error_log("Presentation could not be loaded: " . $e->getMessage());
                 return NULL;
             }
         }
@@ -305,14 +305,14 @@ 
     function validation($data, $files) {
         $errors = parent::validation($data, $files);
 
-        if ( isset($data['openingtime']) && isset($data['closingtime']) ) {
-            if ( $data['openingtime'] != 0 && $data['closingtime'] != 0 && $data['closingtime'] < $data['openingtime']) {
+        if (isset($data['openingtime']) && isset($data['closingtime'])) {
+            if ($data['openingtime'] != 0 && $data['closingtime'] != 0 && $data['closingtime'] < $data['openingtime']) {
                 $errors['closingtime'] = get_string('bbbduetimeoverstartingtime', 'bigbluebuttonbn');
             }
         }
         
-        if ( isset($data['voicebridge']) ) {
-            if ( !bigbluebuttonbn_voicebridge_unique($data['voicebridge'], $data['instance'])) {
+        if (isset($data['voicebridge'])) {
+            if (!bigbluebuttonbn_voicebridge_unique($data['voicebridge'], $data['instance'])) {
                 $errors['voicebridge'] = get_string('mod_form_field_voicebridge_notunique_error', 'bigbluebuttonbn');
             }
         }