Added warning when using ReCAPTCHA w/o a key

diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl
index f60bbe28f5ad5145c632cf0d8b32c4870dcfacca..baef77b165733cce63444543bc079d2195c2dd0e 100644 (file)
--- 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 e34de6bea37c9c6f69e39a3c8c3104bee18e0087..59b827a847df5ca458bcfa35bc576c4d7be8fff3 100755 (executable)
--- 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 008a8210667a820189fb6702708639460475eaf3..57f40466d574c43f951de642d6f7a469f5c885d8 100644 (file)
--- 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 e8efef45298159049a5246fe9c700702962c00a7..4e178ec2c896908d3e7f5fdf48253f6b005506a9 100644 (file)
--- 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">