From 2a83aa92ca784f396a9921ff24605cd7cc4461a1 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Thu, 14 Aug 2014 21:51:19 +0200
Subject: [PATCH] Update Recaptcha-related JavaScript

---
 .../templates/__commentJavaScript.tpl         |  3 ---
 com.woltlab.wcf/templates/recaptcha.tpl       | 26 ++++++++++---------
 .../install/files/acp/templates/recaptcha.tpl | 26 ++++++++++---------
 .../install/files/lib/system/WCF.class.php    |  7 -----
 .../recaptcha/RecaptchaHandler.class.php      |  2 +-
 5 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/com.woltlab.wcf/templates/__commentJavaScript.tpl b/com.woltlab.wcf/templates/__commentJavaScript.tpl
index 2a070de5d8..9c4e728b3e 100644
--- a/com.woltlab.wcf/templates/__commentJavaScript.tpl
+++ b/com.woltlab.wcf/templates/__commentJavaScript.tpl
@@ -1,6 +1,3 @@
-{if !$__wcf->user->userID}
-	<script data-relocate="true" src="http{if $__wcf->secureConnection()}s{/if}://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
-{/if}
 <script data-relocate="true">
 	//<![CDATA[
 	$(function() {
diff --git a/com.woltlab.wcf/templates/recaptcha.tpl b/com.woltlab.wcf/templates/recaptcha.tpl
index c538a1157f..e215b27fe1 100644
--- a/com.woltlab.wcf/templates/recaptcha.tpl
+++ b/com.woltlab.wcf/templates/recaptcha.tpl
@@ -51,10 +51,10 @@
 			</dd>
 			
 			{if !$ajaxCaptcha|isset || !$ajaxCaptcha}
-				<script data-relocate="true" src="http{if $recaptchaUseSSL}s{/if}://www.google.com/recaptcha/api/challenge?k={$recaptchaPublicKey}"></script>
+				<script data-relocate="true" src="//www.google.com/recaptcha/api/challenge?k={$recaptchaPublicKey}"></script>
 				<noscript>
 					<dd>
-						<iframe src="http{if $recaptchaUseSSL}s{/if}://www.google.com/recaptcha/api/noscript?k={$recaptchaPublicKey}" height="300" width="500" seamless="seamless"></iframe><br />
+						<iframe src="//www.google.com/recaptcha/api/noscript?k={$recaptchaPublicKey}" height="300" width="500" seamless="seamless"></iframe><br />
 						<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
 						<input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
 					</dd>
@@ -76,16 +76,18 @@
 			{else}
 				<script data-relocate="true">
 					//<![CDATA[
-					Recaptcha.create("{$recaptchaPublicKey}", "recaptcha_image", {
-						lang: '{@$recaptchaLanguageCode}',
-						theme : 'custom'
-					});
-					
-					WCF.System.Captcha.addCallback('{$captchaID}', function() {
-						return {
-							recaptcha_challenge_field: Recaptcha.get_challenge(),
-							recaptcha_response_field: Recaptcha.get_response()
-						};
+					$.getScript('//www.google.com/recaptcha/api/js/recaptcha_ajax.js', function() {
+						Recaptcha.create("{$recaptchaPublicKey}", "recaptcha_image", {
+							lang: '{@$recaptchaLanguageCode}',
+							theme : 'custom'
+						});
+						
+						WCF.System.Captcha.addCallback('{$captchaID}', function() {
+							return {
+								recaptcha_challenge_field: Recaptcha.get_challenge(),
+								recaptcha_response_field: Recaptcha.get_response()
+							};
+						});
 					});
 					//]]>
 				</script>
diff --git a/wcfsetup/install/files/acp/templates/recaptcha.tpl b/wcfsetup/install/files/acp/templates/recaptcha.tpl
index c538a1157f..e215b27fe1 100644
--- a/wcfsetup/install/files/acp/templates/recaptcha.tpl
+++ b/wcfsetup/install/files/acp/templates/recaptcha.tpl
@@ -51,10 +51,10 @@
 			</dd>
 			
 			{if !$ajaxCaptcha|isset || !$ajaxCaptcha}
-				<script data-relocate="true" src="http{if $recaptchaUseSSL}s{/if}://www.google.com/recaptcha/api/challenge?k={$recaptchaPublicKey}"></script>
+				<script data-relocate="true" src="//www.google.com/recaptcha/api/challenge?k={$recaptchaPublicKey}"></script>
 				<noscript>
 					<dd>
-						<iframe src="http{if $recaptchaUseSSL}s{/if}://www.google.com/recaptcha/api/noscript?k={$recaptchaPublicKey}" height="300" width="500" seamless="seamless"></iframe><br />
+						<iframe src="//www.google.com/recaptcha/api/noscript?k={$recaptchaPublicKey}" height="300" width="500" seamless="seamless"></iframe><br />
 						<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
 						<input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
 					</dd>
@@ -76,16 +76,18 @@
 			{else}
 				<script data-relocate="true">
 					//<![CDATA[
-					Recaptcha.create("{$recaptchaPublicKey}", "recaptcha_image", {
-						lang: '{@$recaptchaLanguageCode}',
-						theme : 'custom'
-					});
-					
-					WCF.System.Captcha.addCallback('{$captchaID}', function() {
-						return {
-							recaptcha_challenge_field: Recaptcha.get_challenge(),
-							recaptcha_response_field: Recaptcha.get_response()
-						};
+					$.getScript('//www.google.com/recaptcha/api/js/recaptcha_ajax.js', function() {
+						Recaptcha.create("{$recaptchaPublicKey}", "recaptcha_image", {
+							lang: '{@$recaptchaLanguageCode}',
+							theme : 'custom'
+						});
+						
+						WCF.System.Captcha.addCallback('{$captchaID}', function() {
+							return {
+								recaptcha_challenge_field: Recaptcha.get_challenge(),
+								recaptcha_response_field: Recaptcha.get_response()
+							};
+						});
 					});
 					//]]>
 				</script>
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 4cb4c81c4a..48f29b1d7a 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -813,13 +813,6 @@ class WCF {
 		return $data['updates'];
 	}
 	
-	/**
-	 * @see	\wcf\system\request\RouteHandler::secureConnection()
-	 */
-	public function secureConnection() {
-		return RouteHandler::secureConnection();
-	}
-	
 	/**
 	 * Returns a 8 character prefix for editor autosave.
 	 * 
diff --git a/wcfsetup/install/files/lib/system/recaptcha/RecaptchaHandler.class.php b/wcfsetup/install/files/lib/system/recaptcha/RecaptchaHandler.class.php
index 5439a1b781..33f5ed4e50 100644
--- a/wcfsetup/install/files/lib/system/recaptcha/RecaptchaHandler.class.php
+++ b/wcfsetup/install/files/lib/system/recaptcha/RecaptchaHandler.class.php
@@ -181,7 +181,7 @@ class RecaptchaHandler extends SingletonFactory {
 		WCF::getTPL()->assign(array(
 			'recaptchaLanguageCode' => $this->languageCode,
 			'recaptchaPublicKey' => $this->publicKey,
-			'recaptchaUseSSL' => RouteHandler::secureConnection(),
+			'recaptchaUseSSL' => RouteHandler::secureConnection(), // @deprecated since 2.1
 			'recaptchaLegacyMode' => true
 		));
 	}
-- 
2.20.1