Skip to content

Commit

Permalink
Fix bbb link see BT#12620
Browse files Browse the repository at this point in the history
  • Loading branch information
jmontoyaa committed Aug 31, 2017
1 parent 100a1df commit 5975be3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
3 changes: 2 additions & 1 deletion main/inc/lib/userportal.lib.php
Expand Up @@ -968,7 +968,8 @@ public function return_profile_block()
}

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(
Expand Down
7 changes: 3 additions & 4 deletions plugin/bbb/lib/bbb.lib.php
Expand Up @@ -60,15 +60,14 @@ public function __construct(

// 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');
$bbb_salt = !empty($salt) ? $salt : $this->plugin->get('salt');

$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);
Expand All @@ -77,15 +76,15 @@ public function __construct(
$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;
}

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');
Expand Down

0 comments on commit 5975be3

Please sign in to comment.