From 4f20ff5369f5e1cec59597b35147b6c65a98941c Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 5 Feb 2018 14:22:42 +0100
Subject: [PATCH] Added warning when using ReCAPTCHA w/o a key

---
 wcfsetup/install/files/acp/templates/index.tpl          | 4 ++++
 wcfsetup/install/files/lib/acp/page/IndexPage.class.php | 6 ++++++
 wcfsetup/install/lang/de.xml                            | 1 +
 wcfsetup/install/lang/en.xml                            | 1 +
 4 files changed, 12 insertions(+)

diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl
index f60bbe28f5..baef77b165 100644
--- a/wcfsetup/install/files/acp/templates/index.tpl
+++ b/wcfsetup/install/files/acp/templates/index.tpl
@@ -20,6 +20,10 @@
 	<p class="error">{lang}wcf.acp.index.tmpBroken{/lang}</p>
 {/if}
 
+{if $recaptchaWithoutKey}
+	<p class="error">{lang}wcf.acp.index.recaptchaWithoutKey{/lang}</p>
+{/if}
+
 {if $usersAwaitingApproval}
 	<p class="info">{lang}wcf.acp.user.usersAwaitingApprovalInfo{/lang}</p>
 {/if}
diff --git a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
index e34de6bea3..59b827a847 100755
--- a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
@@ -61,8 +61,14 @@ class IndexPage extends AbstractPage {
 			$usersAwaitingApproval = $row['count'];
 		}
 		
+		$recaptchaWithoutKey = false;
+		if (CAPTCHA_TYPE == 'com.woltlab.wcf.recaptcha' && (!RECAPTCHA_PUBLICKEY || !RECAPTCHA_PRIVATEKEY)) {
+			$recaptchaWithoutKey = true;
+		}
+		
 		WCF::getTPL()->assign(array(
 			'inRescueMode' => RequestHandler::getInstance()->inRescueMode(),
+			'recaptchaWithoutKey' => $recaptchaWithoutKey,
 			'server' => $this->server,
 			'usersAwaitingApproval' => $usersAwaitingApproval
 		));
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 008a821066..57f40466d5 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -470,6 +470,7 @@
 		<item name="wcf.acp.index.woltlab.forums"><![CDATA[Supportforum]]></item>
 		<item name="wcf.acp.index.woltlab.tickets"><![CDATA[Ticket-Support]]></item>
 		<item name="wcf.acp.index.woltlab.pluginStore"><![CDATA[Plugin-Store]]></item>
+		<item name="wcf.acp.index.recaptchaWithoutKey"><![CDATA[Die Nutzung von ReCAPTCHA ohne einen individuelle Website-Schlüssel wird von Google nicht mehr unterstützt.]]></item>
 	</category>
 	
 	<category name="wcf.acp.label">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index e8efef4529..4e178ec2c8 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -467,6 +467,7 @@
 		<item name="wcf.acp.index.woltlab.forums"><![CDATA[Support Forums]]></item>
 		<item name="wcf.acp.index.woltlab.tickets"><![CDATA[Ticket Support]]></item>
 		<item name="wcf.acp.index.woltlab.pluginStore"><![CDATA[Plugin Store]]></item>
+		<item name="wcf.acp.index.recaptchaWithoutKey"><![CDATA[Using ReCAPTCHA without an individual website key is no longer supported by Google.]]></item>
 	</category>
 	
 	<category name="wcf.acp.label">
-- 
2.20.1