From 4fddc0d1f13cfb71b3d19a8435895e6cd329b377 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 22 Jun 2024 15:39:09 +0200
Subject: [PATCH] Promote HTTPS from being a recommendation to an requirement

---
 .../install/files/lib/system/WCFSetup.class.php    |  2 +-
 .../setup/template/stepShowSystemRequirements.tpl  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index 8c1b0b1795..73c23af7ba 100644
--- 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 b148fc9bc4..951922c374 100644
--- 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}">
-- 
2.20.1