[Mapbender-commits] r9377 - trunk/mapbender/owsproxy/http

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2016-01-19 03:48:14 -0800 (Tue, 19 Jan 2016)
New Revision: 9377

Modified:
   trunk/mapbender/owsproxy/http/index.php
Log:
Bugfix

Modified: trunk/mapbender/owsproxy/http/index.php
===================================================================
--- trunk/mapbender/owsproxy/http/index.php	2016-01-19 11:11:22 UTC (rev 9376)
+++ trunk/mapbender/owsproxy/http/index.php	2016-01-19 11:48:14 UTC (rev 9377)
@@ -45,7 +45,7 @@
 $reqParams = $query->getRequestParams();
 $e = new mb_notice("incoming request: " . OWSPROXY . "/" . $_REQUEST['sid'] . "/" . $_REQUEST['wms'] . $query->getRequest());
 $e = new mb_notice("owsproxy requested from: " . $_SERVER["REMOTE_ADDR"]);
-$e = new mb_exception("owsproxy requested: " . $query->getRequest());
+$e = new mb_notice("owsproxy requested: " . $query->getRequest());
 $sid = $_REQUEST['sid'];
 $serviceId =  $_REQUEST['wms'];
 
@@ -216,6 +216,7 @@
 			$arrayOnlineresources = checkWfsPermission($query->getOwsproxyServiceId(), false);
         		$query->setOnlineResource($arrayOnlineresources['wfs_getcapabilities']);
         		$request = $query->getRequest();  
+			$request = str_replace('?&','?',$request);
 			if (isset($auth)) {
             			getWfsCapabilities($request, $auth);
         		} else {
@@ -758,9 +759,9 @@
 	
     //get actual capabilities from external server
     if (!$auth) {
-	$wfsCaps = new connector($arrayOnlineresources["wfs_getcapabilities"].$request);
+	$wfsCaps = new connector($request);
     } else {
-	$wfsCaps = new connector($arrayOnlineresources["wfs_getcapabilities"].$request, $auth);
+	$wfsCaps = new connector($request, $auth);
     }
     $r = str_replace($t, $new, $wfsCaps->file);
     //delete trailing amp; 's