[Mapbender-commits] r9710 - trunk/mapbender/http_auth/http

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2017-03-23 07:22:49 -0700 (Thu, 23 Mar 2017)
New Revision: 9710

Modified:
   trunk/mapbender/http_auth/http/index.php
Log:
Fix for post requests via owsproxy

Modified: trunk/mapbender/http_auth/http/index.php
===================================================================
--- trunk/mapbender/http_auth/http/index.php	2017-03-22 13:16:35 UTC (rev 9709)
+++ trunk/mapbender/http_auth/http/index.php	2017-03-23 14:22:49 UTC (rev 9710)
@@ -161,7 +161,6 @@
 			$request = str_replace('?&','?',$request);
 			//TODO: following is not the standard way because ows has not to handle vsp!!!
 			$request = delTotalFromQuery("wfs_id",$request);
-			$e = new mb_exception($request); 
 			if (isset($auth)) {
             			getWfsCapabilities($request, $auth);
         		} else {
@@ -990,16 +989,31 @@
 
 function getDocumentContent($log_id, $url, $header = false)
 {
-    global $reqParams, $n;
+    global $reqParams, $n, $postData;
     //debug
     $startTime = microtime();
-    if (func_num_args() == 4) { //new for HTTP Authentication
-        $auth = func_get_arg(3);
-        $d = new connector($url, $auth);
+    if ($postData == false) {
+    	if (func_num_args() == 4) { //new for HTTP Authentication
+    	    $auth = func_get_arg(3);
+    	    $d = new connector($url, $auth);
+   	 } else {
+    	    $d = new connector($url);
+   	 }
+	 $content = $d->file;
     } else {
-        $d = new connector($url);
+		$postInterfaceObject = new connector();
+		$postInterfaceObject->set('httpType','POST');
+		$postInterfaceObject->set('curlSendCustomHeaders',true);
+		$postInterfaceObject->set('httpPostData', $postData);
+		$postInterfaceObject->set('httpContentType','text/xml');
+		if (func_num_args() == 4) { //new for HTTP Authentication
+    	  		$auth = func_get_arg(3);
+			$postInterfaceObject->load($url, $auth);
+		} else {
+			$postInterfaceObject->load($url);
+		}		 
+		$content = $postInterfaceObject->file;
     }
-    $content = $d->file;
     $endTime = microtime();
     //$e = new mb_exception("owsproxy/http/index.php: Time for getting remote resource: ".(string)($endTime - $startTime));
     if (strtoupper($reqParams["request"]) == "GETMAP") { // getmap