From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Wed, 14 Oct 2020 11:41:38 +0000 (+0200)
Subject: Recommend cURL during WCFSetup
X-Git-Tag: 5.3.0_RC_2~9^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=18cc83c29e9f506f6ec0a8862438a67b758a9516;p=GitHub%2FWoltLab%2FWCF.git

Recommend cURL during WCFSetup

Resolves #3601
---

diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index 2c2affebcf..d42caacfec 100644
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -387,6 +387,9 @@ class WCFSetup extends WCF {
 		// openssl extension
 		$system['openssl']['result'] = @extension_loaded('openssl');
 		
+		// curl
+		$system['curl']['result'] = @extension_loaded('curl');
+		
 		// misconfigured reverse proxy / cookies
 		$system['hostname']['result'] = true;
 		list($system['hostname']['value']) = explode(':', $_SERVER['HTTP_HOST'], 2);
diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml
index d109a83502..a5d7af280e 100644
--- a/wcfsetup/setup/lang/setup_de.xml
+++ b/wcfsetup/setup/lang/setup_de.xml
@@ -38,6 +38,8 @@
 		<item name="wcf.global.systemRequirements.memoryLimit.description"><![CDATA[Der PHP-Skripten zur Verfügung stehende Arbeitsspeicher ist für einen einwandfreien Betrieb der Software zu gering.]]></item>
 		<item name="wcf.global.systemRequirements.openSSL"><![CDATA[„OpenSSL“ PHP-Erweiterung]]></item>
 		<item name="wcf.global.systemRequirements.openSSL.description"><![CDATA[Ihre PHP-Version wurde ohne Unterstützung für OpenSSL kompiliert und kann daher keine sicheren Verbindungen aufbauen.]]></item>
+		<item name="wcf.global.systemRequirements.curl"><![CDATA[„curl“ PHP-Erweiterung]]></item>
+		<item name="wcf.global.systemRequirements.curl.description"><![CDATA[Ihre PHP-Version wurde ohne Unterstützung für cURL kompiliert. Die Unterstützung externer Verbindungen kann eingeschränkt sein.]]></item>
 		<item name="wcf.global.systemRequirements.hostname"><![CDATA[Hostname]]></item>
 		<item name="wcf.global.systemRequirements.hostname.requirement"><![CDATA[Korrekter Hostname]]></item>
 		<item name="wcf.global.systemRequirements.hostname.description"><![CDATA[Der vom Webserver ermittelte Hostname muss dem Hostnamen in der Adressleiste des Webbrowsers entsprechen.]]></item>
diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml
index 52bef8182a..d86df05720 100644
--- a/wcfsetup/setup/lang/setup_en.xml
+++ b/wcfsetup/setup/lang/setup_en.xml
@@ -38,6 +38,8 @@
 		<item name="wcf.global.systemRequirements.memoryLimit.description"><![CDATA[The maximum available memory of PHP scripts is too low to properly run the software.]]></item>
 		<item name="wcf.global.systemRequirements.openSSL"><![CDATA['OpenSSL' PHP extension]]></item>
 		<item name="wcf.global.systemRequirements.openSSL.description"><![CDATA[Your PHP version has been compiled without OpenSSL support, it is required to establish secure connections.]]></item>
+		<item name="wcf.global.systemRequirements.curl"><![CDATA['curl' PHP extension]]></item>
+		<item name="wcf.global.systemRequirements.curl.description"><![CDATA[Your PHP version has been compiled without cURL support, outgoing connections might not be fully supported.]]></item>
 		<item name="wcf.global.systemRequirements.hostname"><![CDATA[Host Name]]></item>
 		<item name="wcf.global.systemRequirements.hostname.requirement"><![CDATA[Correct Host Name]]></item>
 		<item name="wcf.global.systemRequirements.hostname.description"><![CDATA[The host name determined by the web server must match the host name within the web browser's URL bar.]]></item>
diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
index 34952f5db8..e8379057c5 100644
--- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl
+++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
@@ -183,6 +183,28 @@
 				</dl>
 			</div>
 		</section>
+		
+		<section class="section">
+			<h2 class="sectionTitle">{lang}wcf.global.systemRequirements.curl{/lang}</h2>
+			
+			<div class="row rowColGap formGrid">
+				<dl class="col-xs-12 col-md-6">
+					<dt>{lang}wcf.global.systemRequirements.element.recommended{/lang}</dt>
+					<dd>{lang}wcf.global.systemRequirements.active{/lang}</dd>
+				</dl>
+				
+				<dl class="col-xs-12 col-md-6">
+					<dt>{lang}wcf.global.systemRequirements.element.yours{/lang}</dt>
+					<dd>
+						<span class="badge {if !$system.curl.result}red{else}green{/if}">
+						{if !$system.curl.result}{lang}wcf.global.systemRequirements.notActive{/lang}{else}
+							{lang}wcf.global.systemRequirements.active{/lang}
+						{/if}</span>
+						{if !$system.curl.result}<small>{lang}wcf.global.systemRequirements.curl.description{/lang}</small>{/if}
+					</dd>
+				</dl>
+			</div>
+		</section>
 	</section>
 
 	<div class="formSubmit">