Browse Source
No mix of _ and -
Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/4324/head
Joas Schilling
5 years ago
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
4 changed files with
4 additions and
4 deletions
-
lib/Config.php
-
lib/Controller/SettingsController.php
-
lib/Settings/Admin/AdminSettings.php
-
src/components/AdminSettings/SIPBridge.vue
|
|
|
@ -77,7 +77,7 @@ class Config { |
|
|
|
} |
|
|
|
|
|
|
|
public function getDialInInfo(): string { |
|
|
|
return $this->config->getAppValue('spreed', 'sip_bridge_dial-in_info'); |
|
|
|
return $this->config->getAppValue('spreed', 'sip_bridge_dialin_info'); |
|
|
|
} |
|
|
|
|
|
|
|
public function getSIPSharedSecret(): string { |
|
|
|
|
|
|
|
@ -125,7 +125,7 @@ class SettingsController extends OCSController { |
|
|
|
} |
|
|
|
|
|
|
|
$this->config->setAppValue('spreed', 'sip_bridge_groups', json_encode($groups)); |
|
|
|
$this->config->setAppValue('spreed', 'sip_bridge_dial-in_info', $dialInInfo); |
|
|
|
$this->config->setAppValue('spreed', 'sip_bridge_dialin_info', $dialInInfo); |
|
|
|
$this->config->setAppValue('spreed', 'sip_bridge_shared_secret', $sharedSecret); |
|
|
|
|
|
|
|
return new DataResponse(); |
|
|
|
|
|
|
|
@ -489,7 +489,7 @@ class AdminSettings implements ISettings { |
|
|
|
|
|
|
|
$this->initialStateService->provideInitialState('talk', 'sip_bridge_groups', $groups); |
|
|
|
$this->initialStateService->provideInitialState('talk', 'sip_bridge_shared_secret', $this->talkConfig->getSIPSharedSecret()); |
|
|
|
$this->initialStateService->provideInitialState('talk', 'sip_bridge_dial-in_info', $this->talkConfig->getDialInInfo()); |
|
|
|
$this->initialStateService->provideInitialState('talk', 'sip_bridge_dialin_info', $this->talkConfig->getDialInInfo()); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
@ -113,7 +113,7 @@ export default { |
|
|
|
return a.displayname.localeCompare(b.displayname) |
|
|
|
}) |
|
|
|
this.sipGroups = this.groups |
|
|
|
this.dialInInfo = loadState('talk', 'sip_bridge_dial-in_info') |
|
|
|
this.dialInInfo = loadState('talk', 'sip_bridge_dialin_info') |
|
|
|
this.sharedSecret = loadState('talk', 'sip_bridge_shared_secret') |
|
|
|
this.searchGroup('') |
|
|
|
this.loading = false |
|
|
|
|