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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-09-03 09:57:49 -0400 (Thu, 03 Sep 2009)
New Revision: 4589

Modified:
   trunk/mapbender/http_auth/http/index.php
Log:


Modified: trunk/mapbender/http_auth/http/index.php
===================================================================
--- trunk/mapbender/http_auth/http/index.php	2009-09-03 12:54:57 UTC (rev 4588)
+++ trunk/mapbender/http_auth/http/index.php	2009-09-03 13:57:49 UTC (rev 4589)
@@ -81,7 +81,7 @@
 $owsproxyString = $n->getWMSOWSstring($wmsId);
 
 if (!$owsproxyString) {
-	die('The requested ressource does not exists or the routing through mapbenders owsproxy is not activated!');
+	die('The requested resource does not exists or the routing through mapbenders owsproxy is not activated!');
 }
 //get authentication infos if they are available in wms table! if not $auth = false
 $auth = $n->getAuthInfoOfWMS($wmsId);
@@ -98,7 +98,7 @@
 	case 'getcapabilities':
 		$arrayOnlineresources = checkWmsPermission($wmsId,$userInformation[0]);
 		$query->setOnlineResource($arrayOnlineresources['wms_getcapabilities']);
-		$request = 'http://'.$_SERVER['HTTP_HOST'].'/mapbender/x_geoportal/wms.php?layer_id='.$layerId;
+		$request = preg_replace("/(.*)frames\/login.php/", "$1php/wms.php?layer_id=".$layerId, LOGIN);
 		$requestFull .= $request.'&REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS';
 		if(isset($auth)){
 			getCapabilities($request,$requestFull,$auth);
@@ -390,7 +390,6 @@
 	if (func_num_args() == 3) { //new for HTTP Authentication
 		$auth = func_get_arg(2);
 		$content = getDocumentContent($requestFull,$auth);
-	print_r($auth);
 	}
 	else
 	{