blindsidenetworks / moodle-mod_bigbluebuttonbn

locallib.php

Indentation +49 added lines, -49 removed lines

@@ -89,9 +89,9 @@ 
  */
 function bigbluebuttonbn_get_join_url($meetingid, $username, $pw, $logouturl, $configtoken = null, $userid = null) {
     $data = ['meetingID' => $meetingid,
-              'fullName' => $username,
-              'password' => $pw,
-              'logoutURL' => $logouturl,
+                'fullName' => $username,
+                'password' => $pw,
+                'logoutURL' => $logouturl,
             ];
     if (!is_null($configtoken)) {
         $data['configToken'] = $configtoken;
@@ -143,23 +143,23 @@ 
 function bigbluebuttonbn_get_meeting_info_array($meetingid) {
     $xml = bigbluebuttonbn_wrap_xml_load_file(
         \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid])
-      );
+        );
     if ($xml && $xml->returncode == 'SUCCESS' && empty($xml->messageKey)) {
         // Meeting info was returned.
         return array('returncode' => $xml->returncode,
-                     'meetingID' => $xml->meetingID,
-                     'moderatorPW' => $xml->moderatorPW,
-                     'attendeePW' => $xml->attendeePW,
-                     'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded,
-                     'running' => $xml->running,
-                     'recording' => $xml->recording,
-                     'startTime' => $xml->startTime,
-                     'endTime' => $xml->endTime,
-                     'participantCount' => $xml->participantCount,
-                     'moderatorCount' => $xml->moderatorCount,
-                     'attendees' => $xml->attendees,
-                     'metadata' => $xml->metadata,
-                   );
+                        'meetingID' => $xml->meetingID,
+                        'moderatorPW' => $xml->moderatorPW,
+                        'attendeePW' => $xml->attendeePW,
+                        'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded,
+                        'running' => $xml->running,
+                        'recording' => $xml->recording,
+                        'startTime' => $xml->startTime,
+                        'endTime' => $xml->endTime,
+                        'participantCount' => $xml->participantCount,
+                        'moderatorCount' => $xml->moderatorCount,
+                        'attendees' => $xml->attendees,
+                        'metadata' => $xml->metadata,
+                    );
     }
     if ($xml) {
         // Either failure or success without meeting info.
@@ -295,7 +295,7 @@ 
 function bigbluebuttonbn_get_default_config_xml() {
     $xml = bigbluebuttonbn_wrap_xml_load_file(
         \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getDefaultConfigXML')
-      );
+        );
     return $xml;
 }
 
@@ -396,7 +396,7 @@ 
     foreach ($ids as $id) {
         $xml = bigbluebuttonbn_wrap_xml_load_file(
             \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('deleteRecordings', ['recordID' => $id])
-          );
+            );
         if ($xml && $xml->returncode != 'SUCCESS') {
             return false;
         }
@@ -415,7 +415,7 @@ 
     foreach ($ids as $id) {
         $xml = bigbluebuttonbn_wrap_xml_load_file(
             \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('publishRecordings', ['recordID' => $id, 'publish' => $publish])
-          );
+            );
         if ($xml && $xml->returncode != 'SUCCESS') {
             return false;
         }
@@ -434,7 +434,7 @@ 
     foreach ($ids as $id) {
         $xml = bigbluebuttonbn_wrap_xml_load_file(
             \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('updateRecordings', ['recordID' => $id] + (array) $params)
-          );
+            );
         if ($xml && $xml->returncode != 'SUCCESS') {
             return false;
         }
@@ -451,7 +451,7 @@ 
 function bigbluebuttonbn_end_meeting($meetingid, $modpw) {
     $xml = bigbluebuttonbn_wrap_xml_load_file(
         \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('end', ['meetingID' => $meetingid, 'password' => $modpw])
-      );
+        );
     if ($xml) {
         // If the xml packet returned failure it displays the message to the user.
         return array('returncode' => $xml->returncode, 'message' => $xml->message, 'messageKey' => $xml->messageKey);
@@ -471,7 +471,7 @@ 
      */
     $xml = bigbluebuttonbn_wrap_xml_load_file(
         \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid])
-      );
+        );
     return ($xml && $xml->returncode == 'SUCCESS');
 }
 
