Add bbb interface option (flash or html5) see BT#14664

- New DB changes are needed see README file
- Remove DB changes from changelog
- Update version to 2.7
- Fix overwrite of js code "var _p = {web_plugin"
-

Author: jmontoyaa

main/inc/lib/plugin.class.php

@@ -523,7 +523,7 @@ public function install_course_fields($courseId, $add_tool_link = true)
             return true;
         }
 
-        //Add an icon in the table tool list
+        // Add an icon in the table tool list
         $this->createLinkToCourseTool($plugin_name, $courseId);
     }
 
@@ -537,7 +537,7 @@ public function install_course_fields($courseId, $add_tool_link = true)
      */
     public function uninstall_course_fields($courseId)
     {
-        $courseId = intval($courseId);
+        $courseId = (int) $courseId;
 
         if (empty($courseId)) {
             return false;
@@ -581,8 +581,8 @@ public function uninstall_course_fields($courseId)
     public function install_course_fields_in_all_courses($add_tool_link = true)
     {
         // Update existing courses to add plugin settings
-        $t_courses = Database::get_main_table(TABLE_MAIN_COURSE);
-        $sql = "SELECT id FROM $t_courses ORDER BY id";
+        $table = Database::get_main_table(TABLE_MAIN_COURSE);
+        $sql = "SELECT id FROM $table ORDER BY id";
         $res = Database::query($sql);
         while ($row = Database::fetch_assoc($res)) {
             $this->install_course_fields($row['id'], $add_tool_link);
@@ -595,8 +595,8 @@ public function install_course_fields_in_all_courses($add_tool_link = true)
     public function uninstall_course_fields_in_all_courses()
     {
         // Update existing courses to add conference settings
-        $t_courses = Database::get_main_table(TABLE_MAIN_COURSE);
-        $sql = "SELECT id FROM $t_courses
+        $table = Database::get_main_table(TABLE_MAIN_COURSE);
+        $sql = "SELECT id FROM $table
                 ORDER BY id";
         $res = Database::query($sql);
         while ($row = Database::fetch_assoc($res)) {

plugin/bbb/README.md

@@ -28,23 +28,32 @@ ALTER TABLE plugin_bbb_meeting ADD access_url int NOT NULL DEFAULT 1;
 ```
 For version 2.5 you need execute these SQL queries
 ```sql
-CREATE TABLE plugin_bbb_room (
+CREATE TABLE IF NOT EXISTS plugin_bbb_room (
     id int NOT NULL AUTO_INCREMENT PRIMARY KEY,
     meeting_id int(10) unsigned NOT NULL,
     participant_id int(11) NOT NULL,
     in_at datetime NOT NULL,
-    out_at datetime NOT NULL,
-    FOREIGN KEY (meeting_id) REFERENCES plugin_bbb_meeting (id),
-    FOREIGN KEY (participant_id) REFERENCES user (id)
+    out_at datetime NOT NULL
 );
-ALTER TABLE plugin_bbb_meeting ADD video_url TEXT NULL;
-ALTER TABLE plugin_bbb_meeting ADD has_video_m4v TINYINT NOT NULL DEFAULT 0;
+ALTER TABLE plugin_bbb_meeting ADD COLUMN video_url TEXT NULL;
+ALTER TABLE plugin_bbb_meeting ADD COLUMN has_video_m4v TINYINT NOT NULL DEFAULT 0;
 ALTER TABLE plugin_bbb_meeting ADD COLUMN user_id INT DEFAULT 0;
 ALTER TABLE plugin_bbb_meeting ADD COLUMN access_url INT DEFAULT 0;
+ALTER TABLE plugin_bbb_meeting ADD COLUMN remote_id char(30);
+ALTER TABLE plugin_bbb_meeting ADD COLUMN visibility TINYINT NOT NULL DEFAULT 1;
+ALTER TABLE plugin_bbb_meeting ADD COLUMN session_id INT DEFAULT 0;
 ```
 For version 2.6 (adding limits) you need execute these SQL queries
 ```sql
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url, access_url_changeable, access_url_locked) VALUES ('bbb_max_users_limit', 'bbb', 'setting', 'Plugins', '3', 'bbb', null, null, null, 1, 1, 0);
 INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, default_value, field_order, visible_to_self, visible_to_others, changeable, filter, created_at) VALUES (2, 15, 'plugin_bbb_course_users_limit', 'MaxUsersInConferenceRoom', '0', 1, 1, 0, 1, null, '2017-05-28 01:19:32');
 INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, default_value, field_order, visible_to_self, visible_to_others, changeable, filter, created_at) VALUES (3, 15, 'plugin_bbb_session_users_limit', 'MaxUsersInConferenceRoom', null, 1, 1, 0, 1, null, '2017-05-28 01:19:32');
 ```
+
+For version 2.7
+```sql
+ALTER TABLE plugin_bbb_meeting ADD COLUMN interface INT NOT NULL DEFAULT 0;
+ALTER TABLE plugin_bbb_room ADD COLUMN interface INT NOT NULL DEFAULT 0;
+ALTER TABLE plugin_bbb_room MODIFY COLUMN in_at datetime;
+ALTER TABLE plugin_bbb_room MODIFY COLUMN out_at datetime;
+```

plugin/bbb/admin.php

@@ -1,10 +1,13 @@
 <?php
+/* For license terms, see /license.txt */
+
+use Chamilo\UserBundle\Entity\User;
+
 /**
  * This script initiates a video conference session, calling the BigBlueButton API.
  *
  * @package chamilo.plugin.bigbluebutton
  */
-use Chamilo\UserBundle\Entity\User;
 
 $course_plugin = 'bbb'; //needed in order to load the plugin lang variables
 $cidReset = true;
@@ -43,13 +46,12 @@
 $meetings = $bbb->getMeetings(0, 0, 0, true, $dateRange);
 
 foreach ($meetings as &$meeting) {
-    $participants = $bbb->findMeetingParticipants($meeting['id']);
+    $participants = $bbb->findConnectedMeetingParticipants($meeting['id']);
 
     foreach ($participants as $meetingParticipant) {
         /** @var User $participant */
         $participant = $meetingParticipant['participant'];
-        $meeting['participants'][] = $participant->getCompleteName()
-            .' ('.$participant->getEmail().')';
+        $meeting['participants'][] = $participant->getCompleteName().' ('.$participant->getEmail().')';
     }
 }
 

plugin/bbb/changelog.md

@@ -1,46 +1,41 @@
+Version 2.7 - 2018-07
+---------------------
+* Add interface option (HTML5 or Flash)
+
 Version 2.6 - 2017-05
 ---------------------
 * Add max users limit
-  * Requires the following database changes
-    * INSERT INTO chamilo111x.settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url, access_url_changeable, access_url_locked) VALUES ('bbb_max_users_limit', 'bbb', 'setting', 'Plugins', '3', 'bbb', null, null, null, 1, 1, 0);
-    * INSERT INTO chamilo111x.extra_field (extra_field_type, field_type, variable, display_text, default_value, field_order, visible_to_self, visible_to_others, changeable, filter, created_at) VALUES (2, 15, 'plugin_bbb_course_users_limit', 'MaxUsersInConferenceRoom', '0', 1, 1, 0, 1, null, '2017-05-28 01:19:32');
-    * INSERT INTO chamilo111x.extra_field (extra_field_type, field_type, variable, display_text, default_value, field_order, visible_to_self, visible_to_others, changeable, filter, created_at) VALUES (3, 15, 'plugin_bbb_session_users_limit', 'MaxUsersInConferenceRoom', null, 1, 1, 0, 1, null, '2017-05-28 01:19:32');
-
+  
 Version 2.5 - 2016-07
 ---------------------
 * User global conference support
-   * Requires a database change: "ALTER TABLE plugin_bbb_meeting ADD COLUMN user_id INT DEFAULT 0"
-   * Requires a database change: "ALTER TABLE plugin_bbb_meeting ADD COLUMN access_url INT DEFAULT 0"
 
 Version 2.4 - 2016-05
 ------------------------
-Changes:
 
 * Global conference support (Requires to update the plugin settings).
 * Course group conference support
-   * Requires a database change: "ALTER TABLE plugin_bbb_meeting ADD COLUMN group_id INT DEFAULT 0"
-   * Requires to update the plugin settings.
 
 Version 2.3 - 2015-05-18
 ------------------------
 Changes:
-* Added support for variable voiceBridge to be sent on meeting creation. See https://code.google.com/p/bigbluebutton/issues/detail?can=2&start=0&num=100&q=&colspec=ID%20Type%20Status%20Priority%20Milestone%20Owner%20Component%20Summary&groupby=&sort=&id=1186 and https://support.chamilo.org/issues/7669 for details.
-* Requires a database change: "ALTER TABLE plugin_bbb_meeting ADD COLUMN voice_bridge INT NOT NULL DEFAULT 1;"
+* Added support for variable voiceBridge to be sent on meeting creation. See: 
+https://code.google.com/p/bigbluebutton/issues/detail?can=2&start=0&num=100&q=&colspec=ID%20Type%20Status%20Priority%20Milestone%20Owner%20Component%20Summary&groupby=&sort=&id=1186 
+and https://support.chamilo.org/issues/7669 for details.
 
 Version 2.2 - 2014-10-15
 ------------------------
 Changes:
-* Add a pseudo-random guid to avoid clashing conferences when several Chamilo portals use the same server. If you were using this plugin before, you will have to update the plugin_bbb_meeting table to "alter table plugin_bbb_meeting add column remote_id char(36);".
-* Add possibility to hide recordings of previous conferences from the list. If you were using this plugin before, you will have to update the plugin_bbb_meeting table to "alter table plugin_bbb_meeting add column visibility tinytint not null default 1;".
+* Add a pseudo-random guid to avoid clashing conferences when several Chamilo portals use the same server. 
+* Add possibility to hide recordings of previous conferences from the list. 
 * Show action icons in the action column
 * Hide the ID of the meeting (this was an internal ID, useless to the final user). It is still in the HTML source, however
 * Show number of minutes of the recording (in the recordings list)
 
 Version 2.1
 -----------
 Released with: Chamilo LMS 1.9.8
-Changes:
-* now supports sessions (requires you to "alter table plugin_bbb_meeting add column session_id int default 0;")
+* Session support
 
 Version 2.0
 -----------

plugin/bbb/lang/english.php

@@ -66,4 +66,9 @@
 $strings['MaxXUsersReachedManager'] = 'The limit of %s simultaneous users has been reached for this conference room. To increase this limit, please contact the platform administrator.';
 $strings['MaxUsersInConferenceRoom'] = 'Max simultaneous users in a conference room';
 $strings['global_conference_allow_roles'] = "Global conference link only visible for this user roles";
-$strings['CreatedAt'] = "Created at";
+$strings['CreatedAt'] = 'Created at';
+$strings['interface'] = 'Interface';
+$strings['launch_type'] = 'Launch type';
+
+$strings['EnterConferenceFlash'] = 'Enter the videoconference (Flash client)';
+$strings['EnterConferenceHTML5'] = 'Enter the videoconference (HTML5 client)';