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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2016-02-22 07:06:48 -0800 (Mon, 22 Feb 2016)
New Revision: 9404

Modified:
   trunk/mapbender/http/php/mod_inspireDownloadFeed.php
   trunk/mapbender/http/php/mod_showMetadata.php
Log:
Give away wfs owsproxy url in INSPIRE ATOM Feed Client and metadata module

Modified: trunk/mapbender/http/php/mod_inspireDownloadFeed.php
===================================================================
--- trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2016-02-22 13:31:26 UTC (rev 9403)
+++ trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2016-02-22 15:06:48 UTC (rev 9404)
@@ -986,7 +986,12 @@
 	if ($type == 'SERVICE' && $generateFrom == "wfs") {
 	/*<link rel="related" href="http://xyz.org/wfs?request=GetCapabilities&service=WFS&version=2.0.0" type="application/xml" title="Service implementing Direct Access operations"/>*/
 		$feedLink = $feedDoc->createElement("link");
-		$feedLink->setAttribute("href", $mapbenderMetadata[$m]->wfs_getcapabilities."&request=GetCapabilities&VERSION=1.1.0&SERVICE=WFS");
+		if ($admin->getWFSOWSstring($mapbenderMetadata[$m]->wfs_id) == false) {
+			$wfsGetCapabilitiesUrl = $mapbenderMetadata[$m]->wfs_getcapabilities;
+		} else {
+			$wfsGetCapabilitiesUrl = $mapbenderServerUrl."/registry/wfs/".$mapbenderMetadata[$m]->wfs_id."?";
+		}
+		$feedLink->setAttribute("href", $wfsGetCapabilitiesUrl."&request=GetCapabilities&VERSION=1.1.0&SERVICE=WFS");
 		$feedLink->setAttribute("rel", "related");
 		$feedLink->setAttribute("type", "application/xml");
 		//$feedLink->setAttribute("hreflang", "en");

Modified: trunk/mapbender/http/php/mod_showMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_showMetadata.php	2016-02-22 13:31:26 UTC (rev 9403)
+++ trunk/mapbender/http/php/mod_showMetadata.php	2016-02-22 15:06:48 UTC (rev 9404)
@@ -19,6 +19,7 @@
 
 require_once dirname(__FILE__) . "/../../core/globalSettings.php";
 require_once dirname(__FILE__)."/../classes/class_connector.php";
+require_once dirname(__FILE__)."/../classes/class_administration.php";
 require_once dirname(__FILE__) . "/../classes/class_user.php";
 require_once dirname(__FILE__) . "/../classes/class_wms.php";
 require_once dirname(__FILE__) . "/../classes/class_Uuid.php";
@@ -34,6 +35,10 @@
 //get language parameter out of mapbender session if it is set else set default language to de_DE
 $sessionLang = Mapbender::session()->get("mb_lang");
 
+$mapbenderPath = MAPBENDER_PATH."/";
+$mapbenderPathArray = parse_url($mapbenderPath);
+$mapbenderServerUrl = $mapbenderPathArray['scheme']."://".$mapbenderPathArray['host'];
+
 if (isset($sessionLang) && ($sessionLang!='')) {
 	$e = new mb_notice("mod_showMetadata.php: language found in session: ".$sessionLang);
 	$language = $sessionLang;
@@ -1052,8 +1057,24 @@
 	//$html .= '</fieldset>';
 }
 $html .= $tableEnd;
+//Check if owsproxy is enabled for resource
+if ($resource == 'featuretype' or $resource == 'wfs-conf' or $resource == "wfs") {
+	$admin = new administration();
+	if ($admin->getWFSOWSstring($resourceMetadata['serviceid']) == false) {
+		//
+		//$e = new mb_exception("no proxy");
+		$describeFeaturetypeUrl = $resourceMetadata['wfs_describefeaturetype'];
+		$wfsGetCapabilitiesUrl = $resourceMetadata['wfs_getcapabilities'];
+	} else {
+		//
+		$describeFeaturetypeUrl = $mapbenderServerUrl."/registry/wfs/".$mapbenderMetadata[$m]->wfs_id."?";
+		$wfsGetCapabilitiesUrl = $describeFeaturetypeUrl;
+		//$e = new mb_exception("proxy");
+	}
+}
+ 
 if (isset($resourceMetadata['wfs_describefeaturetype']) && ($resourceMetadata['wfs_describefeaturetype'] != '')) {
-	$html .= $t_a.$translation['describeFeaturetype'].$t_b."<a href='".$resourceMetadata['wfs_describefeaturetype']."SERVICE=WFS&VERSION=".$resourceMetadata['serviceversion']."&REQUEST=DescribeFeaturetype&typename=".$resourceMetadata['contentname']."' >Link</a>".$t_c;
+	$html .= $t_a.$translation['describeFeaturetype'].$t_b."<a href='".$describeFeaturetypeUrl."SERVICE=WFS&VERSION=".$resourceMetadata['serviceversion']."&REQUEST=DescribeFeaturetype&typename=".$resourceMetadata['contentname']."' >Link</a>".$t_c;
 	#$html .= $t_a.$translation['describeFeaturetype'].$t_b."<a href='".$resourceMetadata['wfs_describefeaturetype']."&REQUEST=DescribeFeaturetype&typename=".$resourceMetadata['contentname']."' >Link</a>".$t_c;
 }
 
@@ -1341,6 +1362,13 @@
 	$html .= $t_a.$translation['kml'].$t_b."<a href='../php/mod_interfaceWms4Kml.php?id=".$layerId."'><img style='border: none;' src='../img/misc/kml_icon.gif' title='".$translation['kml']."' style='width:34px;height:34px' alt='' /></a>".$t_c;
 }
 
+if ($resource == 'wfs' or $resource == 'featuretype' or $resource == 'wfs-conf') {
+	$html .= $t_a;
+	$html .= $translation['originalCapabilities'];
+	$html .= $t_b;
+	$html .= "<a href = '".$wfsGetCapabilitiesUrl."&SERVICE=WFS&VERSION=".$resourceMetadata['serviceversion']."&REQUEST=GetCapabilities"."' target=_blank>".$translation['capabilities']."</a> <img src='../img/osgeo_graphics/geosilk/link.png' onclick='showCapabilitiesUrl(\"".$wfsGetCapabilitiesUrl."&SERVICE=WFS&VERSION=".$resourceMetadata['serviceversion']."&REQUEST=GetCapabilities"."\",\"".$translation['capabilities']."\");'>";
+	$html .= $t_c;
+}