chamilo / chamilo-lms

plugin/bbb/listing.php

Spacing +9 added lines, -9 removed lines

@@ -65,22 +65,22 @@ 
         case 'end':
             $bbb->endMeeting($_GET['id']);
             $message = Display::return_message(
-                get_lang('MeetingClosed') . '<br />' . get_lang(
+                get_lang('MeetingClosed').'<br />'.get_lang(
                     'MeetingClosedComment'
                 ),
                 'success',
                 false
             );
 
-            if (file_exists(__DIR__ . '/config.vm.php')) {
-                require __DIR__ . '/../../vendor/autoload.php';
+            if (file_exists(__DIR__.'/config.vm.php')) {
+                require __DIR__.'/../../vendor/autoload.php';
 
-                require __DIR__ . '/lib/vm/AbstractVM.php';
-                require __DIR__ . '/lib/vm/VMInterface.php';
-                require __DIR__ . '/lib/vm/DigitalOceanVM.php';
-                require __DIR__ . '/lib/VM.php';
+                require __DIR__.'/lib/vm/AbstractVM.php';
+                require __DIR__.'/lib/vm/VMInterface.php';
+                require __DIR__.'/lib/vm/DigitalOceanVM.php';
+                require __DIR__.'/lib/VM.php';
 
-                $config = require __DIR__ . '/config.vm.php';
+                $config = require __DIR__.'/config.vm.php';
 
                 $vm = new VM($config);
                 $vm->resizeToMinLimit();
@@ -122,4 +122,4 @@ 
 $tpl->assign('message', $message);
 $listing_tpl = 'bbb/listing.tpl';
 $content = $tpl->fetch($listing_tpl);
-$tpl->assign('content', $content);$tpl->display_one_col_template();
+$tpl->assign('content', $content); $tpl->display_one_col_template();

plugin/bbb/start.php

Spacing +8 added lines, -8 removed lines

@@ -5,7 +5,7 @@ 
  * @package chamilo.plugin.bigbluebutton
  */
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__.'/../../vendor/autoload.php';
 
 $course_plugin = 'bbb'; //needed in order to load the plugin lang variables
 require_once dirname(__FILE__).'/config.php';
@@ -25,16 +25,16 @@ 
 
         if (isset($_GET['launch']) && $_GET['launch'] == 1) {
 
-            if (file_exists(__DIR__ . '/config.vm.php')) {
-                $config = require __DIR__ . '/config.vm.php';
+            if (file_exists(__DIR__.'/config.vm.php')) {
+                $config = require __DIR__.'/config.vm.php';
                 $vmIsEnabled = true;
                 $host = null;
                 $salt = null;
 
-                require __DIR__ . '/lib/vm/AbstractVM.php';
-                require __DIR__ . '/lib/vm/VMInterface.php';
-                require __DIR__ . '/lib/vm/DigitalOceanVM.php';
-                require __DIR__ . '/lib/VM.php';
+                require __DIR__.'/lib/vm/AbstractVM.php';
+                require __DIR__.'/lib/vm/VMInterface.php';
+                require __DIR__.'/lib/vm/DigitalOceanVM.php';
+                require __DIR__.'/lib/VM.php';
 
                 $vm = new VM($config);
 
@@ -70,7 +70,7 @@ 
             }
         } else {
             $url = 'listing.php?'.api_get_cidreq();
-            header('Location: ' . $url);
+            header('Location: '.$url);
             exit;
         }
     } else {

plugin/bbb/lang/english.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 $strings['VideoConferenceAddedToTheCalendar']   = "Videoconference added to the calendar";
 $strings['VideoConferenceAddedToTheLinkTool']   = "Videoconference added to the link tool";
 
-$strings['GoToTheVideoConference']   = "Go to the videoconference";
+$strings['GoToTheVideoConference'] = "Go to the videoconference";
 
 $strings['Records']             = "Recording";
 $strings['Meeting']             = "Meeting";
@@ -31,7 +31,7 @@ 
 $strings['EnterConference']     = "Enter the videoconference";
 $strings['RecordList']          = "Recording list";
 $strings['ServerIsNotRunning']  = "Videoconference server is not running";
-$strings['ServerIsNotConfigured']  = "Videoconference server is not configured";
+$strings['ServerIsNotConfigured'] = "Videoconference server is not configured";
 
 $strings['XUsersOnLine']        = "%s user(s) online";
 

plugin/bbb/lang/french.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 $strings['VideoConferenceAddedToTheCalendar']   = "Vidéoconférence ajoutée au calendrier";
 $strings['VideoConferenceAddedToTheLinkTool']   = "Vidéoconférence ajoutée comme lien. Vous pouvez éditer et publier le lien sur la page principale du cours depuis l'outil liens.";
 
-$strings['GoToTheVideoConference']   = "Entrer dans la salle de conférence";
+$strings['GoToTheVideoConference'] = "Entrer dans la salle de conférence";
 
 $strings['Records']             = "Enregistrement";
 $strings['Meeting']             = "Salle de conférence";
@@ -24,7 +24,7 @@ 
 $strings['EnterConference']     = "Entrer dans la salle de conférence";
 $strings['RecordList']          = "Liste des enregistrements";
 $strings['ServerIsNotRunning']  = "Le serveur de vidéoconférence ne fonctionne pas";
-$strings['ServerIsNotConfigured']  = "Le serveur de vidéoconférence n'est pas configuré correctement";
+$strings['ServerIsNotConfigured'] = "Le serveur de vidéoconférence n'est pas configuré correctement";
 
 $strings['XUsersOnLine']        = "%s utilisateurs dans la salle";
 

plugin/bbb/lang/spanish.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 $strings['VideoConferenceAddedToTheCalendar']   = "Videoconferencia añadida al calendario";
 $strings['VideoConferenceAddedToTheLinkTool']   = "Videoconferencia añadida como enlace. Puede editar y publicar el enlace en la página principal del curso desde la herramienta de enlace.";
 
-$strings['GoToTheVideoConference']   = "Ir a la videoconferencia";
+$strings['GoToTheVideoConference'] = "Ir a la videoconferencia";
 
 $strings['Records']             = "Grabación";
 $strings['Meeting']             = "Sala de conferencia";
@@ -24,7 +24,7 @@ 
 $strings['EnterConference']     = "Entrar a la videoconferencia";
 $strings['RecordList']          = "Lista de grabaciones";
 $strings['ServerIsNotRunning']  = "El servidor de videoconferencia no está funcionando";
-$strings['ServerIsNotConfigured']  = "El servidor de videoconferencia no está configurado correctamente";
+$strings['ServerIsNotConfigured'] = "El servidor de videoconferencia no está configurado correctamente";
 
 $strings['XUsersOnLine']        = "%s usuario(s) en la sala";
 

plugin/bbb/cron.php

Spacing +9 added lines, -9 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
-require __DIR__ . '/../../vendor/autoload.php';
-if (file_exists(__DIR__ . '/config.vm.php')) {
+require __DIR__.'/../../vendor/autoload.php';
+if (file_exists(__DIR__.'/config.vm.php')) {
 
-    require_once dirname(__FILE__) . '/config.php';
+    require_once dirname(__FILE__).'/config.php';
 
-    require __DIR__ . '/lib/vm/AbstractVM.php';
-    require __DIR__ . '/lib/vm/VMInterface.php';
-    require __DIR__ . '/lib/vm/DigitalOceanVM.php';
-    require __DIR__ . '/lib/VM.php';
+    require __DIR__.'/lib/vm/AbstractVM.php';
+    require __DIR__.'/lib/vm/VMInterface.php';
+    require __DIR__.'/lib/vm/DigitalOceanVM.php';
+    require __DIR__.'/lib/VM.php';
 
-    $config = require __DIR__ . '/config.vm.php';
+    $config = require __DIR__.'/config.vm.php';
 
     $vm = new VM($config);
 
@@ -21,7 +21,7 @@ 
             if (empty($activeSessions)) {
                 $vm->runCron();
             } else {
-                echo "Can't run cron active sessions found: " . $activeSessions;
+                echo "Can't run cron active sessions found: ".$activeSessions;
             }
         }
     }

plugin/bbb/lib/bbb_api.php

Spacing +21 added lines, -21 removed lines

@@ -55,25 +55,25 @@ 
 	*/
 		// BASE CONFIGS - set these for your BBB server in config.php and they will
 		// simply flow in here via the constants:
-		$this->_securitySalt 		= CONFIG_SECURITY_SALT;
-		$this->_bbbServerBaseUrl 	= CONFIG_SERVER_BASE_URL;
+		$this->_securitySalt = CONFIG_SECURITY_SALT;
+		$this->_bbbServerBaseUrl = CONFIG_SERVER_BASE_URL;
 	}
 
-	private function _processXmlResponse($url){
+	private function _processXmlResponse($url) {
 	/*
 	A private utility method used by other public methods to process XML responses.
 	*/
 		if (extension_loaded('curl')) {
-			$ch = curl_init() or die ( curl_error($ch) );
+			$ch = curl_init() or die (curl_error($ch));
 			$timeout = 10;
-			curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt( $ch, CURLOPT_URL, $url );
-			curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
-			curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, $timeout);
-			$data = curl_exec( $ch );
-			curl_close( $ch );
-
-			if($data)
+			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+			curl_setopt($ch, CURLOPT_URL, $url);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+			$data = curl_exec($ch);
+			curl_close($ch);
+
+			if ($data)
 				return (new SimpleXMLElement($data));
 			else
 				return false;
@@ -137,10 +137,10 @@ 
 		'&duration='.urlencode($creationParams['duration']);
 		//'&meta_category='.urlencode($creationParams['meta_category']);
 		$welcomeMessage = $creationParams['welcomeMsg'];
-		if(trim($welcomeMessage))
+		if (trim($welcomeMessage))
 			$params .= '&welcome='.urlencode($welcomeMessage);
 		// Return the complete URL:
-		return ( $creationUrl.$params.'&checksum='.sha1("create".$params.$this->_securitySalt) );
+		return ($creationUrl.$params.'&checksum='.sha1("create".$params.$this->_securitySalt));
 	}
 
 	public function createMeetingWithXmlResponseArray($creationParams) {
@@ -165,7 +165,7 @@ 
 		$xml = $this->_processXmlResponse($this->getCreateMeetingURL($creationParams));
 
         if ($xml) {
-			if($xml->meetingID)
+			if ($xml->meetingID)
 				return array(
 					'returncode' => $xml->returncode,
 					'message' => $xml->message,
@@ -283,7 +283,7 @@ 
 		$meetingId = '1234'		-- REQUIRED - The unique id for the meeting
 		*/
 		$xml = $this->_processXmlResponse($this->getIsMeetingRunningUrl($meetingId));
-		if($xml) {
+		if ($xml) {
 			return array(
 				'returncode' => $xml->returncode,
 				'running' => $xml->running 	// -- Returns true/false.
@@ -310,7 +310,7 @@ 
 		and then handle the results that we get in the XML response.
 		*/
 		$xml = $this->_processXmlResponse($this->getGetMeetingsUrl());
-		if($xml) {
+		if ($xml) {
 			// If we don't get a success code, stop processing and return just the returncode:
 			if ($xml->returncode != 'SUCCESS') {
 				$result = array(
@@ -379,7 +379,7 @@ 
 		);
 		*/
 		$xml = $this->_processXmlResponse($this->getMeetingInfoUrl($infoParams));
-		if($xml) {
+		if ($xml) {
 			// If we don't get a success code or messageKey, find out why:
 			if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
 				$result = array(
@@ -454,7 +454,7 @@ 
 		probably be required in user code when 'recording' is set to true.
 		*/
 		$xml = $this->_processXmlResponse($this->getRecordingsUrl($recordingParams));
-		if($xml) {
+		if ($xml) {
 			// If we don't get a success code or messageKey, find out why:
 			if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
 				$result = array(
@@ -524,7 +524,7 @@ 
 		);
 		*/
 		$xml = $this->_processXmlResponse($this->getPublishRecordingsUrl($recordingParams));
-		if($xml) {
+		if ($xml) {
 			return array(
 				'returncode' => $xml->returncode,
 				'published' => $xml->published 	// -- Returns true/false.
@@ -557,7 +557,7 @@ 
 		*/
 
 		$xml = $this->_processXmlResponse($this->getDeleteRecordingsUrl($recordingParams));
-		if($xml) {
+		if ($xml) {
 			return array(
 				'returncode' => $xml->returncode,
 				'deleted' => $xml->deleted 	// -- Returns true/false.

plugin/bbb/lib/bbb.lib.php

Spacing +32 added lines, -32 removed lines

@@ -122,20 +122,20 @@ 
         $params['session_id'] = api_get_session_id();
 
         $params['attendee_pw'] = isset($params['moderator_pw']) ? $params['moderator_pw'] : api_get_course_id();
-        $attendeePassword =  $params['attendee_pw'];
+        $attendeePassword = $params['attendee_pw'];
         $params['moderator_pw'] = isset($params['moderator_pw']) ? $params['moderator_pw'] : $this->getModMeetingPassword();
         $moderatorPassword = $params['moderator_pw'];
 
         $params['record'] = api_get_course_setting('big_blue_button_record_and_store', $courseCode) == 1 ? true : false;
         $max = api_get_course_setting('big_blue_button_max_students_allowed', $courseCode);
-        $max =  isset($max) ? $max : -1;
+        $max = isset($max) ? $max : -1;
         $params['status'] = 1;
         // Generate a pseudo-global-unique-id to avoid clash of conferences on
         // the same BBB server with several Chamilo portals
         $params['remote_id'] = uniqid(true, true);
         // Each simultaneous conference room needs to have a different
         // voice_bridge composed of a 5 digits number, so generating a random one
-        $params['voice_bridge'] = rand(10000,99999);
+        $params['voice_bridge'] = rand(10000, 99999);
 
         if ($this->debug) {
             error_log("enter create_meeting ".print_r($params, 1));
@@ -158,23 +158,23 @@ 
             $duration = 300;
 
             $bbbParams = array(
-                'meetingId' => $params['remote_id'], 					// REQUIRED
-                'meetingName' => $meetingName, 	// REQUIRED
-                'attendeePw' => $attendeePassword, 					// Match this value in getJoinMeetingURL() to join as attendee.
-                'moderatorPw' => $moderatorPassword, 					// Match this value in getJoinMeetingURL() to join as moderator.
-                'welcomeMsg' => $welcomeMessage, 					// ''= use default. Change to customize.
-                'dialNumber' => '', 					// The main number to call into. Optional.
-                'voiceBridge' => $params['voice_bridge'], 					// PIN to join voice. Required.
-                'webVoice' => '', 						// Alphanumeric to join voice. Optional.
+                'meetingId' => $params['remote_id'], // REQUIRED
+                'meetingName' => $meetingName, // REQUIRED
+                'attendeePw' => $attendeePassword, // Match this value in getJoinMeetingURL() to join as attendee.
+                'moderatorPw' => $moderatorPassword, // Match this value in getJoinMeetingURL() to join as moderator.
+                'welcomeMsg' => $welcomeMessage, // ''= use default. Change to customize.
+                'dialNumber' => '', // The main number to call into. Optional.
+                'voiceBridge' => $params['voice_bridge'], // PIN to join voice. Required.
+                'webVoice' => '', // Alphanumeric to join voice. Optional.
                 'logoutUrl' =>  $this->logout_url,
-                'maxParticipants' => $max, 				// Optional. -1 = unlimitted. Not supported in BBB. [number]
-                'record' => $record, 					// New. 'true' will tell BBB to record the meeting.
-                'duration' => $duration, 				// Default = 0 which means no set duration in minutes. [number]
+                'maxParticipants' => $max, // Optional. -1 = unlimitted. Not supported in BBB. [number]
+                'record' => $record, // New. 'true' will tell BBB to record the meeting.
+                'duration' => $duration, // Default = 0 which means no set duration in minutes. [number]
                 //'meta_category' => '', 				// Use to pass additional info to BBB server. See API docs.
             );
 
             if ($this->debug) {
-                error_log("create_meeting params: ".print_r($bbbParams,1));
+                error_log("create_meeting params: ".print_r($bbbParams, 1));
             }
 
             $status = false;
@@ -188,7 +188,7 @@ 
                 ) {
                     if ($this->debug) {
                         error_log(
-                            "create_meeting result: " . print_r($result, 1)
+                            "create_meeting result: ".print_r($result, 1)
                         );
                     }
                     $meeting = $this->joinMeeting($meetingName, true);
@@ -306,7 +306,7 @@ 
 
             if ($this->debug) {
                 error_log(
-                    "meeting is running: " . intval($meetingInfoExists)
+                    "meeting is running: ".intval($meetingInfoExists)
                 );
             }
 
@@ -323,11 +323,11 @@ 
 
         if ($meetingInfoExists) {
             $joinParams = array(
-                'meetingId' => $meetingData['remote_id'],	//	-- REQUIRED - A unique id for the meeting
-                'username' => $this->user_complete_name,	//-- REQUIRED - The name that will display for the user in the meeting
-                'password' => $pass,			//-- REQUIRED - The attendee or moderator password, depending on what's passed here
+                'meetingId' => $meetingData['remote_id'], //	-- REQUIRED - A unique id for the meeting
+                'username' => $this->user_complete_name, //-- REQUIRED - The name that will display for the user in the meeting
+                'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here
                 //'createTime' => api_get_utc_datetime(),			//-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
-                'userID' => api_get_user_id(),				//-- OPTIONAL - string
+                'userID' => api_get_user_id(), //-- OPTIONAL - string
                 'webVoiceConf' => ''	//	-- OPTIONAL - string
             );
             $url = $this->api->getJoinMeetingURL($joinParams);
@@ -336,7 +336,7 @@ 
             $url = $this->logout_url;
         }
         if ($this->debug) {
-            error_log("return url :" . $url);
+            error_log("return url :".$url);
         }
         return $url;
     }
@@ -397,7 +397,7 @@ 
             }
             $meetingBBB['end_url'] = api_get_self().'?'.api_get_cidreq().'&action=end&id='.$meetingDB['id'];
 
-            if ((string)$meetingBBB['returncode'] == 'FAILED') {
+            if ((string) $meetingBBB['returncode'] == 'FAILED') {
                 if ($meetingDB['status'] == 1 && $this->isTeacher()) {
                     $this->endMeeting($meetingDB['id']);
                 }
@@ -587,7 +587,7 @@ 
                     $item['action_links'] = implode('<br />', $actionLinksArray);
                 }
                 //var_dump($recordArray);
-                $item['show_links']  = implode('<br />', $recordArray);
+                $item['show_links'] = implode('<br />', $recordArray);
                 $item['action_links'] = implode('<br />', $actionLinksArray);
             }
 
@@ -600,11 +600,11 @@ 
 
             if ($meetingDB['status'] == 1) {
                 $joinParams = array(
-                    'meetingId' => $meetingDB['remote_id'],		//-- REQUIRED - A unique id for the meeting
-                    'username' => $this->user_complete_name,	//-- REQUIRED - The name that will display for the user in the meeting
-                    'password' => $pass,			//-- REQUIRED - The attendee or moderator password, depending on what's passed here
-                    'createTime' => '',			//-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
-                    'userID' => '',			//	-- OPTIONAL - string
+                    'meetingId' => $meetingDB['remote_id'], //-- REQUIRED - A unique id for the meeting
+                    'username' => $this->user_complete_name, //-- REQUIRED - The name that will display for the user in the meeting
+                    'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here
+                    'createTime' => '', //-- OPTIONAL - string. Leave blank ('') unless you set this correctly.
+                    'userID' => '', //	-- OPTIONAL - string
                     'webVoiceConf' => ''	//	-- OPTIONAL - string
                 );
                 $item['go_url'] = $this->protocol.$this->api->getJoinMeetingURL($joinParams);
@@ -659,8 +659,8 @@ 
         $pass = $this->getUserMeetingPassword();
 
         $endParams = array(
-            'meetingId' => $meetingData['remote_id'],   // REQUIRED - We have to know which meeting to end.
-            'password' => $pass,        // REQUIRED - Must match moderator pass for meeting.
+            'meetingId' => $meetingData['remote_id'], // REQUIRED - We have to know which meeting to end.
+            'password' => $pass, // REQUIRED - Must match moderator pass for meeting.
         );
         $this->api->endMeetingWithXmlResponseArray($endParams);
         Database::update($this->table, array('status' => 0, 'closed_at' => api_get_utc_datetime()), array('id = ? ' => $id));
@@ -842,7 +842,7 @@ 
      */
     public function redirectToBBB($url)
     {
-        if (file_exists(__DIR__ . '/../config.vm.php')) {
+        if (file_exists(__DIR__.'/../config.vm.php')) {
             // Using VM
             echo Display::url(get_lang('ClickToContinue'), $url);
             exit;

plugin/bbb/lib/VM.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 
         foreach ($vmList as $vm) {
             if (isset($vm['enabled']) && $vm['enabled'] == true) {
-                $className = $vm['name'] . 'VM';
+                $className = $vm['name'].'VM';
 
                 return new $className($vm);
                 break;