chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3739 from bigbluemeeting/1.11.x

Browse Source 
Remove all code referencing Flash interface
pull/3944/head
Julio Montoya 4 years ago committed by GitHub
parent 4ab26ce392 bd6cdcc6a4
commit 4ebf97b21e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 167 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      plugin/bbb/lang/english.php
  2. 8
      plugin/bbb/lang/french.php
  3. 9
      plugin/bbb/lang/german.php
  4. 9
      plugin/bbb/lang/spanish.php
  5. 41
      plugin/bbb/lib/bbb.lib.php
  6. 51
      plugin/bbb/lib/bbb_plugin.class.php
  7. 44
      plugin/bbb/listing.php

8
plugin/bbb/lang/english.php
Unescape View File

@ -63,14 +63,6 @@ $strings['MaxXUsersReachedManager'] = 'The limit of %s simultaneous users has be
$strings['MaxUsersInConferenceRoom'] = 'Max simultaneous users in a conference room';
$strings['global_conference_allow_roles'] = "Global conference link only visible for these user roles";
$strings['CreatedAt'] = 'Created at';
$strings['interface'] = 'Default Interface';
$strings['launch_type'] = 'Client launch choice';
$strings['EnterConferenceFlash'] = 'Enter the videoconference (Flash client)';
$strings['EnterConferenceHTML5'] = 'Enter the videoconference (HTML5 client)';
$strings['ParticipantsWillUseSameInterface'] = 'Participants will use the same interface as you';
$strings['SetByStudent'] = 'Set by student';
$strings['SetByTeacher'] = 'Set by teacher';
$strings['SetByDefault'] = 'Set to default interface';
$strings['allow_regenerate_recording'] = 'Allow regenerate recording';
$strings['bbb_force_record_generation'] = 'Force record generation at the end of the meeting';
$strings['disable_course_settings'] = 'Disable course settings';

8
plugin/bbb/lang/french.php
Unescape View File

@ -65,14 +65,6 @@ $strings['MaxUsersInConferenceRoom'] = 'Nombre max d\'utilisateurs simultanés d
$strings['global_conference_allow_roles'] = "Visibilité du lien de vidéo conférence global pour les profils suivant";
$strings['CreatedAt'] = "Créé à";
$strings['interface'] = 'Interface par défaut';
$strings['launch_type'] = 'Type d\'interface au lancement';
$strings['EnterConferenceFlash'] = 'Entrer dans la salle de conférence (Flash)';
$strings['EnterConferenceHTML5'] = 'Entrer dans la salle de conférence (HTML5)';
$strings['ParticipantsWillUseSameInterface'] = 'Les apprenants utiliseront la même interface que vous';
$strings['SetByDefault'] = 'Lancement de l\'interface par défaut';
$strings['SetByTeacher'] = 'Choisi par le professeur';
$strings['SetByStudent'] = 'Choisi par l\'apprenant';
$strings['bbb_force_record_generation'] = 'Forcer la génération de l\'enregistrement à la fin de la session';
$strings['ThereIsNoVideoConferenceActive'] = "Il n'y a aucune vidéoconférence actuellement active";
$strings['meeting_duration'] = 'Durée de la conférence (en minutes)';

9
plugin/bbb/lang/german.php
Unescape View File

@ -63,12 +63,3 @@ $strings['MaxXUsersReachedManager'] = 'The limit of %s simultaneous users has be
$strings['MaxUsersInConferenceRoom'] = 'Max simultaneous users in a conference room';
$strings['global_conference_allow_roles'] = "Globaler Konferenz-Link nur für diese Benutzerrollen sichtbar";
$strings['CreatedAt'] = "Erstellt am";
$strings['interface'] = 'Standardbenutzeroberfläche';
$strings['launch_type'] = 'Wahl der Benutzeroberfläche beim Start';
$strings['EnterConferenceFlash'] = 'Videokonferenz starten (Flash-Client)';
$strings['EnterConferenceHTML5'] = 'Videokonferenz starten (HTML5-Client)';
$strings['ParticipantsWillUseSameInterface'] = 'Die Teilnehmer verwenden dieselbe Benutzeroberfläche wie Sie';
$strings['SetByDefault'] = 'Auf die Standardbenutzeroberfläche einstellen';
$strings['SetByTeacher'] = 'Set von Lehrer';
$strings['SetByStudent'] = 'Set von Teilnehmer';

