Add Google Maps API key option

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 9de7014f4e6e7e52e5b90f38eb0c6b4cdbb444be..e3fbf92c0f904e2b27e66d4e9b0b24a8bd62ba05 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -687,6 +687,11 @@ cloudflare:wcf.acp.option.jquery_source.cloudflare</selectoptions>
                        <!-- /general.system.jquery -->
                        
                        <!-- general.system.googleMaps -->
+                       <option name="google_maps_api_key">
+                               <categoryname>general.system.googleMaps</categoryname>
+                               <optiontype>text</optiontype>
+                               <showorder>1</showorder>
+                       </option>
                        <option name="google_maps_zoom">
                                <categoryname>general.system.googleMaps</categoryname>
                                <optiontype>select</optiontype>

diff --git a/com.woltlab.wcf/templates/googleMapsJavaScript.tpl b/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
index c351d94863cb3e4660a199fa27f753d9062e16c8..eeeee3c85a7a2ddf420f50653c2c283216f623fa 100644 (file)
--- a/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
+++ b/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
@@ -1,5 +1,5 @@
 <script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/markerClusterer{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@LAST_UPDATE_TIME}"></script>
-<script data-relocate="true" src="//maps.google.com/maps/api/js?language={@$__wcf->language->getFixedLanguageCode()}"></script>
+<script data-relocate="true" src="//maps.google.com/maps/api/js?{if GOOGLE_MAPS_API_KEY}key={@GOOGLE_MAPS_API_KEY}&amp;{/if}language={@$__wcf->language->getFixedLanguageCode()}"></script>
 <script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/oms.min.js?v={@LAST_UPDATE_TIME}"></script>
 <script data-relocate="true">
        //<![CDATA[

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index f5a924cf20ff97007c8e2fe0e98675eb107204bf..27a184326b348f97c7b0ff64822c80222bc10be0 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1067,6 +1067,8 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
                <item name="wcf.acp.option.paid_subscription_enable_tos_confirmation"><![CDATA[Benutzer müssen vor dem Kauf Nutzungsbedingungen akzeptieren]]></item>
                <item name="wcf.acp.option.paid_subscription_tos_url"><![CDATA[URL zu Nutzungsbedingungen]]></item>
                <item name="wcf.acp.option.category.general.payment.paidSubscription"><![CDATA[Bezahlte Mitgliedschaften]]></item>
+               <item name="wcf.acp.option.google_maps_api_key"><![CDATA[Browser-API-Schlüssel]]></item>
+               <item name="wcf.acp.option.google_maps_api_key.description"><![CDATA[Google stellt <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://developers.google.com/maps/documentation/javascript/get-api-key'|rawurlencode}" class="externalURL">hier</a> eine ausführliche Anleitung bereit, wie Sie einen API-Schlüssel erstellen können.]]></item>
        </category>
        
        <category name="wcf.acp.package">

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index dbcdc4194a0d56ba6438e0f81505d1cc6fe574eb..658db4115a7a15e916591c5500296eb857d7992e 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1074,6 +1074,8 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
                <item name="wcf.acp.option.paid_subscription_enable_tos_confirmation"><![CDATA[Users are required to accept your Terms of Service before purchasing]]></item>
                <item name="wcf.acp.option.paid_subscription_tos_url"><![CDATA[Terms of Service URL]]></item>
                <item name="wcf.acp.option.category.general.payment.paidSubscription"><![CDATA[Paid Subscriptions]]></item>
+               <item name="wcf.acp.option.google_maps_api_key"><![CDATA[Browser API Key]]></item>
+               <item name="wcf.acp.option.google_maps_api_key.description"><![CDATA[Google provides a detailed description on how to get an API key <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://developers.google.com/maps/documentation/javascript/get-api-key'|rawurlencode}" class="externalURL">here</a>.]]></item>
        </category>
        
        <category name="wcf.acp.package">