[Mapbender-commits] r2315 - in branches/2.5: . http/javascripts owsproxy/http

[svn_mapbender at osgeo.org]

Author: nimix
Date: 2008-03-31 05:37:59 -0400 (Mon, 31 Mar 2008)
New Revision: 2315

Modified:
   branches/2.5/
   branches/2.5/http/javascripts/map.js
   branches/2.5/owsproxy/http/index.php
Log:
fix: don't send empty map requests


Property changes on: branches/2.5
___________________________________________________________________
Name: svn:ignore
   + .project


Modified: branches/2.5/http/javascripts/map.js
===================================================================
--- branches/2.5/http/javascripts/map.js	2008-03-28 15:40:43 UTC (rev 2314)
+++ branches/2.5/http/javascripts/map.js	2008-03-31 09:37:59 UTC (rev 2315)
@@ -688,7 +688,7 @@
 					//disable Layer which are out of scale
 					var validLayers = mb_checkScale(frameName,i,ii);
 					var layerNames = validLayers.toString();
-					if(mb_mapObj[i].layers[ii] !== "" && validLayers !== ''){
+					if(mb_mapObj[i].layers[ii] !== "" && layerNames !== ''){
 						var newMapURL = "";
 
 						if (mb_mapObj[i].wms[ii].gui_wms_mapopacity != 1) {

Modified: branches/2.5/owsproxy/http/index.php
===================================================================
--- branches/2.5/owsproxy/http/index.php	2008-03-28 15:40:43 UTC (rev 2314)
+++ branches/2.5/owsproxy/http/index.php	2008-03-31 09:37:59 UTC (rev 2315)
@@ -74,6 +74,10 @@
 		$arrayOnlineresources = checkWmsPermission($owsproxyService);
 		$query->setOnlineResource($arrayOnlineresources['wms_getmap']);
 		$layers = checkLayerPermission($arrayOnlineresources['wms_id'],$reqParams['layers']);
+		if($layers===""){
+			throwE("Permission denied");
+			die();
+		}
 		$query->setParam("layers",$layers);
 		$request = $query->getRequest();
 		getImage($request);