[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] Bigbluebutton: misconfigured error if base URL is missing /bigbluebutton

luci pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
b0299ef9 by Camile at 2026-07-20T11:32:00+00:00
[FIX] Bigbluebutton: misconfigured error if base URL is missing /bigbluebutton
---
* [FIX] Bigbluebutton misconfigured URL if missing base url /bigbluebutton

See merge request tikiwiki/tiki!10756

- - - - -


2 changed files:

- lib/bigbluebuttonlib.php
- lib/wiki-plugins/wikiplugin_bigbluebutton.php


Changes:

=====================================
lib/bigbluebuttonlib.php
=====================================
@@ -28,8 +28,27 @@ class BigBlueButtonLib
     public function __construct()
     {
         global $prefs;
-        $this->bbb = new BigBlueButton($prefs['bigbluebutton_server_location'], $prefs['bigbluebutton_shared_secret']);
+        $this->bbb = new BigBlueButton($this->getServerBaseUrl(), $prefs['bigbluebutton_shared_secret']);
     }
+
+    /**
+     * Normalizes the configured server location so it always points at the
+     * '/bigbluebutton' path, regardless of whether the admin included it or not.
+     *
+     * @return string
+     */
+    private function getServerBaseUrl()
+    {
+        global $prefs;
+
+        $base = rtrim($prefs['bigbluebutton_server_location'], '/');
+        if (! str_contains($base, '/bigbluebutton')) {
+            $base .= '/bigbluebutton';
+        }
+
+        return $base;
+    }
+
     /**
      * @return bool|string
      */


=====================================
lib/wiki-plugins/wikiplugin_bigbluebutton.php
=====================================
@@ -178,7 +178,7 @@ function wikiplugin_bigbluebutton($data, $params)
     } catch (InvalidArgumentException $e) {
         // Input or missing parameter errors
         return WikiParser_PluginOutput::error(tr('Invalid parameter'), $e->getMessage());
-    } catch (Exception) {
-        return WikiParser_PluginOutput::internalError(tr('BigBlueButton is misconfigured or inaccessible.'));
+    } catch (Exception $e) {
+        return WikiParser_PluginOutput::internalError(tr('BigBlueButton is misconfigured or inaccessible: %0', $e->getMessage()));
     }
 }



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/b0299ef94e4237af5e1a4719481a044966b87300

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/b0299ef94e4237af5e1a4719481a044966b87300
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs