diff options
author | Joas Schilling <coding@schilljs.com> | 2020-09-22 15:34:00 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2020-09-22 15:34:00 +0300 |
commit | eec77f30609e4a07edc3877da8767241de5eba1b (patch) | |
tree | ebbaa76cc7ffd25b4ed3dbc1989a4ac5a5783b9a /lib/MatterbridgeManager.php | |
parent | 64c66e7ba18ded8129f462496de6add5e91284a3 (diff) |
Fix undefined variables and classes
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/MatterbridgeManager.php')
-rw-r--r-- | lib/MatterbridgeManager.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/MatterbridgeManager.php b/lib/MatterbridgeManager.php index d959a27ef..d200353db 100644 --- a/lib/MatterbridgeManager.php +++ b/lib/MatterbridgeManager.php @@ -183,9 +183,9 @@ class MatterbridgeManager { // first potentially kill the process $currentBridge = $this->getBridgeOfRoom($room); $currentBridge['enabled'] = false; - $this->checkBridgeProcess($token, $currentBridge); + $this->checkBridgeProcess($room, $currentBridge); // then actually delete the config - $bridgeJSON = $this->config->deleteAppValue('spreed', 'bridge_' . $token); + $this->config->deleteAppValue('spreed', 'bridge_' . $room->getToken()); return true; } @@ -511,7 +511,7 @@ class MatterbridgeManager { * * @param Room $room the room * @param array $bridge bridge information - * @param $relaunch whether to launch the process if it's down but bridge is enabled + * @param bool $relaunch whether to launch the process if it's down but bridge is enabled * @return int the corresponding matterbridge process ID, 0 if none */ private function checkBridgeProcess(Room $room, array $bridge, bool $relaunch = true): int { @@ -717,7 +717,7 @@ class MatterbridgeManager { if (count(preg_split('/\n/', $result)) > 2) { return true; } - } catch (Exception $e) { + } catch (\Exception $e) { } return false; } @@ -735,7 +735,7 @@ class MatterbridgeManager { $bridge['enabled'] = false; $this->saveBridgeToDb($room, $bridge); // this will kill the bridge process - $this->checkBridgeProcess($token, $currentBridge); + $this->checkBridgeProcess($room, $bridge); } }); |