From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 30 Jun 2016 09:33:40 +0000 (+0200)
Subject: Add Google Maps API key option
X-Git-Tag: 3.0.0_Beta_1~117^2^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1d86b1a75a1ddd87d537c52221425256880e9be0;p=GitHub%2FWoltLab%2FWCF.git

Add Google Maps API key option
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index e22db648d6..f9c820168e 100644
--- 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 d722380ad7..987808b692 100644
--- 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 a780fb8ed1..5e15e19421 100644
--- 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 a904d7efcc..4c73fcd2cd 100644
--- 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">