diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-05-08 21:45:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-08 21:45:05 +0300 |
| commit | 729295ff45d2562674724fea0764b7a89a1d51ae (patch) | |
| tree | 45e28ce59ec7e494bcc7f3233ec59ed9273d782e | |
| parent | cedd8190f4986ca1e3bd640c95c76836f1a7d44d (diff) | |
| parent | e50bafae7f2880e53d4c01a68e791cef96bc18b8 (diff) | |
Merge pull request #189 from nextcloud/backport/188/stable16v16.0.1RC1
[stable16] Use correct method to determine if HTTPS is used
| -rw-r--r-- | lib/Controller/WizardController.php | 2 | ||||
| -rw-r--r-- | templates/personal-settings.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Controller/WizardController.php b/lib/Controller/WizardController.php index 2213bb49..130af06a 100644 --- a/lib/Controller/WizardController.php +++ b/lib/Controller/WizardController.php @@ -79,7 +79,7 @@ class WizardController extends Controller { 'android' => $this->config->getSystemValue('customclient_android', $this->theming->getAndroidClientUrl()), 'ios' => $this->config->getSystemValue('customclient_ios', $this->theming->getiOSClientUrl()), 'appStore' => $this->config->getSystemValue('appstoreenabled', true), - 'useTLS' => $this->request->getHttpProtocol() === 'https', + 'useTLS' => $this->request->getServerProtocol() === 'https', 'macOSProfile' => \OCP\Util::linkToRemote('dav') . 'provisioning/apple-provisioning.mobileconfig', ]; diff --git a/templates/personal-settings.php b/templates/personal-settings.php index 533916bc..a6b7fb25 100644 --- a/templates/personal-settings.php +++ b/templates/personal-settings.php @@ -49,7 +49,7 @@ script('firstrunwizard', ['personalsettings']); <?php $appPasswordUrl = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => 'security']); $macOSProfile = \OCP\Util::linkToRemote('dav') . 'provisioning/apple-provisioning.mobileconfig'; - $usesTLS = \OC::$server->getRequest()->getHttpProtocol() === 'https'; + $usesTLS = \OC::$server->getRequest()->getServerProtocol() === 'https'; ?> <p><?php print_unescaped($l->t('Setup sync clients using an <a href="%s">app password</a>. That way you can make sure you are able to revoke access in case you lose that device.', [$appPasswordUrl])); ?></p> </div> |