DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Warn when the server and Collabora online protocols do not match.

Browse Source
This commit is contained in:
Jan Holesovsky 2016-11-01 16:32:04 +01:00
parent f0fd5b2a22
commit 9eea23864b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
controller/settingscontroller.php
View File

@ -85,8 +85,15 @@ class SettingsController extends Controller{
} }
public function setSettings($wopi_url, $edit_groups, $doc_format, $test_wopi_url, $test_server_groups){ public function setSettings($wopi_url, $edit_groups, $doc_format, $test_wopi_url, $test_server_groups){
$message = $this->l10n->t('Saved');
if (!is_null($wopi_url)){ if (!is_null($wopi_url)){
$this->appConfig->setAppValue('wopi_url', $wopi_url); $this->appConfig->setAppValue('wopi_url', $wopi_url);
$colon = strpos($wopi_url, ':', 0);
if (\OC::$server->getRequest()->getServerProtocol() !== substr($wopi_url, 0, $colon)){
$message = $this->l10n->t('Saved with error: Collabora Online should use the same protocol as the server installation.');
}
} }
if (!is_null($edit_groups)){ if (!is_null($edit_groups)){
@ -110,7 +117,7 @@ class SettingsController extends Controller{
$response = array( $response = array(
'status' => 'success', 'status' => 'success',
'data' => array('message' => (string) $this->l10n->t('Saved')) 'data' => array('message' => (string) $message)
); );
return $response; return $response;