@@ -483,7 +483,7 @@ 
 function bigbluebuttonbn_get_server_version() {
     $xml = bigbluebuttonbn_wrap_xml_load_file(
         \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url()
-      );
+        );
     if ($xml && $xml->returncode == 'SUCCESS') {
         return $xml->version;
     }
@@ -551,10 +551,10 @@ 
 
         $options = array();
         $options['CURLOPT_HTTPHEADER'] = array(
-                 'Content-Type: '.$contenttype,
-                 'Content-Length: '.strlen($data),
-                 'Content-Language: en-US',
-               );
+                    'Content-Type: '.$contenttype,
+                    'Content-Length: '.strlen($data),
+                    'Content-Language: en-US',
+                );
 
         return $c->post($url, $data, $options);
     }
@@ -697,16 +697,16 @@ 
         'all' => array(
             'name' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'),
             'children' => []
-          )
-      );
+            )
+        );
     $data['role'] = array(
         'name' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'),
         'children' => bigbluebuttonbn_get_roles_select($context)
-      );
+        );
     $data['user'] = array(
         'name' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'),
         'children' => bigbluebuttonbn_get_users_select($context)
-      );
+        );
     return $data;
 }
 
@@ -751,9 +751,9 @@ 
             continue;
         }
         $participantlistarray[] = array(
-              'selectiontype' => 'role',
-              'selectionid' => $moderatordefault,
-              'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR);
+                'selectiontype' => 'role',
+                'selectionid' => $moderatordefault,
+                'role' => BIGBLUEBUTTONBN_ROLE_MODERATOR);
     }
     return $participantlistarray;
 }
@@ -796,11 +796,11 @@ 
             'all' => get_string('mod_form_field_participant_list_type_all', 'bigbluebuttonbn'),
             'role' => get_string('mod_form_field_participant_list_type_role', 'bigbluebuttonbn'),
             'user' => get_string('mod_form_field_participant_list_type_user', 'bigbluebuttonbn'),
-          ],
+            ],
         'type_selected' => 'all',
         'options' => ['all' => '---------------'],
         'selected' => 'all',
