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
path: root/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2020-11-03 21:11:59 +0300
committerJoas Schilling <coding@schilljs.com>2020-11-26 11:46:44 +0300
commit23aab9ed18b6e5c1a9e8ca84d4740a0593e90c86 (patch)
tree16ecb65eb04d812c9b6e3511f41fc4f288faa8ac /lib
parent84b75970bb33b00b5b5e7b37fabf07d316b8daeb (diff)
Show the dial-in info in the sidebar
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/Controller/RoomController.php3
-rw-r--r--lib/GuestManager.php2
-rw-r--r--lib/TInitialState.php5
3 files changed, 9 insertions, 1 deletions
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index cc07ce174..17debc2a2 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -159,6 +159,9 @@ class RoomController extends AEnvironmentAwareController {
$this->config->getAppValue('spreed', 'allowed_groups', '') . '#' .
$this->config->getAppValue('spreed', 'start_conversations', '') . '#' .
$this->config->getAppValue('spreed', 'has_reference_id', '') . '#' .
+ $this->config->getAppValue('spreed', 'sip_bridge_groups', '[]') . '#' .
+ $this->config->getAppValue('spreed', 'sip_bridge_dialin_info') . '#' .
+ $this->config->getAppValue('spreed', 'sip_bridge_shared_secret') . '#' .
$this->config->getAppValue('theming', 'cachebuster', '1')
)];
}
diff --git a/lib/GuestManager.php b/lib/GuestManager.php
index ef666d3ff..067ffac27 100644
--- a/lib/GuestManager.php
+++ b/lib/GuestManager.php
@@ -232,7 +232,7 @@ class GuestManager {
$template->addBodyListItem(
$pin,
- $this->l->t('PIN'),
+ $this->l->t('Your PIN'),
$this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/password.png'))
);
}
diff --git a/lib/TInitialState.php b/lib/TInitialState.php
index c918befe3..5b771d50f 100644
--- a/lib/TInitialState.php
+++ b/lib/TInitialState.php
@@ -67,6 +67,11 @@ trait TInitialState {
'talk', 'signaling_mode',
$this->talkConfig->getSignalingMode()
);
+
+ $this->initialStateService->provideInitialState(
+ 'talk', 'sip_dialin_info',
+ $this->talkConfig->getDialInInfo()
+ );
}
protected function publishInitialStateForUser(IUser $user, IRootFolder $rootFolder, IAppManager $appManager): void {