Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Veyssier <eneiluj@posteo.net>2020-10-05 14:04:01 +0300
committerJulien Veyssier <eneiluj@posteo.net>2020-10-05 14:04:01 +0300
commita21ab120512bc6e39ce67772d3f67e899dfbeab3 (patch)
tree72de2eb9f066fc7d117edf20038182223013b731 /lib/MatterbridgeManager.php
parente74d0200a644f55138336121f5f2eefdc8978cc2 (diff)
refs #4283 fix connection password and add channel password field
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
Diffstat (limited to 'lib/MatterbridgeManager.php')
-rw-r--r--lib/MatterbridgeManager.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/MatterbridgeManager.php b/lib/MatterbridgeManager.php
index 2ca1a3e71..97d782f81 100644
--- a/lib/MatterbridgeManager.php
+++ b/lib/MatterbridgeManager.php
@@ -437,6 +437,9 @@ class MatterbridgeManager {
}
$content .= sprintf('[%s.%s]', $type, $k) . "\n";
$content .= sprintf(' Server = "%s"', $part['server']) . "\n";
+ if ($part['password']) {
+ $content .= sprintf(' Password = "%s"', $part['password']) . "\n";
+ }
$content .= sprintf(' Nick = "%s"', $part['nick']) . "\n";
if ($part['nickservnick']) {
$content .= sprintf(' NickServNick = "%s"', $part['nickservnick']) . "\n";
@@ -483,8 +486,8 @@ class MatterbridgeManager {
$content .= sprintf(' account = "%s.%s"', $type, $k) . "\n";
if (in_array($type, ['zulip', 'discord', 'xmpp', 'irc', 'slack', 'rocketchat', 'mattermost', 'matrix', 'nctalk'])) {
$content .= sprintf(' channel = "%s"', $part['channel']) . "\n";
- if ($type === 'irc' && $part['password']) {
- $content .= sprintf(' options = { key = "%s" }', $part['password']) . "\n";
+ if ($type === 'irc' && $part['channelPassword']) {
+ $content .= sprintf(' options = { key = "%s" }', $part['channelPassword']) . "\n";
}
$content .= "\n";
} elseif ($type === 'msteams') {