[Mapbender-commits] r10237 - in trunk/mapbender/http: classes frames javascripts php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-09-06 01:52:38 -0700 (Fri, 06 Sep 2019)
New Revision: 10237

Modified:
   trunk/mapbender/http/classes/class_connector.php
   trunk/mapbender/http/frames/index.php
   trunk/mapbender/http/javascripts/mod_copyright.php
   trunk/mapbender/http/php/mod_getCoupledResourcesForDataset.php
Log:
Bugfix

Modified: trunk/mapbender/http/classes/class_connector.php
===================================================================
--- trunk/mapbender/http/classes/class_connector.php	2019-09-06 08:34:32 UTC (rev 10236)
+++ trunk/mapbender/http/classes/class_connector.php	2019-09-06 08:52:38 UTC (rev 10237)
@@ -68,7 +68,6 @@
 		//an internet connection. It can be that some requests are done thru this class to the urls of
 		//HTTP_AUTH_PROXY or OWSPROXY. If some of those are part of the url they must be exchanged with 127.0.0.1 - 			//which hopefully should work.
 		$testMatch = $url;
-$e = new mb_exception("url: ".$url);
 		$localTmpFolder = 'file://'.str_replace('classes',ltrim(TMPDIR,'../'),dirname(__FILE__)).'/';
 		$pattern = '/^http:|https:|'.str_replace('/','\/',$localTmpFolder).'/';	
 		//$e = new mb_exception('file://'.str_replace('classes',ltrim(TMPDIR,'../'),dirname(__FILE__)).'/');
@@ -315,7 +314,7 @@
 				curl_setopt($ch, CURLOPT_POST, 1);
 			}
 			curl_setopt($ch, CURLOPT_POSTFIELDS, $this->httpPostData);
-//$e = new mb_exception($this->httpPostData);
+			//$e = new mb_exception($this->httpPostData);
 		}
 		$useragent=CONNECTION_USERAGENT;
 		//Build own headers for GET Requests - maybe needful?

Modified: trunk/mapbender/http/frames/index.php
===================================================================
--- trunk/mapbender/http/frames/index.php	2019-09-06 08:34:32 UTC (rev 10236)
+++ trunk/mapbender/http/frames/index.php	2019-09-06 08:52:38 UTC (rev 10237)
@@ -297,7 +297,7 @@
 $mapPhpParameters = htmlentities($urlParameters, ENT_QUOTES, CHARSET);
 $mapPhpParameters .= "&".htmlentities($_SERVER["QUERY_STRING"]);
 
-$e = new mb_exception("index.php: mapPhpParameters: ".$mapPhpParameters);
+//$e = new mb_exception("index.php: mapPhpParameters: ".$mapPhpParameters);
 if ($representationType == "htmlComplete") {
 	$html .= "<script type='text/javascript' src='../javascripts/map.php?".$mapPhpParameters."'></script>".$linebreak;
 } else {

Modified: trunk/mapbender/http/javascripts/mod_copyright.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_copyright.php	2019-09-06 08:34:32 UTC (rev 10236)
+++ trunk/mapbender/http/javascripts/mod_copyright.php	2019-09-06 08:52:38 UTC (rev 10237)
@@ -36,7 +36,7 @@
 function mod_copyright(){
 	var myMapObj = Mapbender.modules[mod_copyright_target];
 
-	var str_c = "<div style='z-index:110;font-family:" + mod_copyright_font + ";font-size:" + mod_copyright_fontsize + ";color:" + mod_copyright_color2 + ";position:absolute;bottom:5px;right:5px'>"+mod_copyright_text+"</div>";
+	var str_c = "<div style='z-index:1001;font-family:" + mod_copyright_font + ";font-size:" + mod_copyright_fontsize + ";color:" + mod_copyright_color2 + ";position:absolute;bottom:5px;right:5px'>"+mod_copyright_text+"</div>";
 	
 	var map_el = myMapObj.getDomElement();
 	if(!map_el.ownerDocument.getElementById(myMapObj.elementName+"_copyright")){

Modified: trunk/mapbender/http/php/mod_getCoupledResourcesForDataset.php
===================================================================
--- trunk/mapbender/http/php/mod_getCoupledResourcesForDataset.php	2019-09-06 08:34:32 UTC (rev 10236)
+++ trunk/mapbender/http/php/mod_getCoupledResourcesForDataset.php	2019-09-06 08:52:38 UTC (rev 10237)
@@ -215,7 +215,7 @@
 		//$e = new mb_exception("php/mod_getCoupledResourcesForDataset.php: datasetid from getrecordbyid: ".$mbMetadata->datasetId);
 		$operation = "getrecordsresolvecoupling";
 		$getrecordId = $mbMetadata->fileIdentifier;
-		$datasetId = str_replace('&','&',$mbMetadata->datasetIdCodeSpace.'/'.$mbMetadata->datasetId);
+		$datasetId = str_replace('&','&',rtrim($mbMetadata->datasetIdCodeSpace, '/').'/'.$mbMetadata->datasetId);
 
 		$recordType = 'service';
 		$cswResponseObject = $cswClient->doRequest(false, $operation, $getrecordId, false, $recordType, false, false, false, $datasetId, $csw);