Browse Source

Fix bbb link see BT#12620

jmontoyaa 7 years ago
parent
commit
5975be32bf
2 changed files with 5 additions and 5 deletions
  1. 2 1
      main/inc/lib/userportal.lib.php
  2. 3 4
      plugin/bbb/lib/bbb.lib.php

+ 2 - 1
main/inc/lib/userportal.lib.php

@@ -968,7 +968,8 @@ class IndexManager
         }
 
         if (bbb::showGlobalConferenceLink($userInfo)) {
-            $url = api_get_path(WEB_PLUGIN_PATH).'bbb/start.php?global=1';
+            $bbb = new bbb('', '', true, api_get_user_id());
+            $url = $bbb->getConferenceUrl();
             $items[] = [
                 'class' => 'video-conference',
                 'icon' => Display::return_icon(

+ 3 - 4
plugin/bbb/lib/bbb.lib.php

@@ -60,7 +60,6 @@ class bbb
 
         // Initialize video server settings from global settings
         $this->plugin = BBBPlugin::create();
-
         $bbbPluginEnabled = $this->plugin->get('tool_enable');
 
         $bbb_host = !empty($host) ? $host : $this->plugin->get('host');
@@ -68,7 +67,7 @@ class bbb
 
         $this->logoutUrl = $this->getListingUrl();
         $this->table = Database::get_main_table('plugin_bbb_meeting');
-        $this->enableGlobalConference = (bool) $this->plugin->get('enable_global_conference');
+        $this->enableGlobalConference = $this->plugin->get('enable_global_conference') === 'true' ? true : false;
         $this->isGlobalConference = (bool) $isGlobalConference;
 
         $columns = Database::listTableColumns($this->table);
@@ -77,7 +76,7 @@ class bbb
         $this->accessUrl = api_get_current_access_url_id();
 
         if ($this->userSupport && !empty($isGlobalPerUser)) {
-            $this->enableGlobalConferencePerUser = (bool) $this->plugin->get('enable_global_conference_per_user');
+            $this->enableGlobalConferencePerUser = $this->plugin->get('enable_global_conference_per_user') === 'true' ? true : false;
             $this->userId = $isGlobalPerUser;
         } else {
             $this->enableGlobalConferencePerUser = false;
@@ -85,7 +84,7 @@ class bbb
 
         if ($this->groupSupport) {
             // Plugin check
-            $this->groupSupport = (bool) $this->plugin->get('enable_conference_in_course_groups');
+            $this->groupSupport = $this->plugin->get('enable_conference_in_course_groups') === 'true' ? true : false;
             if ($this->groupSupport) {
                 // Platform check
                 $bbbSetting = api_get_setting('bbb_enable_conference_in_course_groups');