-      ];
+        ];
 }
 
 /**
@@ -1080,7 +1080,7 @@ 
     // Ping again and refresh the cache.
     $meetinginfo = (array) bigbluebuttonbn_wrap_xml_load_file(
         \mod_bigbluebuttonbn\locallib\bigbluebutton::action_url('getMeetingInfo', ['meetingID' => $meetingid])
-      );
+        );
     $cache->set($meetingid, array('creation_time' => time(), 'meeting_info' => json_encode($meetinginfo)));
     return $meetinginfo;
 }
@@ -1450,8 +1450,8 @@ 
     }
     $id = 'playbacks-'.$recording['recordID'];
     $recordingtypes = html_writer::start_tag('div', array('id' => $id, 'data-imported' => $dataimported,
-          'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'],
-          'title' => $title, $visibility => $visibility));
+            'data-meetingid' => $recording['meetingID'], 'data-recordingid' => $recording['recordID'],
+            'title' => $title, $visibility => $visibility));
     foreach ($recording['playbacks'] as $playback) {
         $recordingtypes .= bigbluebuttonbn_get_recording_data_row_type($recording, $bbbsession, $playback);
     }
@@ -1476,7 +1476,7 @@ 
     $title = get_string('view_recording_format_'.$playback['type'], 'bigbluebuttonbn');
     $onclick = 'M.mod_bigbluebuttonbn.recordings.recordingPlay(this);';
     $href = $CFG->wwwroot . '/mod/bigbluebuttonbn/bbb_view.php?action=play&bn=' . $bbbsession['bigbluebuttonbn']->id .
-      '&mid='.$recording['meetingID'] . '&rid=' . $recording['recordID'] . '&rtype=' . $playback['type'];
+        '&mid='.$recording['meetingID'] . '&rid=' . $recording['recordID'] . '&rtype=' . $playback['type'];
     if (!isset($recording['imported']) || !isset($recording['protected']) || $recording['protected'] === 'false') {
         $href .= '&href='.urlencode(trim($playback['url']));
     }
@@ -1488,7 +1488,7 @@ 
         'data-target' => $playback['type'],
         'data-href' => $href,
         'class' => 'btn btn-sm btn-default'
-      );
+        );
     return $OUTPUT->action_link('#', $title, null, $linkattributes) . ' ';
 }
 
@@ -1602,10 +1602,10 @@ 
             'id' => $id,
             'onclick' => $onclick,
             'data-action' => $data['action']
-          );
+            );
         if (!isset($recording['imported'])) {
             $linkattributes['data-links'] = bigbluebuttonbn_count_recording_imported_instances(
-              $recording['recordID']);
+                $recording['recordID']);
         }
         if (isset($data['disabled'])) {
             $iconattributes['class'] .= ' fa-' . $data['disabled'];
@@ -2146,8 +2146,8 @@ 
     $activitytime = '';
     if ($time) {
         $activitytime = calendar_day_representation($time).' '.
-          get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '.
-          calendar_time_representation($time);
+            get_string('mod_form_field_notification_msg_at', 'bigbluebuttonbn').' '.
+            calendar_time_representation($time);
     }
     return $activitytime;
 }
@@ -2258,7 +2258,7 @@ 
             $renderer->render_group_element_text('server_url', BIGBLUEBUTTONBN_DEFAULT_SERVER_URL));
         $renderer->render_group_element('shared_secret',
             $renderer->render_group_element_text('shared_secret', BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET));
-		$renderer->render_group_element('enable_html5',
+        $renderer->render_group_element('enable_html5',
             $renderer->render_group_element_checkbox('enable_html5', 0));
     }
 }
@@ -2449,7 +2449,7 @@ 
         $renderer->render_group_element('participant_moderator_default',
             $renderer->render_group_element_configmultiselect('participant_moderator_default',
                 array_keys($owner), array_merge($owner, $roles))
-          );
+            );
     }
 }
 
@@ -2549,7 +2549,7 @@ 
         return $output;
     }
     $output .= $OUTPUT->box_start('box boxalignleft adminerror alert alert-' . $type . ' alert-block fade in',
-      'bigbluebuttonbn_view_general_warning') . "\n";
+        'bigbluebuttonbn_view_general_warning') . "\n";
     $output .= '    ' . $message . "\n";
     $output .= '  <div class="singlebutton pull-right">' . "\n";
     if (!empty($href)) {

lang/en/bigbluebuttonbn.php

Spacing +1 added lines, -1 removed lines

@@ -390,5 +390,5 @@
 $string['view_error_action_not_completed'] = 'Action could not be completed';
 $string['view_warning_default_server'] = 'This Moodle server is making use of the BigBlueButton testing server that comes pre-configured by default. It should be replaced for production.';
 
-$string['config_enable_html5'] =  'Default HTML5 Client';
+$string['config_enable_html5'] = 'Default HTML5 Client';
 $string['config_enable_html5_description'] = 'This settings will enable HTML5 client by default instead of Flash client but it will check whether HTML5 is running or not. If running then it will redirect to HTML5 client otherwise fallback to Flash.';
\ No newline at end of file

classes/locallib/config.php

Indentation +28 added lines, -28 removed lines

@@ -57,7 +57,7 @@ 
         return array(
             'server_url' => (string) BIGBLUEBUTTONBN_DEFAULT_SERVER_URL,
             'shared_secret' => (string) BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET,
-			'enable_html5' => 'false',
+            'enable_html5' => 'false',
             'voicebridge_editable' => 'false',
             'importrecordings_enabled' => 'false',
             'importrecordings_from_deleted_enabled' => 'false',
@@ -153,32 +153,32 @@ 
      */
     public static function get_options() {
         return array(
-               'version_major' => self::get_moodle_version_major(),
-               'voicebridge_editable' => self::get('voicebridge_editable'),
-               'waitformoderator_default' => self::get('waitformoderator_default'),
-               'waitformoderator_editable' => self::get('waitformoderator_editable'),
-               'userlimit_default' => self::get('userlimit_default'),
-               'userlimit_editable' => self::get('userlimit_editable'),
-               'preuploadpresentation_enabled' => self::get('preuploadpresentation_enabled'),
-               'sendnotifications_enabled' => self::get('sendnotifications_enabled'),
-               'recordings_enabled' => self::get('recordings_enabled'),
-			   'enable_html5' => self::get('enable_html5'),
-               'recordings_html_default' => self::get('recordings_html_default'),
-               'recordings_html_editable' => self::get('recordings_html_editable'),
-               'recordings_deleted_default' => self::get('recordings_deleted_default'),
-               'recordings_deleted_editable' => self::get('recordings_deleted_editable'),
-               'recordings_imported_default' => self::get('recordings_imported_default'),
-               'recordings_imported_editable' => self::get('recordings_imported_editable'),
-               'recordings_preview_default' => self::get('recordings_preview_default'),
-               'recordings_preview_editable' => self::get('recordings_preview_editable'),
-               'recording_default' => self::get('recording_default'),
-               'recording_editable' => self::get('recording_editable'),
-               'recording_icons_enabled' => self::get('recording_icons_enabled'),
-               'general_warning_message' => self::get('general_warning_message'),
-               'general_warning_box_type' => self::get('general_warning_box_type'),
-               'general_warning_button_text' => self::get('general_warning_button_text'),
-               'general_warning_button_href' => self::get('general_warning_button_href'),
-               'general_warning_button_class' => self::get('general_warning_button_class'),
-          );
+                'version_major' => self::get_moodle_version_major(),
+                'voicebridge_editable' => self::get('voicebridge_editable'),
+                'waitformoderator_default' => self::get('waitformoderator_default'),
+                'waitformoderator_editable' => self::get('waitformoderator_editable'),
+                'userlimit_default' => self::get('userlimit_default'),
+                'userlimit_editable' => self::get('userlimit_editable'),
+                'preuploadpresentation_enabled' => self::get('preuploadpresentation_enabled'),
+                'sendnotifications_enabled' => self::get('sendnotifications_enabled'),
+                'recordings_enabled' => self::get('recordings_enabled'),
+                'enable_html5' => self::get('enable_html5'),
+                'recordings_html_default' => self::get('recordings_html_default'),
+                'recordings_html_editable' => self::get('recordings_html_editable'),
+                'recordings_deleted_default' => self::get('recordings_deleted_default'),
+                'recordings_deleted_editable' => self::get('recordings_deleted_editable'),
+                'recordings_imported_default' => self::get('recordings_imported_default'),
+                'recordings_imported_editable' => self::get('recordings_imported_editable'),
+                'recordings_preview_default' => self::get('recordings_preview_default'),
+                'recordings_preview_editable' => self::get('recordings_preview_editable'),
+                'recording_default' => self::get('recording_default'),
+                'recording_editable' => self::get('recording_editable'),
+                'recording_icons_enabled' => self::get('recording_icons_enabled'),
+                'general_warning_message' => self::get('general_warning_message'),
+                'general_warning_box_type' => self::get('general_warning_box_type'),
+                'general_warning_button_text' => self::get('general_warning_button_text'),
+                'general_warning_button_href' => self::get('general_warning_button_href'),
+                'general_warning_button_class' => self::get('general_warning_button_class'),
+            );
     }
 }