9
plugin/bbb/lang/spanish.php
Unescape View File

@ -64,15 +64,6 @@ $strings['MaxXUsersReachedManager'] = 'El límite de %s usuarios simultáneos ha
$strings['MaxUsersInConferenceRoom'] = 'Número máximo de usuarios simultáneos en una sala de conferencia';
$strings['global_conference_allow_roles'] = 'El enlace de videoconferencia global es disponible para estos perfiles';
$strings['CreatedAt'] = 'Creado el';
$strings['interface'] = 'Interfaz por defecto';
$strings['launch_type'] = 'Elección de la interfaz en el lanzamiento';
$strings['EnterConferenceFlash'] = 'Ingresar a la conferencia (con Flash)';
$strings['EnterConferenceHTML5'] = 'Ingresar a la conferencia (con HTML5)';
$strings['ParticipantsWillUseSameInterface'] = 'Los participantes usarán la misma interfaz que Ud';
$strings['SetByDefault'] = 'Lanzamiento con la interfaz por defecto';
$strings['SetByTeacher'] = 'Elegido por el profesor';
$strings['SetByStudent'] = 'Elegido por el alumno';
$strings['ThereIsNoVideoConferenceActive'] = "No hay una videoconferencia actualmente activa";
$strings['meeting_duration'] = 'Duración de la reunión (en minutos)';
$strings['big_blue_button_students_start_conference_in_groups'] = 'Permitir a los estudiantes iniciar una videoconferencia en sus grupos.';

41
plugin/bbb/lib/bbb.lib.php
Unescape View File

