[Mapbender-commits] r9018 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2014-08-04 06:13:59 -0700 (Mon, 04 Aug 2014)
New Revision: 9018

Modified:
   trunk/mapbender/http/php/mod_interfaceWms4Kml.php
Log:
Bugfix to show owsproxy url in kml if wms is secured ;-)

Modified: trunk/mapbender/http/php/mod_interfaceWms4Kml.php
===================================================================
--- trunk/mapbender/http/php/mod_interfaceWms4Kml.php	2014-08-04 12:43:47 UTC (rev 9017)
+++ trunk/mapbender/http/php/mod_interfaceWms4Kml.php	2014-08-04 13:13:59 UTC (rev 9018)
@@ -29,7 +29,7 @@
 	$testMatch = NULL;
 }
 //dbselect for generate KML
-$sqlKML = "select wms.wms_getmap, wms.wms_version, layer.layer_name,layer.layer_title, layer_epsg.minx,layer_epsg.miny,layer_epsg.maxx,layer_epsg.maxy from wms, layer, layer_epsg, wms_format where layer.layer_id=$1 and layer.fkey_wms_id=wms.wms_id and layer.layer_id=layer_epsg.fkey_layer_id and layer_epsg.epsg='EPSG:4326' and wms.wms_id=wms_format.fkey_wms_id and wms_format.data_format like '%image/png%' LIMIT 1";
+$sqlKML = "select wms.wms_getmap, wms.wms_version, wms.wms_owsproxy, layer.layer_name,layer.layer_title, layer_epsg.minx,layer_epsg.miny,layer_epsg.maxx,layer_epsg.maxy from wms, layer, layer_epsg, wms_format where layer.layer_id=$1 and layer.fkey_wms_id=wms.wms_id and layer.layer_id=layer_epsg.fkey_layer_id and layer_epsg.epsg='EPSG:4326' and wms.wms_id=wms_format.fkey_wms_id and wms_format.data_format like '%image/png%' LIMIT 1";
 $vKML = array($layerId);
 $tKML = array('i');
 $resKML = db_prep_query($sqlKML, $vKML, $tKML);
@@ -40,6 +40,15 @@
 	die();
 }
 $getmapurl = eregi_replace("&","&", $rowKML['wms_getmap']);
+//exchange normal url with owsproxyurl
+$sessionId = session_id();
+if ($rowKML['wms_owsproxy'] <> '' && $rowKML['wms_owsproxy'] <> NULL) {
+	if (defined("OWSPROXY") && OWSPROXY != ""){
+		$getmapurl = OWSPROXY."/".$sessionId."/".$rowKML["wms_owsproxy"]."?";
+	} else {
+		$getmapurl = "http://www.google.com?";
+	}	
+}
 $kml="<?xml version=\"1.0\" encoding=\"UTF-8\"?>".chr(13).chr(10);
 $kml.="<kml xmlns=\"http://earth.google.com/kml/2.2\">".chr(13).chr(10);
 $kml.="<GroundOverlay>".chr(13).chr(10);