Promote HTTPS from being a recommendation to an requirement

diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index 8c1b0b17954b5302373b6d6ad475f62d45c9f43d..73c23af7ba7426a0441947c0f0c3baedfbecd682 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -421,7 +421,7 @@ final class WCFSetup extends WCF
 
         $system['cookie']['result'] = !empty($_COOKIE['wcfsetup_cookietest']) && $_COOKIE['wcfsetup_cookietest'] == TMP_FILE_PREFIX;
 
-        $system['tls']['result'] = RouteHandler::secureConnection() || $system['hostname']['value'] == 'localhost';
+        $system['tls']['result'] = RouteHandler::secureContext();
 
         foreach ($system as $result) {
             if (!$result['result']) {

diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
index b148fc9bc4d15b40de3b9be895d8f88637e916f3..951922c3741fb21ea7ca39f98b0eea3e2a4959eb 100644 (file)
--- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl
+++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
@@ -171,17 +171,13 @@
                                </dl>
                        </div>
                </section>
-       </section>
-       
-       <section class="section">
-               <h2 class="sectionTitle">{lang}wcf.global.systemRequirements.recommended{/lang}</h2>
-               
+
                <section class="section">
                        <h2 class="sectionTitle">{lang}wcf.global.systemRequirements.tls{/lang}</h2>
                        
                        <div class="row rowColGap formGrid">
                                <dl class="col-xs-12 col-md-6">
-                                       <dt>{lang}wcf.global.systemRequirements.element.recommended{/lang}</dt>
+                                       <dt>{lang}wcf.global.systemRequirements.element.required{/lang}</dt>
                                        <dd>{lang}wcf.global.systemRequirements.active{/lang}</dd>
                                </dl>
                                
@@ -197,6 +193,10 @@
                                </dl>
                        </div>
                </section>
+       </section>
+       
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.global.systemRequirements.recommended{/lang}</h2>
                
                <section class="section">
                        <h2 class="sectionTitle">{lang}wcf.global.systemRequirements.uploadMaxFilesize{/lang}</h2>
@@ -263,7 +263,7 @@
        </section>
 
        <div class="formSubmit">
-               <input type="submit" value="{lang}wcf.global.button.next{/lang}"{if !$system.phpVersion.result || !$system.x64.result || !$system.sql.result || !$system.memoryLimit.result || !$system.graphicsLibrary.result || !$system.hostname.result || !$system.cookie.result} disabled{/if} accesskey="s">
+               <input type="submit" value="{lang}wcf.global.button.next{/lang}"{if !$system.phpVersion.result || !$system.x64.result || !$system.sql.result || !$system.memoryLimit.result || !$system.graphicsLibrary.result || !$system.hostname.result || !$system.cookie.result || !$system.tls.result} disabled{/if} accesskey="s">
                <input type="hidden" name="step" value="{$nextStep}">
                <input type="hidden" name="tmpFilePrefix" value="{$tmpFilePrefix}">
                <input type="hidden" name="languageCode" value="{$languageCode}">