diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-11-11 20:37:50 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-11-11 20:37:50 +0100 |
| commit | 4c1244f50c78b16c670f9ef1a8e33ef4b30d0d77 (patch) | |
| tree | fd58111b3105e3f2bbc9a1efd186cbfe25a222b4 /settings/templates | |
| parent | 3ecb3f16bf51bf2b691292212e72081c6353a3d4 (diff) | |
| parent | e73ccbd4cade0622615ee133496a571ac1d6dba7 (diff) | |
| download | nextcloud-server-4c1244f50c78b16c670f9ef1a8e33ef4b30d0d77.tar.gz nextcloud-server-4c1244f50c78b16c670f9ef1a8e33ef4b30d0d77.zip | |
Merge pull request #11917 from owncloud/fix-11909
Add checkbox to enforce SSL for subdomains
Diffstat (limited to 'settings/templates')
| -rw-r--r-- | settings/templates/admin.php | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 0033845c74e..ddac77508c7 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -336,9 +336,9 @@ if ($_['suggestedOverwriteWebroot']) { <input type="checkbox" name="forcessl" id="forcessl" <?php if ($_['enforceHTTPSEnabled']) { print_unescaped('checked="checked" '); - print_unescaped('value="false"'); - } else { print_unescaped('value="true"'); + } else { + print_unescaped('value="false"'); } ?> <?php if (!$_['isConnectedViaHTTPS']) p('disabled'); ?> /> @@ -346,7 +346,23 @@ if ($_['suggestedOverwriteWebroot']) { <em><?php p($l->t( 'Forces the clients to connect to %s via an encrypted connection.', $theme->getName() - )); ?></em> + )); ?></em><br/> + <span id="forceSSLforSubdomainsSpan" <?php if(!$_['enforceHTTPSEnabled']) { print_unescaped('class="hidden"'); } ?>> + <input type="checkbox" name="forceSSLforSubdomains" id="forceSSLforSubdomains" + <?php if ($_['forceSSLforSubdomainsEnabled']) { + print_unescaped('checked="checked" '); + print_unescaped('value="true"'); + } else { + print_unescaped('value="false"'); + } + ?> + <?php if (!$_['isConnectedViaHTTPS']) { p('disabled'); } ?> /> + <label for="forceSSLforSubdomains"><?php p($l->t('Enforce HTTPS for subdomains'));?></label><br/> + <em><?php p($l->t( + 'Forces the clients to connect to %s and subdomains via an encrypted connection.', + $theme->getName() + )); ?></em> + </span> <?php if (!$_['isConnectedViaHTTPS']) { print_unescaped("<br/><em>"); p($l->t( |