Add Google Maps API key option

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index e22db648d67f88ba4b564336e66647108dd4ee0a..f9c820168e754190bc87f497c29b0ddb384ca8bd 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -524,6 +524,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 d722380ad70f4aeab7b6b93f2afc9fc1e81f9956..987808b692f8d484807a1c7b0ab08078f61b8ee3 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={@$__wcfVersion}"></script>
-<script data-relocate="true" src="//maps.google.com/maps/api/js?sensor=false&amp;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={@$__wcfVersion}"></script>
 <script data-relocate="true">
        //<![CDATA[

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index a780fb8ed1215231c9fc2efb23e3be32e20dca0c..5e15e194217e73a88564fb0b1f9bb61f65da7f69 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -876,6 +876,8 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
                <item name="wcf.acp.option.google_maps_enable_double_click_zoom"><![CDATA[Zoom durch Doppelklick zulassen]]></item>
                <item name="wcf.acp.option.google_maps_default_latitude"><![CDATA[Standard-Kartenposition (Breitengrad)]]></item>
                <item name="wcf.acp.option.google_maps_default_longitude"><![CDATA[Standard-Kartenposition (Längengrad)]]></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 a904d7efcce3a792d0ff0125d631c33e5468dc52..4c73fcd2cd8e59b39e96aeb4cfa44be52e55fa8b 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -875,6 +875,8 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
                <item name="wcf.acp.option.google_maps_enable_double_click_zoom"><![CDATA[Enable Zoom by Double-Clicking]]></item>
                <item name="wcf.acp.option.google_maps_default_latitude"><![CDATA[Default Map Position (Latitude)]]></item>
                <item name="wcf.acp.option.google_maps_default_longitude"><![CDATA[Default Map Position (Longitude)]]></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">