Spacing +4 added lines, -4 removed lines

@@ -55,8 +55,8 @@ 
      */
     public static function defaultvalues() {
         return array(
-            'server_url' => (string) BIGBLUEBUTTONBN_DEFAULT_SERVER_URL,
-            'shared_secret' => (string) BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET,
+            'server_url' => (string)BIGBLUEBUTTONBN_DEFAULT_SERVER_URL,
+            'shared_secret' => (string)BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET,
 			'enable_html5' => 'false',
             'voicebridge_editable' => 'false',
             'importrecordings_enabled' => 'false',
@@ -122,8 +122,8 @@ 
         if (isset($CFG->bigbluebuttonbn[$setting])) {
             return (string)$CFG->bigbluebuttonbn[$setting];
         }
-        if (isset($CFG->{'bigbluebuttonbn_'.$setting})) {
-            return (string)$CFG->{'bigbluebuttonbn_'.$setting};
+        if (isset($CFG->{'bigbluebuttonbn_' . $setting})) {
+            return (string)$CFG->{'bigbluebuttonbn_' . $setting};
         }
         return  self::defaultvalue($setting);
     }

classes/locallib/bigbluebutton.php

Indentation +11 added lines, -11 removed lines

@@ -55,20 +55,20 @@
             $params .= '&' . 'meta_' . $key.'=' . urlencode($value);
         }
 		
-		$enable_html5 = trim(\mod_bigbluebuttonbn\locallib\config::get('enable_html5'));
+        $enable_html5 = trim(\mod_bigbluebuttonbn\locallib\config::get('enable_html5'));
 		
-		if($enable_html5){
-			// from https://github.com/blindsidenetworks/moodle-mod_bigbluebuttonbn/pull/37
-			$parsed_url = parse_url($baseurl);
-			$statusHTML5 = file_get_contents($parsed_url["scheme"]."://".$parsed_url["host"]."/html5client/check");
+        if($enable_html5){
+            // from https://github.com/blindsidenetworks/moodle-mod_bigbluebuttonbn/pull/37
+            $parsed_url = parse_url($baseurl);
+            $statusHTML5 = file_get_contents($parsed_url["scheme"]."://".$parsed_url["host"]."/html5client/check");
 			
-			if($statusHTML5 == '{"html5clientStatus":"running"}') {
-				// HTML5 client is running => joining HTML5 client
-				$clientURL = $parsed_url["scheme"]."://".$parsed_url["host"]."/html5client/join";
-				$params = $params.'&clientURL='.urlencode($clientURL);
-			}
+            if($statusHTML5 == '{"html5clientStatus":"running"}') {
+                // HTML5 client is running => joining HTML5 client
+                $clientURL = $parsed_url["scheme"]."://".$parsed_url["host"]."/html5client/join";
+                $params = $params.'&clientURL='.urlencode($clientURL);
+            }
 			
-		}
+        }
 		
         return $baseurl . $params . '&checksum=' . sha1($action . $params . self::sanitized_secret());
     }