@ -446,6 +446,7 @@ class bbb
}
$meeting = $this->joinMeeting($meetingName, true);
return $meeting;
}
}
@ -538,6 +539,7 @@ class bbb
*/
public function joinMeeting($meetingName)
{
if ($this->debug) {
error_log("joinMeeting: $meetingName");
}
@ -635,8 +637,6 @@ class bbb
'userID' => api_get_user_id(),
//-- OPTIONAL - string
'webVoiceConf' => '',
// -- OPTIONAL - string
'interface' => $this->checkInterface($meetingData),
];
$url = $this->api->getJoinMeetingURL($joinParams);
$url = $this->protocol.$url;
@ -725,41 +725,6 @@ class bbb
return false;
}
/**
* @param $meetingInfo
*
* @return int
*/
public function checkInterface($meetingInfo)
{
$interface = BBBPlugin::LAUNCH_TYPE_DEFAULT;
$type = $this->plugin->get('launch_type');
switch ($type) {
case BBBPlugin::LAUNCH_TYPE_DEFAULT:
$interface = $this->plugin->get('interface');
break;
case BBBPlugin::LAUNCH_TYPE_SET_BY_TEACHER:
if (isset($meetingInfo['interface'])) {
$interface = $meetingInfo['interface'];
}
break;
case BBBPlugin::LAUNCH_TYPE_SET_BY_STUDENT:
if (isset($meetingInfo['id'])) {
$roomInfo = $this->getMeetingParticipantInfo($meetingInfo['id'], api_get_user_id());
if (!empty($roomInfo) && isset($roomInfo['interface'])) {
$interface = $roomInfo['interface'];
} else {
if (isset($_REQUEST['interface'])) {
$interface = isset($_REQUEST['interface']) ? (int) $_REQUEST['interface'] : 0;
}
}
}
break;
}
return $interface;
}
/**
* @param int $meetingId
@ -1160,8 +1125,6 @@ class bbb
'userID' => '',
// -- OPTIONAL - string
'webVoiceConf' => '',
// -- OPTIONAL - string
'interface' => $this->checkInterface($meetingDB),
];
$item['go_url'] = $this->protocol.$this->api->getJoinMeetingURL($joinParams);
}

51
plugin/bbb/lib/bbb_plugin.class.php
Unescape View File

@ -75,22 +75,6 @@ class BBBPlugin extends Plugin
],
'attributes' => ['multiple' => 'multiple'],
],
'interface' => [
'type' => 'select',
'options' => [
self::INTERFACE_HTML5 => 'HTML5',
self::INTERFACE_FLASH => 'Flash',
],
],
'launch_type' => [
'type' => 'select',
'options' => [
self::LAUNCH_TYPE_DEFAULT => 'SetByDefault',
self::LAUNCH_TYPE_SET_BY_TEACHER => 'SetByTeacher',
self::LAUNCH_TYPE_SET_BY_STUDENT => 'SetByStudent',
],
'translate_options' => true, // variables will be translated using the plugin->get_lang
],
'allow_regenerate_recording' => 'boolean',
// Default course settings, must be the same as $course_settings
'big_blue_button_record_and_store' => 'checkbox',
@ -299,9 +283,7 @@ class BBBPlugin extends Plugin
'bbb_plugin_host',
'bbb_plugin_salt',
'max_users_limit',
'global_conference_allow_roles',
'interface',
'launch_type',
'global_conference_allow_roles'
];
$urlId = api_get_current_access_url_id();
@ -393,37 +375,6 @@ class BBBPlugin extends Plugin
}
}
/**
* Return an array with URL
*
* @param string $conferenceUrl
*
* @return array
*/
public function getUrlInterfaceLinks($conferenceUrl)
{
$urlList[] = $this->getFlashUrl($conferenceUrl);
$urlList[] = $this->getHtmlUrl($conferenceUrl);
return $urlList;
}
/**
* @param string $conferenceUrl
*
* @return array
*/
public function getFlashUrl($conferenceUrl)
{
$data = [
'text' => $this->get_lang('EnterConferenceFlash'),
'url' => $conferenceUrl.'&interface='.self::INTERFACE_FLASH,
'icon' => 'resources/img/64/videoconference_flash.png',
];
return $data;
}
/**
* @param string $conferenceUrl
*

44
plugin/bbb/listing.php
Unescape View File

@ -447,50 +447,6 @@ $urlList[] = Display::url(
['target' => '_blank', 'class' => 'btn btn-primary btn-large']
);
$type = $plugin->get('launch_type');
$warningInterfaceMessage = '';
$showClientOptions = false;
switch ($type) {
case BBBPlugin::LAUNCH_TYPE_DEFAULT:
$urlList = [];
$urlList[] = Display::url(
$plugin->get_lang('EnterConference'),
$conferenceUrl.'&interface='.$plugin->get('interface'),
['target' => '_blank', 'class' => 'btn btn-primary btn-large']
);
break;
case BBBPlugin::LAUNCH_TYPE_SET_BY_TEACHER:
if ($conferenceManager) {
$urlList = $plugin->getUrlInterfaceLinks($conferenceUrl);
$warningInterfaceMessage = Display::return_message($plugin->get_lang('ParticipantsWillUseSameInterface'));
$showClientOptions = true;
} else {
$meetingInfo = $bbb->getMeetingByName($videoConferenceName);
switch ($meetingInfo['interface']) {
case BBBPlugin::INTERFACE_FLASH:
$url = $plugin->getFlashUrl($conferenceUrl);
break;
case BBBPlugin::INTERFACE_HTML5:
$url = $plugin->getHtmlUrl($conferenceUrl);
break;
}
}
break;
case BBBPlugin::LAUNCH_TYPE_SET_BY_STUDENT:
if ($conferenceManager) {
$urlList = $plugin->getUrlInterfaceLinks($conferenceUrl);
$showClientOptions = true;
} else {
if ($meetingExists) {
$urlList = $plugin->getUrlInterfaceLinks($conferenceUrl);
$showClientOptions = true;
}
}
break;
}
$tpl = new Template($tool_name);
$tpl->assign('allow_to_edit', $allowToEdit);

Write Preview
Loading…
Cancel
Save