[Mapbender-commits] r10221 - trunk/mapbender/http/classes

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-08-27 01:48:16 -0700 (Tue, 27 Aug 2019)
New Revision: 10221

Modified:
   trunk/mapbender/http/classes/class_wms.php
Log:
Fix metadata path for twitter news

Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php	2019-08-27 07:27:08 UTC (rev 10220)
+++ trunk/mapbender/http/classes/class_wms.php	2019-08-27 08:48:16 UTC (rev 10221)
@@ -224,7 +224,12 @@
 		#	"$1php/mod_layerMetadata.php?id=", 
 		#	LOGIN
 		#) . $wmsId;
-		return str_replace("portal/anmelden.html","",LOGIN)."wms/".$wmsId;
+		//MAPBENDER_PATH maybe something like http://www.geoportal.rlp.de/mapbender !
+		if (defined("MAPBENDER_PATH") && MAPBENDER_PATH != "") {
+		    return str_replace("mapbender","",MAPBENDER_PATH)."wms/".$wmsId;
+		} else {
+		    return str_replace("portal/anmelden.html","",LOGIN)."wms/".$wmsId;
+                }  
 		//the following may be activated if the metadata for the resources can be accessed over restful urls - maybe with help of apaches mod_rewrite
 		#return "http://www.geoportal.rlp.de/wms/".$wmsId;
 	}
@@ -233,8 +238,13 @@
 		#	"/(.*)frames\/login.php/", 
 		#	"$1php/mod_layerMetadata.php?id=", 
 		#	LOGIN
-		#) . $wmsId;
-		return str_replace("portal/anmelden.html","",LOGIN)."layer/".$layerId;
+		#) . $wmsId;		
+		//MAPBENDER_PATH maybe something like http://www.geoportal.rlp.de/mapbender !
+		if (defined("MAPBENDER_PATH") && MAPBENDER_PATH != "") {
+		    return str_replace("mapbender","",MAPBENDER_PATH)."layer/".$layerId;
+		} else {
+		    return str_replace("portal/anmelden.html","",LOGIN)."layer/".$layerId;
+		}
 		//the following may be activated if the metadata for the resources can be accessed over restful urls - maybe with help of apaches mod_rewrite
 		#return "http://www.geoportal.rlp.de/layer/".$layerId;
 	}