Spacing +6 added lines, -6 removed lines

@@ -52,20 +52,20 @@
             $params .= '&' . $key . '=' . urlencode($value);
         }
         foreach ($metadata as $key => $value) {
-            $params .= '&' . 'meta_' . $key.'=' . urlencode($value);
+            $params .= '&' . 'meta_' . $key . '=' . urlencode($value);
         }
 		
 		$enable_html5 = trim(\mod_bigbluebuttonbn\locallib\config::get('enable_html5'));
 		
-		if($enable_html5){
+		if ($enable_html5) {
 			// from https://github.com/blindsidenetworks/moodle-mod_bigbluebuttonbn/pull/37
 			$parsed_url = parse_url($baseurl);
-			$statusHTML5 = file_get_contents($parsed_url["scheme"]."://".$parsed_url["host"]."/html5client/check");
+			$statusHTML5 = file_get_contents($parsed_url["scheme"] . "://" . $parsed_url["host"] . "/html5client/check");
 			
-			if($statusHTML5 == '{"html5clientStatus":"running"}') {
+			if ($statusHTML5 == '{"html5clientStatus":"running"}') {
 				// HTML5 client is running => joining HTML5 client
-				$clientURL = $parsed_url["scheme"]."://".$parsed_url["host"]."/html5client/join";
-				$params = $params.'&clientURL='.urlencode($clientURL);
+				$clientURL = $parsed_url["scheme"] . "://" . $parsed_url["host"] . "/html5client/join";
+				$params = $params . '&clientURL=' . urlencode($clientURL);
 			}
 			
 		}

classes/settings/validator.php

Indentation +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
         global $CFG;
         return (!isset($CFG->bigbluebuttonbn['server_url']) ||
                 !isset($CFG->bigbluebuttonbn['shared_secret'])||
-				!isset($CFG->bigbluebuttonbn['enable_html5']));
+                !isset($CFG->bigbluebuttonbn['enable_html5']));
     }
 
     /**
@@ -88,7 +88,7 @@ 
                 !isset($CFG->bigbluebuttonbn['recordings_imported_editable']) ||
                 !isset($CFG->bigbluebuttonbn['recordings_preview_default']) ||
                 !isset($CFG->bigbluebuttonbn['recordings_preview_editable'])
-              );
+                );
     }
 
     /**

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->dirroot . '/mod/bigbluebuttonbn/locallib.php');
-require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir . '/adminlib.php');
 
 /**
  * Helper class for validating settings used HTML for settings.php.
@@ -46,7 +46,7 @@ 
     public static function section_general_shown() {
         global $CFG;
         return (!isset($CFG->bigbluebuttonbn['server_url']) ||
-                !isset($CFG->bigbluebuttonbn['shared_secret'])||
+                !isset($CFG->bigbluebuttonbn['shared_secret']) ||
 				!isset($CFG->bigbluebuttonbn['enable_html5']));
     }