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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2007-02-28 08:39:36 -0500 (Wed, 28 Feb 2007)
New Revision: 1152

Modified:
   trunk/mapbender/http/php/mod_monitorCapabilities_main.php
Log:
bugfix: 3 
Online resource incorrect in monitoring module

Modified: trunk/mapbender/http/php/mod_monitorCapabilities_main.php
===================================================================
--- trunk/mapbender/http/php/mod_monitorCapabilities_main.php	2007-02-28 12:01:15 UTC (rev 1151)
+++ trunk/mapbender/http/php/mod_monitorCapabilities_main.php	2007-02-28 13:39:36 UTC (rev 1152)
@@ -30,6 +30,16 @@
 $gui = "";
 $cl = 0;
 
+
+function getConjunctionCharacter($onlineresource){
+	if(strstr($onlineresource, "?")) {
+		$lastChar = substr($onlineresource,strlen($onlineresource)-1, 1);  
+		if ($lastChar == "?" || $lastChar == "&") {return "";}
+		else{return "&";}
+	}
+	else {return "?";} 
+}
+
 // retrieve username and gui_id
 if ($_REQUEST['user']) {
 	$cl = 0;
@@ -104,10 +114,10 @@
 		$version = $someArray[0];
 		$capabilities = $someArray[1]; 	
 		if ($version == "1.0.0" ) {
-			$url = $capabilities . "REQUEST=capabilities&WMTVER=1.0.0";
+			$url = $capabilities . getConjunctionCharacter($capabilities) . "REQUEST=capabilities&WMTVER=1.0.0";
 		}
 		else {
-			$url = $capabilities . "REQUEST=GetCapabilities&SERVICE=wms&VERSION=" . $version;	
+			$url = $capabilities . getConjunctionCharacter($capabilities) . "REQUEST=GetCapabilities&SERVICE=wms&VERSION=" . $version;	
 		}
 	}