svn commit: r153 - trunk/mapbender/http/javascripts/map.php

[uli at osgeo.org]

Author: uli
Date: 2006-04-27 12:10:54+0000
New Revision: 153

Modified:
   trunk/mapbender/http/javascripts/map.php   (contents, props changed)

Log:
owsproxy handling modified

Modified: trunk/mapbender/http/javascripts/map.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/javascripts/map.php?view=diff&rev=153&p1=trunk/mapbender/http/javascripts/map.php&p2=trunk/mapbender/http/javascripts/map.php&r1=152&r2=153
==============================================================================
--- trunk/mapbender/http/javascripts/map.php	(original)
+++ trunk/mapbender/http/javascripts/map.php	2006-04-27 12:10:54+0000
@@ -1,6 +1,6 @@
 <?php
-# $Id: map.php,v 1.38 2006/03/20 10:01:58 astrid_emde Exp $
-# $Header: /cvsroot/mapbender/mapbender/http/javascripts/map.php,v 1.38 2006/03/20 10:01:58 astrid_emde Exp $
+# $Id$
+# http://www.mapbender.org/index.php/Map.php
 # Copyright (C) 2002 CCGIS
 #
 # This program is free software; you can redistribute it and/or modify
@@ -62,6 +62,7 @@
 echo "var mb_myLogin = '".$_SESSION["mb_login"]."';";
 echo "var mb_styleID = '".md5($_SESSION["mb_user_name"])."';";
 echo "var mb_myBBOX = '".$_SESSION["mb_myBBOX"]."';";
+echo "var owsproxy = '".OWSPROXY."';";
 ?>
 
 var mb_trans = new Image; 
@@ -70,12 +71,19 @@
 	
 
 function init(){
-   for(var i=0; i<mb_InitFunctions.length; i++){
-      eval(mb_InitFunctions[i]);
-   }
-   for(var i=0; i<mb_mapObj.length; i++){
-      setMapRequest(mb_mapObj[i].frameName);
-   }      	
+	var tmp = setOwsproxy();
+	for(var i=0; i<mb_InitFunctions.length; i++){
+		eval(mb_InitFunctions[i]);
+	}
+	for(var i=0; i<mb_mapObj.length; i++){
+		setMapRequest(mb_mapObj[i].frameName);
+	}      	
+}
+function setOwsproxy(){
+	for(var i=0; i<wms.length; i++){
+		if(wms[i].wms_getmap.indexOf("http") != 0){	wms[i].wms_getmap = owsproxy + "/" + mb_nr	+ "/" + wms[i].wms_getmap;}
+	}
+	return true;
 }
 /*registerFunctions*/
 function mb_registerInitFunctions(stringFunction){
@@ -379,12 +387,10 @@
 			return true;
 		}
 	}
-	//alert("A");
 	for(var i=0; i<mb_mapObj.length; i++){
 		var newMapRequest = "";
 		if(mb_mapObj[i].frameName == frameName){
 			for(var ii=0; ii<mb_mapObj[i].wms.length; ii++){
-				var proxy = false; //proxy
 				if(mb_mapObj[i].wms[ii].gui_wms_visible > 0){
 					var myDivId = "div_" + ii;          
 					var myMapId = "map_" + ii;
@@ -396,14 +402,6 @@
 						newMapRequest += "<img id='"+myMapId+"' name='mapimage' src='";
 						newMapURL += mb_mapObj[i].wms[ii].wms_getmap;   
 						
-						/* ows proxy */
-						if(newMapURL.indexOf(mb_security_proxy)>-1){
-							var a = newMapURL.indexOf(mb_security_proxy) + mb_security_proxy.length;
-							proxy = newMapURL.substr(0,a);
-							newMapURL = newMapURL.substr(a,newMapURL.length);								
-						}						
-						/* end ows proxy */      
-						
 						newMapURL += mb_getConjunctionCharacter(mb_mapObj[i].wms[ii].wms_getmap);
 						
 						if(mb_mapObj[i].wms[ii].wms_version == "1.0.0"){newMapURL += "WMTVER="+mb_mapObj[i].wms[ii].wms_version+"&REQUEST=map&";}
@@ -436,9 +434,6 @@
 						if(mb_log){
 							var tmp = eval(mb_log + "('" + newMapURL + "','" + ts + "')");
 						}
-						if(proxy){
-							newMapURL = proxy + escape(newMapURL) + "&" + <?php echo "'".SID."'" ?>;
-						}
 						newMapRequest += newMapURL;
 						mb_mapObj[i].mapURL[ii] = newMapURL;	
 						mb_mapObj[i].wms[ii].mapURL = newMapURL;
@@ -475,20 +470,12 @@
 		var newMapRequest = "";
 		if(mb_mapObj[i].frameName == frameName){
 			for(var ii=0; ii<mb_mapObj[i].wms.length; ii++){ 
-				var proxy = false; //proxy
 				var myDivId = "div_" + ii;
 				var myMapId = "map_" + ii;
 				if(mb_mapObj[i].wms[ii].wms_id == wms_id){  
 					var newMapURL = "";
 					newMapRequest += "<img id='"+myMapId+"' name='mapimage' src='";
 					newMapURL += mb_mapObj[i].wms[ii].wms_getmap; 
-					/* ows proxy */
-					if(newMapURL.indexOf(mb_security_proxy)>-1){
-						var a = newMapURL.indexOf(mb_security_proxy) + mb_security_proxy.length;
-						proxy = newMapURL.substr(0,a);
-						newMapURL = newMapURL.substr(a,newMapURL.length);								
-					}						
-					/* end ows proxy */           
 
 					newMapURL += mb_getConjunctionCharacter(mb_mapObj[i].wms[ii].wms_getmap);
 						
@@ -524,9 +511,6 @@
 					}
 					//prompt("",newMapURL);
 					if(mb_mapObj[i].layers[ii] != "" && str_LayerStyles[0] != ""){
-						if(proxy){
-							newMapURL = proxy + escape(newMapURL) + "&" + <?php echo "'".SID."'" ?>;
-						}
 						newMapRequest += newMapURL;
 						mb_mapObj[i].mapURL[ii] = newMapURL;
 						mb_mapObj[i].wms[ii].mapURL = newMapURL;