[Mapbender-commits] r6673 - in trunk/mapbender: http/html http/javascripts http/php lib

svn_mapbender at osgeo.org svn_mapbender at osgeo.org
Mon Aug 2 09:52:19 EDT 2010


Author: christoph
Date: 2010-08-02 13:52:19 +0000 (Mon, 02 Aug 2010)
New Revision: 6673

Removed:
   trunk/mapbender/http/html/mod_sync_treefolder.php
   trunk/mapbender/http/html/mod_treefolder.html
   trunk/mapbender/http/html/mod_treefolder.php
   trunk/mapbender/http/html/mod_treefolder2.php
   trunk/mapbender/http/html/mod_treefolder2_multiple.php
   trunk/mapbender/http/javascripts/mod_dependentIframe.php
Modified:
   trunk/mapbender/http/javascripts/jsTree.js
   trunk/mapbender/http/javascripts/mod_box1.js
   trunk/mapbender/http/javascripts/mod_dependentDiv.php
   trunk/mapbender/http/javascripts/mod_digitize_tab.php
   trunk/mapbender/http/javascripts/mod_dragMapSize.php
   trunk/mapbender/http/javascripts/mod_featureInfoRedirect.php
   trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php
   trunk/mapbender/http/javascripts/mod_georss.php
   trunk/mapbender/http/javascripts/mod_help.php
   trunk/mapbender/http/javascripts/mod_horizTabs.js
   trunk/mapbender/http/javascripts/mod_initWmc.php
   trunk/mapbender/http/javascripts/mod_legend.php
   trunk/mapbender/http/javascripts/mod_navFrame.php
   trunk/mapbender/http/javascripts/mod_tooltip.php
   trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php
   trunk/mapbender/http/javascripts/popup.js
   trunk/mapbender/http/javascripts/popupballon.js
   trunk/mapbender/http/javascripts/usemap.js
   trunk/mapbender/http/php/mod_treefolderAdmin.php
   trunk/mapbender/http/php/mod_treefolderClient.php
   trunk/mapbender/lib/customTreeModel.js
   trunk/mapbender/lib/saveButton.js
Log:
html 4.01 transitional compatibility

Deleted: trunk/mapbender/http/html/mod_sync_treefolder.php
===================================================================
--- trunk/mapbender/http/html/mod_sync_treefolder.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/html/mod_sync_treefolder.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -1,30 +0,0 @@
-<?php
-require("../php/mb_validateSession.php");
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<meta name="author-mail" content="info at ccgis.de">
-<meta name="author" content="U. Rothstein">
-<meta http-equiv="cache-control" content="no-cache">
-<meta http-equiv="pragma" content="no-cache">
-<meta http-equiv="expires" content="0">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Treefolder</title>
-
-<script type="text/javascript">
-<!--
-function init(){
-	parent.mb_registerInitFunctions("window.frames['treeGDE'].setTree()");	
-}
-function setTree(){
-	document.location.href = "../html/mod_treefolder.php?<?php echo $urlParameters; ?>";
-}
-// -->
-</script>
-</head>
-<body onload='init()'>
-
-</body>
-</html>

Deleted: trunk/mapbender/http/html/mod_treefolder.html
===================================================================
--- trunk/mapbender/http/html/mod_treefolder.html	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/html/mod_treefolder.html	2010-08-02 13:52:19 UTC (rev 6673)
@@ -1,576 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-
-<HTML>
-<HEAD>
-<META NAME="Generator" CONTENT="Cosmo Create 1.0.3">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<TITLE>Treefolder old</TITLE>
-<STYLE TYPE="text/css">
-	    <!--
-	.sitemap {
-		font-family:Arial,Helvetica;
-		font-size:10pt;
-		line-height:6pt;
-	}
-
-	body {
-		margin-top:7px;
-		margin-left:4px;
-		font-family: Arial, Helvetica, sans-serif;
-	}
-	a:link { 
-		text-decoration: none;
-		font-family: Arial, Helvetica, sans-serif;
-	}
-	a:visited { 
-		text-decoration: none;
-		font-family: Arial, Helvetica, sans-serif; 
-	}
-	a:active { 
-		text-decoration: none;
-		font-family: Arial, Helvetica, sans-serif; 
-	}
-	    //
-	    -->
-</STYLE>
-  <SCRIPT language="JavaScript1.2">
-  <!--
-  
-  /*
-   * sitemap.js 1.31 05/02/2000
-   *  - Opera 5
-   *
-   * sitemap.js 1.3 27/11/2000
-   *  - Netscape 6
-   *
-   * sitemap.js 1.2 20/05/2000
-   *  - split array tree into arrays for each element old tree
-   *  - no mory type flag, an folder is an entry which has sons
-   *  - a folder can have an link
-   *  - while initing an default layers is shown 
-   *
-   * sitemap.js 1.1 20/10/1999
-   *  - showTree only updates and init layers new which have been really changed
-   *  - add deep to knot entry
-   *  - substitute knotDeep[ id ] w/ tree[ id2treeIndex[ id ] ].deep
-   *  - add alignment to img and a &nbsp; at the beginning of eyery line
-   *  - add a fake img for bookmarks on top panel
-   *
-   * sitemap.js 1.02 14/10/1999
-   *  - fix bug in initStyles
-   *
-   * sitemap.js 1.01 06/10/1999
-   *  - fix bug in knotDeep for Netscape 4.00-4.0.5
-   *
-   * sitemap.js 1.0 20/09/1999
-   *
-   * Javascript function for displaying hierarchic directory structures with
-   * the ability to collapse and expand directories.
-   *
-   * Copyright (c) 1999 Polzin GmbH, Duesseldorf. All Rights Reserved.
-   * Author: Lutz Eymers <ixtab at polzin.com>
-   * Download: http://www.polzin.com/inet/fset_inet.phtml?w=goodies
-   *
-   * Permission to use, copy, modify, and distribute this software
-   * and its documentation for any purposes and without fee
-   * is hereby granted provided that this copyright notice
-   * appears in all copies. 
-   *
-   * Of course, this software is provided "as is" without express or implied
-   * warranty of any kind.
-   *
-   */
-  mod_treeGDE_map = "mapframe1";
-  parent.mb_registerSubFunctions("window.frames['treeGDE'].mod_treeGDE()");
-
-function getWMSIndexByTitle(frameName,wms_title){
-   var ind = parent.getMapObjIndexByName(frameName);
-   for(var i=0; i< parent.mb_mapObj[ind].wms.length; i++){
-      if(parent.mb_mapObj[ind].wms[i].wms_title == wms_title){
-         return i;
-      }
-   }
-}
-
-function mod_treeGDE(){
-  /**/
-	var ind = parent.getMapObjIndexByName(mod_treeGDE_map);
-	//if(ind == false){ alert("error, no mapobject specified");}
-	for(var i=0; i<document.getElementsByTagName("input").length; i++){
-		//wms_title,layer_shortname,{visible | querylayer}
-		var myID = document.getElementsByTagName("input")[i].id;
-		var arrayID = document.getElementsByTagName("input")[i].id.split("###");
-		//var ind = parent.getMapObjIndexByName(mod_treeGDE_map);
-		var wms_ind = getWMSIndexByTitle(mod_treeGDE_map,arrayID[0]);
-		if(arrayID[2] == "visible"){
-			var arrayLayer = parent.mb_mapObj[ind].layers[wms_ind].split(",");
-			var isOn = false;
-			for(var ii=0; ii<arrayLayer.length; ii++){
-				if(arrayID[1] == arrayLayer[ii]){isOn = true;}
-			}
-			if(isOn == true){ document.getElementById(myID).checked = true;}
-			if(isOn == false){ document.getElementById(myID).checked = false;}
-		}
-		if(arrayID[2] == "querylayer"){
-			//nothing to do at this time
-		}
-	}
-    /*consider scalhints*/
-	for(var i=0; i<parent.mb_mapObj.length; i++){
-		var scale = parseInt(parent.mb_getScale(mod_treeGDE_map));
-		if(parent.mb_mapObj[i].frameName == mod_treeGDE_map){ 
-			for(var ii=0; ii<parent.mb_mapObj[i].wms.length; ii++){
-				for(var iii=1; iii<parent.mb_mapObj[i].wms[ii].objLayer.length; iii++){
-					if(document.getElementById(parent.mb_mapObj[i].wms[ii].wms_title+"_"+parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_name)){
-						if(scale < parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_minscale) && parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_minscale) != 0){                    
-							document.getElementById(parent.mb_mapObj[i].wms[ii].wms_title+"_"+parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_name).style.color = '#999999';                
-						}
-						else if(scale > parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_maxscale) && parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_maxscale) != 0){
-							document.getElementById(parent.mb_mapObj[i].wms[ii].wms_title+"_"+parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_name).style.color = '#999999';
-						}
-						else{
-							document.getElementById(parent.mb_mapObj[i].wms[ii].wms_title+"_"+parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_name).style.color = '#000000';
-						}
-					}                   
-				}
-			}
-		}
-	}
-} 
-  window.onError=null;
-
-  var idx=0
-  var treeId = new Array();
-  var treeP_id = new Array();
-  var treeIsOn = new Array();
-  var treeTyp = new Array();
-  var treeName = new Array();
-  var treeUrl = new Array();
-  var treeWasOn = new Array();
-  var treeDeep = new Array();
-  var treeLastY = new Array();
-  var treeIsShown = new Array();
-  var treeSelectable = new Array();
-  var treeVisible = new Array();
-  var treeQueryable = new Array();
-  var treeQuerylayer = new Array();
-  var treeWMS = new Array();
-  var treeShortname = new Array();
-
-  function Note( id,p_id,name,url,selectable,visible,queryable,querylayer,wms,shortname) {
-    treeId[ idx ] = id
-    treeP_id[ idx ] = p_id
-    treeIsOn[ idx ] = false
-    treeTyp[ idx ] = 'f'
-    treeName[ idx ] = name
-    treeUrl[ idx ] = url 
-    treeWasOn[ idx ] = false
-    treeDeep[ idx ] = 0
-    treeLastY[ idx ] = 0
-    treeIsShown[ idx ] = false
-    treeSelectable[ idx ] = selectable
-    treeVisible[ idx ] = visible
-    treeQueryable[ idx ] = queryable
-    treeQuerylayer[ idx ] = querylayer
-    treeWMS[ idx ] = wms
-    treeShortname[ idx ] = shortname
-    idx++
-  }
-
-  function initDiv ( )
-  {
-    if ( isDOM || isDomIE )
-    {
-      divPrefix='<DIV CLASS="sitemap" style="position:absolute; left:0; top:0; visibility:hidden;" ID="sitemap'
-      divInfo='<DIV CLASS="sitemap" style="position:absolute; visibility:visible" ID="sitemap'
-    }
-    else
-    {
-      divPrefix='<DIV CLASS="sitemap" ID="sitemap'
-      divInfo='<DIV CLASS="sitemap" ID="sitemap'
-    }
-    document.writeln( divInfo +  'info">Bitte haben Sie etwas Geduld.<BR>&nbsp;<BR>Es werden die Eintr&auml;ge aus<BR>&nbsp;<BR>der Datenbank initialisiert.</DIV> ' );
-    for ( var i=1; i<idx; i++ )
-    {
-      // linked Name ? 
-      if ( treeUrl[i] != '' ){
-        linkedName = "<input id='"+treeWMS[i]+"###"+treeShortname[i]+"###visible' type='checkbox' ";
-         if(treeVisible[i] == '1'){ linkedName += "checked ";}
-         if(treeSelectable[i] != '1'){ linkedName += "disabled ";}
-        linkedName += "onClick = 'if(this.checked){parent.handleSelectedLayer(\""+mod_treeGDE_map+"\",\""+treeWMS[i]+"\",\""+treeShortname[i]+"\",\"visible\",1);parent.setSingleMapRequest(\""+mod_treeGDE_map+"\",\""+treeWMS[i]+"\");}";
-        linkedName += "else{parent.handleSelectedLayer(\""+mod_treeGDE_map+"\",\""+treeWMS[i]+"\",\""+treeShortname[i]+"\",\"visible\",0);parent.setSingleMapRequest(\""+mod_treeGDE_map+"\",\""+treeWMS[i]+"\");}'";
-        linkedName += '>';
-        
-        linkedName += "<input id='"+treeWMS[i]+"###"+treeShortname[i]+"###querylayer' type='checkbox' ";
-         if(treeQuerylayer[i] == '1'){ linkedName += "checked ";}
-         if(treeQueryable[i] != '1'){ linkedName += "disabled ";}
-        linkedName += "onClick = 'if(this.checked){parent.handleSelectedLayer(\""+mod_treeGDE_map+"\",\""+treeWMS[i]+"\",\""+treeShortname[i]+"\",\"querylayer\",1);}";
-        linkedName += "else{parent.handleSelectedLayer(\""+mod_treeGDE_map+"\",\""+treeWMS[i]+"\",\""+treeShortname[i]+"\",\"querylayer\",0);}'";
-        linkedName += '>';
-        
-        linkedName += '<A id="'+treeWMS[i]+'_'+treeShortname[i]+'"  HREF="' + treeUrl[i] + '" TARGET="' + defaultTarget + '"><IMG SRC="../img/tree/1w.gif" BORDER="0" WIDTH="3">' + treeName[i] + '</A>';
-      }  
-      else
-        linkedName =  '<IMG SRC="../img/tree/1w.gif" BORDER="0" WIDTH="3">' + treeName[i]
-      // don't link folder icon if node has no sons
-      if ( i == idx-1 || treeP_id[i+1] != treeId[i] ) {
-        if ( treeDeep[ i ] == 0 )
-          folderImg = '<IMG ALIGN="BOTTOM" SRC="../img/tree/file_empty.gif" BORDER="0" HEIGHT="16" WIDTH="1" HSPACE="0">'
-        else
-          folderImg = ''
-      } else {
-        folderImg = '<A  HREF="javascript:sitemapClick(' + treeId[i] + ')"><IMG ALIGN="BOTTOM" SRC="../img/tree/folder_off.gif" BORDER="0" NAME="folder' + treeId[i] + '" HEIGHT="16" WIDTH="30" HSPACE="0"></A>'
-      }
-      // which type of file icon should be displayed?
-      if ( treeP_id[i] != 0 )
-      {
-        if ( lastEntryInFolder( treeId[i] ) )
-          fileImg = '<IMG ALIGN="BOTTOM" SRC="../img/tree/file_last.gif" BORDER="0" NAME="file'
-            + treeId[i] + '" HEIGHT="16" WIDTH="30" HSPACE="0">'  
-        else    
-          fileImg = '<IMG ALIGN="BOTTOM" SRC="../img/tree/file.gif" BORDER="0" NAME="file'
-            + treeId[i] + '" HEIGHT="16" WIDTH="30" HSPACE="0">'  
-      }
-      else
-        fileImg = ''
-      // traverse parents up to root and show vertical lines if parent 
-      // is not the last entry on this layer
-      verticales = ''
-      for( var act_id=treeId[i] ; treeDeep[ id2treeIndex[ act_id ] ] > 1;  )
-      {  
-        act_id = treeP_id[ id2treeIndex[ act_id ]]
-        if ( lastEntryInFolder( act_id ) )
-        {
-          verticales = '<IMG ALIGN="BOTTOM" SRC="../img/tree/file_empty.gif" BORDER="0" HEIGHT="16" WIDTH="30" HSPACE="0">' + verticales
-        }
-        else
-        {
-          verticales = '<IMG ALIGN="BOTTOM" SRC="../img/tree/file_vert.gif" BORDER="0" HEIGHT="16" WIDTH="30" HSPACE="0">' + verticales
-        }
-      }
-
-      
-      document.writeln( divPrefix + treeId[i] + '"><NOBR>&nbsp;' + verticales + fileImg + folderImg + linkedName + '</NOBR></DIV>'
-      )  
-    }
-  }
-
-  function initStyles ( )
-  {
-    document.writeln( '<STYLE TYPE="text/css">' + "\n" + '<!--' )
-    for ( var i=1,y=y0; i<idx; i++ )
-    {  
-      document.writeln( '#sitemap' + treeId[i] + ' {POSITION: absolute; VISIBILITY: hidden;}' )
-      if ( treeIsOn[ id2treeIndex[ treeP_id[i] ] ] )
-        y += deltaY
-    }
-    document.writeln( '#sitemapinfo {POSITION: absolute; VISIBILITY: visible;}' )
-    document.writeln( '//-->' + "\n" + '</STYLE>' )
-  }
-
-
-
-  function sitemapClick( id )
-  {
-    var i = id2treeIndex[ id ]
-
-    if ( treeIsOn[ i ] )
-    // close directory
-    {
-      // mark node as invisible
-      treeIsOn[ i ]=false
-      // mark all sons as invisible
-      actDeep = treeDeep[ i ]
-      for( var j=i+1; j<idx && treeDeep[j] > actDeep; j++ )
-      {
-        treeWasOn[ j ] = treeIsOn[ j ]
-        treeIsOn[ j ]=false
-      }
-      gif_off( id )
-    }
-    else
-    // open directory
-    { 
-      treeIsOn[ i ]=true
-      // remember and restore old status
-      actDeep = treeDeep[ i ]
-      for( var j=i+1; j<idx && treeDeep[j] > actDeep; j++ )
-      {
-        treeIsOn[ j ] = treeWasOn[ j ]
-      }
-      gif_on( id )
-    }
-    showTree()
-  }
-
-  function knotDeep( id )
-  {
-    var deep=0
-    while ( true )
-      if ( treeP_id[ id2treeIndex[id] ] == 0 )
-        return deep
-      else
-      {
-        ++deep
-        id = treeP_id[ id2treeIndex[id] ]
-      }
-    return deep  
-  }
-
-  function initTree( id )
-  {
-    treeIsOn[ id2treeIndex[id] ] = true
-    if ( treeTyp[ id2treeIndex[id] ] != 'b' )
-      gif_on( id ) 
-    while ( treeP_id[ id2treeIndex[id] ] != 0 )
-    {
-      id = treeP_id[ id2treeIndex[id] ]
-      treeIsOn[ id2treeIndex[id] ] = true
-      if ( treeTyp[ id2treeIndex[id] ] != 'b' )
-        gif_on( id ) 
-    }
-  }
-
-  function lastEntryInFolder( id )
-  {
-    var i = id2treeIndex[id]
-    if ( i == idx-1 )
-      return true
-    if ( treeTyp[i] == 'b' )
-    {
-      if ( treeP_id[i+1] != treeP_id[i] )
-        return true
-      else 
-        return false
-    }
-    else
-    {
-      var actDeep = treeDeep[i]
-      for( var j=i+1; j<idx && treeDeep[j] > actDeep ; j++ )
-      ;
-      if ( j<idx && treeDeep[j] == actDeep )
-        return false
-      else
-        return true
-    }
-  }
-
-  function showTree()
-  {
-    for( var i=1, y=y0, x=x0; i<idx; i++ )
-    {
-      if ( treeIsOn[ id2treeIndex[ treeP_id[i] ] ] )
-      {
-        // show current node
-        if ( !(y == treeLastY[i] && treeIsShown[i] ) )
-        {
-          showLayer( "sitemap"+ treeId[i] ) 
-          setyLayer( "sitemap"+ treeId[i], y )
-          treeIsShown[i] = true
-        } 
-        treeLastY[i] = y
-        y += deltaY
-      }
-      else
-      {
-        // hide current node and all sons
-        if ( treeIsShown[ i ] )
-        {
-          hideLayer( "sitemap"+ treeId[i] ) 
-          treeIsShown[i] = false
-        }
-      }
-    }
-  }
-
-  function initIndex() {
-    for( var i=0; i<idx; i++ )
-      id2treeIndex[ treeId[i] ] = i
-  }
-
-  function gif_name (name, width, height) {
-    this.on = new Image (width, height);
-    this.on.src = "../img/tree/" +name + "_on.gif"
-    this.off = new Image (width, height);
-    this.off.src = "../img/tree/"+name + "_off.gif"
-  }
-
-  function load_gif (name, width, height) {
-    gif_name [name] = new gif_name (name,width,height);
-  }
-
-  function load_all () {
-    load_gif ('folder',30,16)
-    file_last = new Image( 30,16 )
-    file_last.src = "../img/tree/file_last.gif"
-    file_middle = new Image( 30,16 )
-    file_middle.src = "../img/tree/file.gif"
-    file_vert = new Image( 30,16 )
-    file_vert.src = "../img/tree/file_vert.gif"
-    file_empty = new Image( 30,16 )
-    file_empty = "../img/tree/file_empty.gif"
-  }
-
-  function gif_on ( id ) {
-    eval("document['folder" + id + "'].src = gif_name['folder'].on.src")
-  }
-
-  function gif_off ( id ) {
-    eval("document['folder" + id + "'].src = gif_name['folder'].off.src")
-  }
- 
-  // global configuration
-  var deltaX = 30
-  var deltaY = 16
-  var x0 = 5
-  var y0 = 5
-  var defaultTarget = 'examplemain'
-
-  var browserName = navigator.appName;
-  var browserVersion = parseInt(navigator.appVersion);
-  var isIE = false;
-  var isNN = false;
-  var isDOM = false;
-  var isDomIE = false;
-  var isDomNN = false;
-  var layerok = false;
-
-  var isIE = browserName.indexOf("Microsoft Internet Explorer" )==-1?false:true;
-  var isNN = browserName.indexOf("Netscape")==-1?false:true;
-  var isOpera = browserName.indexOf("Opera")==-1?false:true;
-  var isDOM = document.getElementById?true:false;
-  var isDomNN = document.layers?true:false;
-  var isDomIE = document.all?true:false;
-
-  if ( isNN && browserVersion>=4 ) layerok=true;
-  if ( isIE && browserVersion>=4 ) layerok=true;
-  if ( isOpera && browserVersion>=5 ) layerok=true;
-
-    
-  function hideLayer(layerName) {
-    if (isDOM)
-      document.getElementById(layerName).style.visibility="hidden"
-    else if (isDomIE)
-      document.all[layerName].style.visibility="hidden";
-    else if (isDomNN) 
-      document.layers[layerName].visibility="hidden";
-  }
-
-  function showLayer(layerName) {
-    if (isDOM)
-      document.getElementById(layerName).style.visibility="visible"
-    else if (isDomIE)
-      document.all[layerName].style.visibility="visible";
-    else if (isDomNN)
-      document.layers[layerName].visibility="visible";
-  }
-
-  function setyLayer(layerName, y) {
-    if (isDOM)
-      document.getElementById(layerName).style.top=y
-    else if (isDomIE)
-      document.all[layerName].style.top=y;
-    else if (isDomNN)
-      document.layers[layerName].top=y;
-  }
-
-  var id2treeIndex = new Array()
-
-  // the structure is easy to understand with a simple example
-  // p_id is the id of the parent
-  // E0                                      ( id=0,p_id=-1 )
-  //          E11                            ( id=1,p_id=0)
-  //                     E111                ( id=2,p_id=1 )
-  //                     E112                ( id=3,p_id=1 )
-  //          E12                            ( id=4,p_id=0 )
-  //                     E121                ( id=5,p_id=4 ) 
-  //          E13                            ( id=6,p_id=0 ) 
-  //                     E131                ( id=7,p_id=6 ) 
-  //                                 E1311   ( id=8,p_id=7 ) 
-  //                     E132                ( id=9,p_id=6 ) 
-  // this is a multinary tree structure which is easy to
-  // populate with database data :)
-  function initArray(){
-    var parentObj = 0;
-    if(parent.mb_mapObj.length == 0){ window.setTimeout("initArray()",100); }    
-    else if(parent.mb_mapObj.length > 0){
-      Note(0,-1,'','');
-      for(var i=0; i<parent.mb_mapObj.length; i++){
-        if(parent.mb_mapObj[i].frameName == mod_treeGDE_map){ 
-           for(var ii=0; ii<parent.mb_mapObj[i].wms.length; ii++){
-              for(var iii=0; iii<parent.mb_mapObj[i].wms[ii].objLayer.length; iii++){          
-                 var temp = parent.mb_mapObj[i].wms[ii].objLayer[iii];     
-                 if(parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_parent == ""){                    
-                    //alert((parseInt(temp.layer_id)+1) + " , " +0 + " , " +temp.layer_title + " , " +'');
-                    Note((parseInt(temp.layer_id)+1),0,temp.layer_title,'','','','','');
-                    parentObj = temp.layer_id+1;                  
-                 }
-                 if(parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_parent == "0"){
-                    ///aufbau der METADATA LINKS
-                    //alert((parseInt(temp.layer_id)+1) + " , " +parentObj + " , " +temp.layer_title + " , " +'');
-                    if(temp.gui_layer_selectable == '1' || temp.gui_layer_queryable == '1'){
-                     //alert((parseInt(temp.layer_id)+1) + " , " +parentObj + " , " +temp.layer_title + " , " +'dasdf' + " , " +temp.gui_layer_selectable + " , " +temp.gui_layer_visible + " , " +temp.gui_layer_queryable + " , " +temp.gui_layer_querylayer);
-                     Note((parseInt(temp.layer_id)+1),parentObj,temp.layer_title,'../metadata/metadata.php?layer_name='+temp.layer_name,temp.gui_layer_selectable,temp.gui_layer_visible,temp.gui_layer_queryable,temp.gui_layer_querylayer,parent.mb_mapObj[i].wms[ii].wms_title,temp.layer_name);
-                    }
-                 }
-              }
-           }
-        }
-      }
-      //Note(22,1,'willi','adfasd');
-      treeTyp[0] = 'f'
-      treeIsOn[0] = true
-      treeWasOn[0] = true
-    }       
-  } 
-  function initArray_()
-  {
-    Note(0,-1,'','')	  
-    Note(1,0,'Tutorials','')	  	  
-    Note(8,1,'HTML','')
-    Note(10,8,'SelfHtml','http://www.teamone.de/selfaktuell/') 
-	  Note(9,1,'willi','')
-    Note(100,9,'SelfHtml','http://www.teamone.de/selfaktuell/')       
-	  Note(3,1,'JavaScript','')
-    Note(4,3, 'Netscape Guide 1.3','http://developer.netscape.com/docs/manuals/js/client/jsguide/index.htm')
-    Note(7,3, 'Introduction to Javascript','http://rummelplatz.uni-mannheim.de/~skoch/js/script.htm')	  
-    Note(12,1, 'Perl','')
-    Note(14,12, 'Perl Tutorial','http://www.awu.id.ethz.ch/~didi/perl/perl_start.html')
-    Note(13,1,'SQL','')
-    Note(15,13, 'Introduction to SQL','http://w3.one.net/~jhoffman/sqltut.htm')
-	  Note(111,1, 'Introduction to SQL','http://w3.one.net/~jhoffman/sqltut.htm')
-    Note(2,0, 'Reference Manuals','')
-    Note(11,2, 'HTML Version 3.2 Referenz','http://www.cls-online.de/htmlref/index.htm')
-    Note(6,2,'Netscape Reference 1.3','http://developer.netscape.com/docs/manuals/js/client/jsref/index.htm')
-    Note(17,2,'PHP Manual','http://www.php.net/manual/html/')	  
-    treeTyp[0] = 'f'
-    treeIsOn[0] = true
-    treeWasOn[0] = true
-  }
-
-  var idx=0
-  initArray()
-  initIndex()
-  load_all()
-  for( i=1; i<idx; i++ )
-  {
-    treeDeep[i] = knotDeep( treeId[i] )
-    if ( treeDeep[i] == 0 )
-      treeIsShown[i] = true
-  }
-  if ( isDomNN )
-    initStyles();
-  //-->  
-  </SCRIPT>
-</HEAD>
-<BODY VLINK="#000000" ALINK="#000000" LINK="#000000" BGCOLOR="#ffffff" TEXT="#000000"
- onLoad="if (layerok) showTree();mod_treeGDE();"
- MARGINHEIGHT="0" MARGINWIDTH="0" LEFTMARGIN="0" TOPMARGIN="0">
-<SCRIPT language="JavaScript1.2">
-<!--
-  initDiv()
-  hideLayer("sitemapinfo")
-//-->
-</SCRIPT>
-</BODY>
-</HTML>

Deleted: trunk/mapbender/http/html/mod_treefolder.php
===================================================================
--- trunk/mapbender/http/html/mod_treefolder.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/html/mod_treefolder.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -1,645 +0,0 @@
-<?php
-require("../php/mb_validateSession.php");
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<HEAD>
-<TITLE>Treefolder</TITLE>
-<META NAME="Generator" CONTENT="Cosmo Create 1.0.3">
-<?php
-echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';	
-include '../include/dyn_css.php';
-?>
-
-<script language='JavaScript'>
-function pop_up(name, einstellungen) {
-	window.open ('',name,einstellungen);
-}
-<?php
-   $sql = "SELECT e_target FROM gui_element WHERE e_id = $1 AND fkey_gui_id = $2";
-   $v = array($e_id,$gui_id);
-   $t = array('s','s');
-   $res = db_prep_query($sql,$v,$t);
-   $e_target = db_result($res,0,"e_target");   
-   echo "mod_treeGDE_map = '".$e_target."';";   
-?>
-</script>
-
-  <SCRIPT language="JavaScript1.2">
-  <!--  
-  /*
-   * sitemap.js 1.31 05/02/2000
-   *  - Opera 5
-   *
-   * sitemap.js 1.3 27/11/2000
-   *  - Netscape 6
-   *
-   * sitemap.js 1.2 20/05/2000
-   *  - split array tree into arrays for each element old tree
-   *  - no mory type flag, an folder is an entry which has sons
-   *  - a folder can have an link
-   *  - while initing an default layers is shown 
-   *
-   * sitemap.js 1.1 20/10/1999
-   *  - showTree only updates and init layers new which have been really changed
-   *  - add deep to knot entry
-   *  - substitute knotDeep[ id ] w/ tree[ id2treeIndex[ id ] ].deep
-   *  - add alignment to img and a &nbsp; at the beginning of eyery line
-   *  - add a fake img for bookmarks on top panel
-   *
-   * sitemap.js 1.02 14/10/1999
-   *  - fix bug in initStyles
-   *
-   * sitemap.js 1.01 06/10/1999
-   *  - fix bug in knotDeep for Netscape 4.00-4.0.5
-   *
-   * sitemap.js 1.0 20/09/1999
-   *
-   * Javascript function for displaying hierarchic directory structures with
-   * the ability to collapse and expand directories.
-   *
-   * Copyright (c) 1999 Polzin GmbH, Duesseldorf. All Rights Reserved.
-   * Author: Lutz Eymers <ixtab at polzin.com>
-   * Download: http://www.polzin.com/inet/fset_inet.phtml?w=goodies
-   *
-   * Permission to use, copy, modify, and distribute this software
-   * and its documentation for any purposes and without fee
-   * is hereby granted provided that this copyright notice
-   * appears in all copies. 
-   *
-   * Of course, this software is provided "as is" without express or implied
-   * warranty of any kind.
-   *
-   */
-
-//var myCategories = {"Stadt":0, "Land":1, "Fluss":4};
-var myCategories = {};
-
-
-// some defaults
-try{if (switchwms){}}catch(e){switchwms = 'false';}
-try{if (ficheckbox){}}catch(e){ficheckbox = 'true';}
-try{if (metadatalink){}}catch(e){metadatalink = 'false';}
-
-  
-  parent.mb_registerSubFunctions("window.frames['treeGDE'].mod_treeGDE();");
-  parent.mb_registerloadWmsSubFunctions("window.frames['treeGDE'].deleteInputTags();");
-  parent.mb_registerloadWmsSubFunctions("window.frames['treeGDE'].document.location.reload();");
-  
-
-function deleteInputTags() {
-	var max = document.getElementsByTagName("input").length;
-	for (var i=0; i<max; i++) {
-		var aNode = document.getElementsByTagName("input")[0];
-		var aNodeParent = aNode.parentNode;
-		aNodeParent.removeChild(aNode);
-	}
-}
-function handleSelectedLayer(mapObj,wms_id,layername,type,status){
-	var mywms = new Array();
-	mywms[0] = wms_id;
-	var mylayername = new Array();
-	mylayername[0] = layername;
-	parent.handleSelectedLayer_array(mapObj, mywms, mylayername, type, status);
-}
-function switchWMS(w,s){
-	for (var i=0; i < parent.mb_mapObj.length; i++) {
-		if (parent.mb_mapObj[i].frameName == mod_treeGDE_map) {
-			for (var ii=0; ii < parent.mb_mapObj[i].wms.length; ii++){
-				if (parent.mb_mapObj[i].wms[ii].wms_id == w){
-					for (var iii=1; iii < parent.mb_mapObj[i].wms[ii].objLayer.length; iii++) {
-						if (parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_selectable == '1') {
-							parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_visible = s;
-						}
-						if (parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_queryable == '1') {
-							//parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_querylayer = s;
-						}
-					}
-				}
-			}
-		}
-	}
-	parent.mb_restateLayers(mod_treeGDE_map,w);
-	parent.setSingleMapRequest(mod_treeGDE_map,w);
-}
-function mod_treeGDE(){
-  /**/
-	var ind = parent.getMapObjIndexByName(mod_treeGDE_map);
-	//if(ind == false){ alert("error, no mapobject specified");}
-	for(var i=0; i<document.getElementsByTagName("input").length; i++){
-		//layer_shortname,wms_id,{visible | querylayer}
-		var myID = document.getElementsByTagName("input")[i].id;
-		var arrayID = document.getElementsByTagName("input")[i].id.split("###");
-		var wms_ind = parent.getWMSIndexById(mod_treeGDE_map,arrayID[1]);
-		if(arrayID[2] == "visible" && typeof(wms_ind) != "undefined"){
-			var arrayLayer = parent.mb_mapObj[ind].layers[wms_ind].split(",");
-			var isOn = false;
-			for(var ii=0; ii<arrayLayer.length; ii++){
-				if(arrayID[0] == arrayLayer[ii]){
-					isOn = true;
-				}
-			}
-			if(isOn == true){ document.getElementById(myID).checked = true;}
-			if(isOn == false){ document.getElementById(myID).checked = false;}
-		}
-		if(arrayID[2] == "querylayer" && typeof(wms_ind) != "undefined"){
-			var arrayLayer = parent.mb_mapObj[ind].querylayers[wms_ind].split(",");
-			var isOn = false;
-			for(var ii=0; ii<arrayLayer.length; ii++){
-				if(arrayID[0] == arrayLayer[ii]){
-					isOn = true;
-				}
-			}
-			if(isOn == true){ document.getElementById(myID).checked = true;}
-			if(isOn == false){ document.getElementById(myID).checked = false;}
-		}
-	}
-    /*consider scalhints*/
-	for(var i=0; i<parent.mb_mapObj.length; i++){
-		var scale = parseInt(parent.mb_getScale(mod_treeGDE_map));
-		if(parent.mb_mapObj[i].frameName == mod_treeGDE_map){ 
-			for(var ii=0; ii<parent.mb_mapObj[i].wms.length; ii++){
-				for(var iii=1; iii<parent.mb_mapObj[i].wms[ii].objLayer.length; iii++){
-					if(document.getElementById(parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_name+"_"+parent.mb_mapObj[i].wms[ii].wms_id)){
-						if(scale < parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_minscale) && parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_minscale) != 0){                    
-							document.getElementById(parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_name+"_"+parent.mb_mapObj[i].wms[ii].wms_id).style.color = '#999999';                
-						}
-						else if(scale > parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_maxscale) && parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_maxscale) != 0){
-							document.getElementById(parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_name+"_"+parent.mb_mapObj[i].wms[ii].wms_id).style.color = '#999999';
-						}
-						else{
-							document.getElementById(parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_name+"_"+parent.mb_mapObj[i].wms[ii].wms_id).style.color = '#000000';
-						}
-					}                   
-				}
-			}
-		}
-	}
-} 
-  window.onError=null;
-
-  var idx=0
-  var treeId = new Array();
-  var treeP_id = new Array();
-  var treeIsOn = new Array();
-  var treeTyp = new Array();
-  var treeName = new Array();
-  var treeUrl = new Array();
-  var treeWasOn = new Array();
-  var treeDeep = new Array();
-  var treeLastY = new Array();
-  var treeIsShown = new Array();
-  var treeSelectable = new Array();
-  var treeVisible = new Array();
-  var treeQueryable = new Array();
-  var treeQuerylayer = new Array();
-  var treeWMS = new Array();
-  var treeShortname = new Array();
-
-
-  function Note( id,p_id,name,url,selectable,visible,queryable,querylayer,wms,shortname) {
-    treeId[ idx ] = id
-    treeP_id[ idx ] = p_id
-    treeIsOn[ idx ] = false
-    treeTyp[ idx ] = 'f'
-    treeName[ idx ] = name
-    treeUrl[ idx ] = url 
-    treeWasOn[ idx ] = false
-    treeDeep[ idx ] = 0
-    treeLastY[ idx ] = 0
-    treeIsShown[ idx ] = false
-    treeSelectable[ idx ] = selectable
-    treeVisible[ idx ] = visible
-    treeQueryable[ idx ] = queryable
-    treeQuerylayer[ idx ] = querylayer
-    treeWMS[ idx ] = wms
-    treeShortname[ idx ] = shortname
-
-    idx++
-  }
-
-  function openwindow(Adresse) {
-    Fenster1 = window.open(Adresse, "Informationen", "width=500,height=500,left=100,top=100,scrollbars=yes,resizable=no");
-    Fenster1.focus();
-  }
-
-  function initDiv ( )
-  {
-    if ( isDOM || isDomIE )
-    {
-      divPrefix='<DIV CLASS="sitemap" style="position:absolute; left:0; top:0; visibility:hidden;" ID="sitemap'
-      divInfo='<DIV CLASS="sitemap" style="position:absolute; visibility:visible" ID="sitemap'
-    }
-    else
-    {
-      divPrefix='<DIV CLASS="sitemap" ID="sitemap'
-      divInfo='<DIV CLASS="sitemap" ID="sitemap'
-    }
-    document.writeln( divInfo +  'info">Bitte haben Sie etwas Geduld.<BR>&nbsp;<BR>Es werden die Eintr&auml;ge aus<BR>&nbsp;<BR>der Datenbank initialisiert.</DIV> ' );
-    for ( var i=1; i<idx; i++ )
-    {
-      // linked Name ? 
-      if ( treeUrl[i] != null ) {
-
-        linkedName = "<input id='"+treeShortname[i]+"###"+treeWMS[i]+"###visible###' type='checkbox' ";
-         if(treeVisible[i] == '1'){ linkedName += "checked ";}
-         
-         if(treeSelectable[i] != '1'){ 
-         	linkedName += "disabled ";
-         }
-        linkedName += "onClick = 'if(this.checked){handleSelectedLayer(\""+mod_treeGDE_map+"\",\""+treeWMS[i]+"\",\""+treeShortname[i]+"\",\"visible\",1);";
-		if(ficheckbox == 'false'){
-			linkedName += "handleSelectedLayer(\""+mod_treeGDE_map+"\",\""+treeWMS[i]+"\",\""+treeShortname[i]+"\",\"querylayer\",1);";
-		}
-        linkedName += "}";
-        linkedName += "else{handleSelectedLayer(\""+mod_treeGDE_map+"\",\""+treeWMS[i]+"\",\""+treeShortname[i]+"\",\"visible\",0);";
-        if(ficheckbox == 'false'){
-			linkedName += "handleSelectedLayer(\""+mod_treeGDE_map+"\",\""+treeWMS[i]+"\",\""+treeShortname[i]+"\",\"querylayer\",0);";
-		}
-        linkedName += "}'";
-        linkedName += '>';
-        
-        if (ficheckbox == 'true'){
-            linkedName += "<input id='"+treeShortname[i]+"###"+treeWMS[i]+"###querylayer' type='checkbox' ";
-            if(treeQuerylayer[i] == '1'){ linkedName += "checked ";}
-            if(treeQueryable[i] != '1'){ linkedName += "disabled ";}
-            linkedName += "onClick = 'if(this.checked){handleSelectedLayer(\""+mod_treeGDE_map+"\",\""+treeWMS[i]+"\",\""+treeShortname[i]+"\",\"querylayer\",1);}";
-            linkedName += "else{handleSelectedLayer(\""+mod_treeGDE_map+"\",\""+treeWMS[i]+"\",\""+treeShortname[i]+"\",\"querylayer\",0);}'";
-            linkedName += '>';
-        }
-      
-        //linkedName += '<A id="'+treeWMS[i]+'_'+treeShortname[i]+'"  HREF="' + treeUrl[i] + '" TARGET="' + defaultTarget + '"><IMG SRC="'+imagedir+'/1w.gif" BORDER="0" WIDTH="3">' + treeName[i] + '</A>';
-        
-        linkedName += '<A id="'+treeShortname[i]+'_'+treeWMS[i];
-        
-        if (metadatalink == 'true'){
-        	if (treeUrl[i] !== false) {
-				linkedName += '"  HREF="' + treeUrl[i];
-        	}
-        }
-//        linkedName += '"  HREF="../php/mod_layerMetadata.php?id=' + ;
-
-
-        linkedName +='" TARGET="' + defaultTarget + '" onclick="openwindow(this.href); return false"><IMG SRC="'+imagedir+'/1w.gif" BORDER="0" WIDTH="3">' + treeName[i] + '</A>';
-       
-       
-      }  
-      else{
-      	linkedName = "";
-        linkedName =  '<IMG SRC="'+imagedir+'/1w.gif" BORDER="0" WIDTH="3">';
-        if(switchwms == 'true'){
-        	linkedName += '<input type="checkbox" onclick="if(this.checked){switchWMS(\''+treeWMS[i]+'\',1)}else{switchWMS(\''+treeWMS[i]+'\',0)}">';
-        }
-        linkedName += treeName[i];
-      }
-      // don't link folder icon if node has no sons
-      if ( i == idx-1 || treeP_id[i+1] != treeId[i] ) {
-        if ( treeDeep[ i ] == 0 )
-          folderImg = '<IMG ALIGN="BOTTOM" SRC="'+imagedir+'/file_empty.gif" BORDER="0" HEIGHT="16" WIDTH="1" HSPACE="0">'
-        else
-          folderImg = ''
-      } else {
-        folderImg = '<A  HREF="javascript:sitemapClick(' + treeId[i] + ')"><IMG ALIGN="BOTTOM" SRC="'+imagedir+'/folder_off.gif" BORDER="0" NAME="folder' + treeId[i] + '" HEIGHT="16" WIDTH="30" HSPACE="0"></A>'
-      }
-      // which type of file icon should be displayed?
-      if ( treeP_id[i] != 0 )
-      {
-        if ( lastEntryInFolder( treeId[i] ) )
-          fileImg = '<IMG ALIGN="BOTTOM" SRC="'+imagedir+'/file_last.gif" BORDER="0" NAME="file'
-            + treeId[i] + '" HEIGHT="16" WIDTH="30" HSPACE="0">'  
-        else    
-          fileImg = '<IMG ALIGN="BOTTOM" SRC="'+imagedir+'/file.gif" BORDER="0" NAME="file'
-            + treeId[i] + '" HEIGHT="16" WIDTH="30" HSPACE="0">'  
-      }
-      else
-        fileImg = ''
-      // traverse parents up to root and show vertical lines if parent 
-      // is not the last entry on this layer
-      verticales = ''
-      for( var act_id=treeId[i] ; treeDeep[ id2treeIndex[ act_id ] ] > 1;  )
-      {  
-        act_id = treeP_id[ id2treeIndex[ act_id ]]
-        if ( lastEntryInFolder( act_id ) )
-        {
-          verticales = '<IMG ALIGN="BOTTOM" SRC="'+imagedir+'/file_empty.gif" BORDER="0" HEIGHT="16" WIDTH="30" HSPACE="0">' + verticales
-        }
-        else
-        {
-          verticales = '<IMG ALIGN="BOTTOM" SRC="'+imagedir+'/file_vert.gif" BORDER="0" HEIGHT="16" WIDTH="30" HSPACE="0">' + verticales
-        }
-      }
-
-      
-      document.writeln( divPrefix + treeId[i] + '"><NOBR>&nbsp;' + verticales + fileImg + folderImg + linkedName + '</NOBR></DIV>'
-      )  
-    }
-  }
-
-  function initStyles ( )
-  {
-    document.writeln( '<STYLE TYPE="text/css">' + "\n" + '<!--' )
-    for ( var i=1,y=y0; i<idx; i++ )
-    {  
-      document.writeln( '#sitemap' + treeId[i] + ' {POSITION: absolute; VISIBILITY: hidden;}' )
-      if ( treeIsOn[ id2treeIndex[ treeP_id[i] ] ] )
-        y += deltaY
-    }
-    document.writeln( '#sitemapinfo {POSITION: absolute; VISIBILITY: visible;}' )
-    document.writeln( '//-->' + "\n" + '</STYLE>' )
-  }
-
-
-
-  function sitemapClick( id )
-  {
-    var i = id2treeIndex[ id ]
-
-    if ( treeIsOn[ i ] )
-    // close directory
-    {
-      // mark node as invisible
-      treeIsOn[ i ]=false
-      // mark all sons as invisible
-      actDeep = treeDeep[ i ]
-      for( var j=i+1; j<idx && treeDeep[j] > actDeep; j++ )
-      {
-        treeWasOn[ j ] = treeIsOn[ j ]
-        treeIsOn[ j ]=false
-      }
-      gif_off( id )
-    }
-    else
-    // open directory
-    { 
-      treeIsOn[ i ]=true
-      // remember and restore old status
-      actDeep = treeDeep[ i ]
-      for( var j=i+1; j<idx && treeDeep[j] > actDeep; j++ )
-      {
-        treeIsOn[ j ] = treeWasOn[ j ]
-      }
-      gif_on( id )
-    }
-    showTree()
-  }
-
-  function knotDeep( id )
-  {
-    var deep=0
-    while ( true )
-      if ( treeP_id[ id2treeIndex[id] ] == 0 )
-        return deep
-      else
-      {
-        ++deep
-        id = treeP_id[ id2treeIndex[id] ]
-      }
-    return deep  
-  }
-
-  function initTree( id )
-  {
-    treeIsOn[ id2treeIndex[id] ] = true
-    if ( treeTyp[ id2treeIndex[id] ] != 'b' )
-      gif_on( id ) 
-    while ( treeP_id[ id2treeIndex[id] ] != 0 )
-    {
-      id = treeP_id[ id2treeIndex[id] ]
-      treeIsOn[ id2treeIndex[id] ] = true
-      if ( treeTyp[ id2treeIndex[id] ] != 'b' )
-        gif_on( id ) 
-    }
-  }
-
-  function lastEntryInFolder( id )
-  {
-    var i = id2treeIndex[id]
-    if ( i == idx-1 )
-      return true
-    if ( treeTyp[i] == 'b' )
-    {
-      if ( treeP_id[i+1] != treeP_id[i] )
-        return true
-      else 
-        return false
-    }
-    else
-    {
-      var actDeep = treeDeep[i]
-      for( var j=i+1; j<idx && treeDeep[j] > actDeep ; j++ )
-      ;
-      if ( j<idx && treeDeep[j] == actDeep )
-        return false
-      else
-        return true
-    }
-  }
-
-  function showTree()
-  {
-    for( var i=1, y=y0, x=x0; i<idx; i++ )
-    {
-      if ( treeIsOn[ id2treeIndex[ treeP_id[i] ] ] )
-      {
-        // show current node
-        if ( !(y == treeLastY[i] && treeIsShown[i] ) )
-        {
-          showLayer( "sitemap"+ treeId[i] ) 
-          setyLayer( "sitemap"+ treeId[i], y )
-          treeIsShown[i] = true
-        } 
-        treeLastY[i] = y
-        y += deltaY
-      }
-      else
-      {
-        // hide current node and all sons
-        if ( treeIsShown[ i ] )
-        {
-          hideLayer( "sitemap"+ treeId[i] ) 
-          treeIsShown[i] = false
-        }
-      }
-    }
-  }
-
-  function initIndex() {
-    for( var i=0; i<idx; i++ )
-      id2treeIndex[ treeId[i] ] = i
-  }
-
-  function gif_name (name, width, height) {
-    this.on = new Image (width, height);
-    this.on.src = imagedir+ "/" +name + "_on.gif"
-    this.off = new Image (width, height);
-    this.off.src = imagedir+ "/"+name + "_off.gif"
-  }
-
-  function load_gif (name, width, height) {
-    gif_name [name] = new gif_name (name,width,height);
-  }
-
-  function load_all () {
-    load_gif ('folder',30,16)
-    file_last = new Image( 30,16 )
-    file_last.src = imagedir+ "/file_last.gif"
-    file_middle = new Image( 30,16 )
-    file_middle.src = imagedir+ "/file.gif"
-    file_vert = new Image( 30,16 )
-    file_vert.src = imagedir+ "/file_vert.gif"
-    file_empty = new Image( 30,16 )
-    file_empty = imagedir+ "/file_empty.gif"
-  }
-
-  function gif_on ( id ) {
-    eval("document['folder" + id + "'].src = gif_name['folder'].on.src")
-  }
-
-  function gif_off ( id ) {
-    eval("document['folder" + id + "'].src = gif_name['folder'].off.src")
-  }
- 
-  // global configuration
-  var deltaX = 30
-  var deltaY = 16
-  var x0 = 5
-  var y0 = 5
-  var defaultTarget = '_blank'
-
-  var browserName = navigator.appName;
-  var browserVersion = parseInt(navigator.appVersion);
-  var isIE = false;
-  var isNN = false;
-  var isDOM = false;
-  var isDomIE = false;
-  var isDomNN = false;
-  var layerok = false;
-
-  var isIE = browserName.indexOf("Microsoft Internet Explorer" )==-1?false:true;
-  var isNN = browserName.indexOf("Netscape")==-1?false:true;
-  var isOpera = browserName.indexOf("Opera")==-1?false:true;
-  var isDOM = document.getElementById?true:false;
-  var isDomNN = document.layers?true:false;
-  var isDomIE = document.all?true:false;
-
-  if ( isNN && browserVersion>=4 ) layerok=true;
-  if ( isIE && browserVersion>=4 ) layerok=true;
-  if ( isOpera && browserVersion>=5 ) layerok=true;
-
-    
-  function hideLayer(layerName) {
-    if (isDOM)
-      document.getElementById(layerName).style.visibility="hidden"
-    else if (isDomIE)
-      document.all[layerName].style.visibility="hidden";
-    else if (isDomNN) 
-      document.layers[layerName].visibility="hidden";
-  }
-
-  function showLayer(layerName) {
-    if (isDOM)
-      document.getElementById(layerName).style.visibility="visible"
-    else if (isDomIE)
-      document.all[layerName].style.visibility="visible";
-    else if (isDomNN)
-      document.layers[layerName].visibility="visible";
-  }
-
-  function setyLayer(layerName, y) {
-    if (isDOM)
-      document.getElementById(layerName).style.top=y
-    else if (isDomIE)
-      document.all[layerName].style.top=y;
-    else if (isDomNN)
-      document.layers[layerName].top=y;
-  }
-
-  var id2treeIndex = new Array()
-
-  // the structure is easy to understand with a simple example
-  // p_id is the id of the parent
-  // E0                                      ( id=0,p_id=-1 )
-  //          E11                            ( id=1,p_id=0)
-  //                     E111                ( id=2,p_id=1 )
-  //                     E112                ( id=3,p_id=1 )
-  //          E12                            ( id=4,p_id=0 )
-  //                     E121                ( id=5,p_id=4 ) 
-  //          E13                            ( id=6,p_id=0 ) 
-  //                     E131                ( id=7,p_id=6 ) 
-  //                                 E1311   ( id=8,p_id=7 ) 
-  //                     E132                ( id=9,p_id=6 ) 
-  // this is a multinary tree structure which is easy to
-  // populate with database data :)
-function initArray(){
-	var parentObj = 0;
-	if(parent.mb_mapObj.length == 0){ window.setTimeout("initArray()",100); }    
-	else if(parent.mb_mapObj.length > 0){
-		Note(0,-1,'','');
-		for(var i=0; i<parent.mb_mapObj.length; i++){
-			if(parent.mb_mapObj[i].frameName == mod_treeGDE_map){ 
-				for(var ii=0; ii<parent.mb_mapObj[i].wms.length; ii++){
-					for (var attr in myCategories) {
-						if (typeof(myCategories[attr]) != 'function') {
-							if (myCategories[attr] == ii) {
-								Note(parseInt(Math.random()*10000),0,"<b>"+attr+"</b>",'','','','','','','');
-							}
-						}
-					}
-				
-					if(parent.mb_mapObj[i].wms[ii].gui_wms_visible == '1' || parent.mb_mapObj[i].wms[ii].gui_wms_visible == 1){
-						for(var iii=0; iii<parent.mb_mapObj[i].wms[ii].objLayer.length; iii++){          
-							var temp = parent.mb_mapObj[i].wms[ii].objLayer[iii];     
-							if(parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_parent == ""){ 
-								//alert((parseInt(temp.layer_id)+1) + " , " +0 + " , " +temp.layer_title + " , " +" , "+temp.layer_metadataurl);
-								Note((parseInt(temp.layer_id)+1),0,temp.layer_title,null,'','','','',parent.mb_mapObj[i].wms[ii].wms_id,'');
-								parentObj = temp.layer_id+1;                  
-							}
-							if(parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_parent == "0"){
-								//alert((parseInt(temp.layer_id)+1) + " , " +parentObj + " , " +temp.layer_title + " , " +temp.layer_metadataurl);
-								if(temp.gui_layer_selectable == '1' || temp.gui_layer_queryable == '1'){
-									//alert((parseInt(temp.layer_id)+1) + " , " +parentObj + " , " +temp.layer_title + " , " +temp.layer_metadataurl + " , " +temp.gui_layer_selectable + " , " +temp.gui_layer_visible + " , " +temp.gui_layer_queryable + " , " +temp.gui_layer_querylayer);
-									if (temp.layer_uid) {
-										Note((parseInt(temp.layer_id)+1),parentObj,temp.layer_title,'../php/mod_layerMetadata.php?id='+temp.layer_uid,temp.gui_layer_selectable,temp.gui_layer_visible,temp.gui_layer_queryable,temp.gui_layer_querylayer,parent.mb_mapObj[i].wms[ii].wms_id,temp.layer_name);
-									}
-									else {
-										Note((parseInt(temp.layer_id)+1),parentObj,temp.layer_title,false,temp.gui_layer_selectable,temp.gui_layer_visible,temp.gui_layer_queryable,temp.gui_layer_querylayer,parent.mb_mapObj[i].wms[ii].wms_id,temp.layer_name);
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		treeTyp[0] = 'f'
-		treeIsOn[0] = true
-		treeWasOn[0] = true
-	}       
-} 
-
-  var idx=0
-  initArray()
-  initIndex()
-  load_all()
-  for( i=1; i<idx; i++ )
-  {
-    treeDeep[i] = knotDeep( treeId[i] )
-    if ( treeDeep[i] == 0 )
-      treeIsShown[i] = true
-  }
-  if ( isDomNN )
-    initStyles();
-  //-->  
-  </SCRIPT>
-</HEAD>
-<BODY VLINK="#000000" ALINK="#000000" LINK="#000000" BGCOLOR="#ffffff" TEXT="#000000"
- onLoad="if (layerok) showTree();mod_treeGDE();"
- MARGINHEIGHT="0" MARGINWIDTH="0" LEFTMARGIN="0" TOPMARGIN="0">
-<SCRIPT language="JavaScript1.2">
-<!--
-  initDiv()
-  hideLayer("sitemapinfo")
-//-->
-</SCRIPT>
-</BODY>
-</HTML>

Deleted: trunk/mapbender/http/html/mod_treefolder2.php
===================================================================
--- trunk/mapbender/http/html/mod_treefolder2.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/html/mod_treefolder2.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -1,748 +0,0 @@
-<?php
-# $Id$
-# http://www.mapbender.org/index.php/Mod_treefolder2.php
-# Copyright (C) 2007 Melchior Moos
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-$gui_id = Mapbender::session()->get("mb_user_gui");
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<HEAD>
-<?php
-echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
-?>
-<TITLE>Treefolder</TITLE>
-<?php
- include '../include/dyn_css.php';
-?>
-<script language='JavaScript'>
-
-function openwindow(Adresse) {
-Fenster1 = window.open(Adresse, "Informationen", "width=500,height=500,left=100,top=100,scrollbars=yes,resizable=no");
-Fenster1.focus();
-}
-</script>
-<script src="../javascripts/jsTree.js" type="text/javascript" language="JavaScript"></script>
-<?php
-echo "<script language='JavaScript'>";
-   $sql = "SELECT e_target FROM gui_element WHERE e_id = $1 AND fkey_gui_id = $2";
-   $v = array($_REQUEST['e_id_css'],Mapbender::session()->get("mb_user_gui"));
-   $t = array('s','s');
-   $res = db_prep_query($sql,$v,$t);
-   $e_target = db_result($res,0,"e_target");
-   echo "mod_treeGDE_map = '".$e_target."';";
-echo "</script>";
-session_write_close();
-?>
-<SCRIPT language="JavaScript" type="text/javascript">
-
-var msgObj = {};
-msgObj.tooltipHandleWms = '<?php echo _mb("(De)activate this service");?>';
-msgObj.tooltipLayerVisible = '<?php echo _mb("Toggles the visibility of this service");?>';
-msgObj.tooltipLayerQuerylayer = '<?php echo _mb("Toggles the queryability of this service");?>';
-msgObj.tooltipLayerContextMenu = '<?php echo _mb("Opens the layer context menu");?>';
-msgObj.tooltipWmsContextMenu = '<?php echo _mb("Opens the WMS context menu");?>';
-msgObj.tooltipRemoveWms = '<?php echo _mb("Removes the selected WMS");?>';
-msgObj.tooltipMoveSelectionUp = '<?php echo _mb("Moves the selection up");?>';
-msgObj.tooltipMoveSelectionDown = '<?php echo _mb("Moves the selection down");?>';
-
-var jst_container = "document.getElementById('treeContainer')";
-var jst_image_folder = imagedir;
-var jst_display_root = false;
-var defaultTarget = 'examplemain';
-var lock=false;
-var lock_update=false;
-var lock_check=false;
-var selectedMap=-1;
-var selectedWMS=-1;
-var selectedLayer=-1;
-var init=false;
-var errors = 0;
-var state=Array();
-var treeState = "";
-<?php
-//load structure
-$sql = "SELECT * FROM gui_treegde WHERE fkey_gui_id = $1 AND NOT lft = 1 ORDER BY lft;";
-$v = array(Mapbender::session()->get("mb_user_gui"));
-$t = array("s");
-$res = db_prep_query($sql, $v, $t);
-
-//init tree converting arrays
-$nr = array(); 			//array for nested sets numbers
-$str = array();			//array for js array elements
-$categories = array();	//array for wms folders
-$path = array();		//stack for actual path elements
-$rights = array();		//stack for rights of open elements
-
-//build javascript data array for jsTree
-while($row = db_fetch_array($res)){
-	//push javascript array elements to a single array with lefts and rights
-	$left = "['folder_".$row['id']."', ['".$row['my_layer_title']."', 'javascript:_foo()'],[";
-	$right = "]],";
-	array_push($nr, $row['lft']);
-	array_push($str, $left);
-	array_push($nr, $row['rgt']);
-	array_push($str, $right);
-	
-	//finish all nodes that have no further childs
-	while(count($rights) > 0 && $rights[count($rights)-1]<$row['lft']){
-		array_pop($rights);
-		array_pop($path);
-	}
-
-	//set path for each wms that is referenced in this folder
-	array_push($rights, $row['rgt']);
-	array_push($path, "folder_".$row['id']);
-	if($row['wms_id']!=""){
-		foreach(explode(",",$row['wms_id']) as $wms){
-			array_push($categories, "'wms_".$wms."':\"root_id|".implode("|", $path)."\"");
-		}
-	}
-}
-//if we have a configured structure output it
-if(count($str)>0){
-	//order js array elements
-	array_multisort($nr, $str);
-	
-	//output javascript vars
-	$arrNodesStr = "[['root_id', ['Layer','javascript:_foo()'],[".implode("",$str)."]]];";
-	$arrNodesStr = str_replace(array("[]", ",]"),array("","]"),$arrNodesStr);
-	echo "var arrNodesStr = \"".$arrNodesStr."\";\n";
-	echo "var categories = {".implode(",", $categories)."};\n";
-}
-else{
-//if there is no structure take default
-?>
-var arrNodesStr = "[['root_id', ['Layer','javascript:_foo()']]];";
-var categories = {};
-<?php
-}
-?>
-/*var arrNodesStr = "[['root_id', ['Layer','javascript:_foo()'], [['test1',['Einfach so','javascript:_foo()']],['test2',['Schönes Wetter','javascript:_foo()']],['test3',['Sonstiges','javascript:_foo()']]]]];"
-
-var categories = {"wms_407":arrNodes[0][0]+"|test1","wms_911":arrNodes[0][0]+"|test2", "wms_914":arrNodes[0][0]+"|test2"};
-var arrNodes = [
-  String: node id,
-  [
-    String: title,
-    String: href,
-    String: target,
-    String: image,
-    String: tooltip,
-    Folder definition: node context menu,
-    String: controls
-  ],
-  Folder definition: sub folder
-	]
-*/
-var arrNodes = eval(arrNodesStr);
-function _foo(){selectedMap=-1;selectedWMS=-1;selectedLayer=-1}
-
-// some defaults
-try{if (reverse){}}catch(e){reverse = 'false';}
-try{if (switchwms){}}catch(e){switchwms = 'true';}
-try{if (ficheckbox){}}catch(e){ficheckbox = 'false';}
-try{if (metadatalink){}}catch(e){metadatalink = 'false';}
-try{if (wmsbuttons){}}catch(e){wmsbuttons = 'false';}
-try{if (showstatus){}}catch(e){showstatus = 'false';}
-try{if (alerterror){}}catch(e){alerterror = 'false';}
-try{if (openfolder){}}catch(e){openfolder = 'false';}
-try{if (handlesublayer){}}catch(e){handlesublayer = 'false';}
-try{if (menu){}}catch(e){menu = '';}
-try {
-	if (redirectToMetadataUrl) {
-		if (redirectToMetadataUrl == "false") {
-			redirectToMetadataUrl = false;
-		}
-		else {
-			redirectToMetadataUrl = true;
-		}
-	}
-}
-catch (e) {
-	var redirectToMetadataUrl = true;
-}
-var defaultMetadataUrl = '../php/mod_layerMetadata.php?';
-if (redirectToMetadataUrl) {
-	defaultMetadataUrl += 'redirectToMetadataUrl=1';
-}
-else {
-	defaultMetadataUrl += 'redirectToMetadataUrl=0';
-}
-
-//menu elements
-var menu_move_up = ['menu_move_up', ['Move up&nbsp;','javascript:var sd = "{@strData}";var ids=eval(sd.substr(0, sd.length-6))[1][7];move_up(ids[0],ids[1],ids[2]);',,'move_up.png']];
-var menu_move_down = ['menu_move_down', ['Move down&nbsp;', 'javascript:var sd = "{@strData}";var ids=eval(sd.substr(0, sd.length-6))[1][7];move_down(ids[0],ids[1],ids[2]);',,'move_down.png']];
-var menu_delete = ['menu_delete', ['Remove&nbsp;', 'javascript:var sd = "{@strData}";var ids=eval(sd.substr(0, sd.length-6))[1][7];remove_wms(ids[0],ids[1],ids[2]);',,'delete_wms.png']];
-var menu_opacity_up = ['menu_opacity_up', ['Opacity up&nbsp;','javascript:var sd = "{@strData}";var ids=eval(sd.substr(0, sd.length-6))[1][7];opacity_up(ids[0],ids[1],ids[2]);',,'move_up.png']];
-var menu_opacity_down = ['menu_opacity_down', ['Opacity down&nbsp;','javascript:var sd = "{@strData}";var ids=eval(sd.substr(0, sd.length-6))[1][7];opacity_down(ids[0],ids[1],ids[2]);',,'move_down.png']];
-var menu_metalink = ['menu_metalink', ['Information&nbsp;', 'javascript:var sd = "{@strData}";var ids=eval(sd.substr(0, sd.length-6))[1][7];openwindow(defaultMetadataUrl + "&id="+parent.mb_mapObj[ids[0]].wms[ids[1]].objLayer[ids[2]].layer_uid);',,'info.png']];
-var menu_zoom = ['menu_zoom', ['Zoom&nbsp;', 'javascript:var sd = "{@strData}";var ids=eval(sd.substr(0, sd.length-6))[1][7];zoomToLayer(ids[0],ids[1],ids[2]);',,'zoom.png']];
-var menu_hide = ['menu_hide', ['Hide menu&nbsp;', 'javascript:hideMenu()',,'hide.png']];
-//var menu_wms_switch = ['menu_zoom', ['Zoom&nbsp;', 'javascript:var sd = "{@strData}";eval(eval(sd.substr(0, sd.length-6))[1][1]);openwindow(defaultMetadataUrl + "&id="+parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].layer_uid);',,'info.png']];
-//var menu_layer_switch = ['menu_zoom', ['Zjjj&nbsp;', 'javascript:var sd = "{@strData}";eval(eval(sd.substr(0, sd.length-6))[1][1]);openwindow(defaultMetadataUrl + "&id="+parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].layer_uid);',,'info.png']];
-//var menu_info_switch = ['menu_zoom', ['Zmn&nbsp;', 'javascript:var sd = "{@strData}";eval(eval(sd.substr(0, sd.length-6))[1][1]);openwindow(defaultMetadataUrl + "&id="+parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].layer_uid);',,'info.png']];
-
-parent.eventAfterLoadWMS.register(reloadTree);
-parent.eventInit.register(loadTree);
-if(showstatus=='true'||alerterror=='true'){
-	parent.eventAfterMapRequest.register(init_mapcheck);
-	init_mapcheck();
-}
-parent.eventAfterMapRequest.register(updateScale);
-parent.eventAfterMapRequest.register(updateCheckState);
-
-if(wmsbuttons != "true")
-	jst_highlight = false;
-
-function select(i,ii,iii){
-	//ignore if selected
-	if(selectedMap==i && selectedWMS==ii && selectedLayer==iii)return;
-	if(selectedMap==-1 && selectedWMS==-1 && selectedLayer==-1){
-		selectedMap=i;
-		selectedWMS=ii;
-		selectedLayer=iii;
-		return;
-	}
-	//scalehints
-	var scale = parseInt(parent.mb_mapObj[selectedMap].getScale());
-	if(scale < parseInt(parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].gui_layer_minscale) && parseInt(parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].gui_layer_minscale) != 0){
-		if(selectedLayer==0)
-		   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[selectedMap].wms[selectedWMS].wms_id, '#999999');
-		else
-		   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[selectedMap].wms[selectedWMS].wms_id+"|"+parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].layer_id, '#999999');
-	}
-	else if(scale > parseInt(parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].gui_layer_maxscale) && parseInt(parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].gui_layer_maxscale) != 0){
-		if(selectedLayer==0)
-		   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[selectedMap].wms[selectedWMS].wms_id, '#999999');
-		else
-		   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[selectedMap].wms[selectedWMS].wms_id+"|"+parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].layer_id, '#999999');
-	}
-	else{
-		if(selectedLayer==0)
-		   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[selectedMap].wms[selectedWMS].wms_id, '');
-		else
-		   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[selectedMap].wms[selectedWMS].wms_id+"|"+parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].layer_id, '');
-	}
-
-	selectedMap=i;
-	selectedWMS=ii;
-	selectedLayer=iii;
-}
-
-function updateScale(){
-	if(!init)return;
-	for(var i=0; i<parent.mb_mapObj.length; i++){
-		if(parent.mb_mapObj[i].frameName == mod_treeGDE_map){
-			var scale = parent.mb_mapObj[i].getScale();
-			for(var ii=0; ii<parent.mb_mapObj[i].wms.length; ii++){
-				for(var iii=1; iii<parent.mb_mapObj[i].wms[ii].objLayer.length; iii++){
-					if(scale < parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_minscale) && parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_minscale) != 0){
-						if(iii==0)
-						   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id, '#999999');
-						else
-						   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id+"|"+parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_id, '#999999');
-					}
-					else if(scale > parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_maxscale) && parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_maxscale) != 0){
-						if(iii==0)
-						   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id, '#999999');
-						else
-						   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id+"|"+parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_id, '#999999');
-					}
-					else{
-						if(iii==0)
-						   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id, '');
-						else
-						   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id+"|"+parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_id, '');
-					}
-				}
-			}
-		}
-	}
-}
-
-function updateCheckState(){
-	if(!init||lock_check)return;
-	lock_check=true;
-	for(var i=0; i<parent.mb_mapObj.length; i++){
-		if(parent.mb_mapObj[i].frameName == mod_treeGDE_map){
-			var scale = parent.mb_mapObj[i].getScale();
-			for(var ii=0; ii<parent.mb_mapObj[i].wms.length; ii++){
-				for(var iii=1; iii<parent.mb_mapObj[i].wms[ii].objLayer.length; iii++){
-					if(!parent.mb_mapObj[i].wms[ii].objLayer[iii].has_childs){
-						path = arrNodes[0][0]+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id+"|"+parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_id;
-						checkNode(path, 0, parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_visible=='1', false);
-						if(ficheckbox == 'true')
-							checkNode(path, 1, parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_querylayer=='1', false);	
-					}
-				}
-			}
-		}
-	}
-	lock_check=false;
-}
-
-function operaLoad(){
-	initArray();
-	renderTree();
-	setTimeout('initWmsCheckboxen();updateScale();',100);
-}
-
-function loadTree(){
-	if(window.opera){
-		setTimeout('operaLoad()',200);
-		return;
-	}
-	initArray();
-	renderTree();
-	initWmsCheckboxen();
-	updateScale();
-}
-
-function reloadTree(){
-	if(!init) return;
-	selectedMap=-1;
-	selectedWMS=-1;
-	selectedLayer=-1;
-	init=false;
-	arrNodes = eval(arrNodesStr)
-	initArray();
-	if(showstatus=='true'||alerterror=='true')
-		init_mapcheck();
-	renderTree();
-	if(window.opera)
-		setTimeout('initWmsCheckboxen();updateScale();',100);
-	else{
-		initWmsCheckboxen();
-		updateScale();
-	}
-}
-
-function imgerror(){
-	var map=parent.getMapObjIndexByName(mod_treeGDE_map);
-	var wms=Number(this.id.substr(4));
-	this.onerror=null;
-	this.onabort=null;
-	if(state[wms]!=-1 && alerterror=='true'){
-		state[wms]=-1;
-		if(confirm('Failed to Load WMS "'+parent.mb_mapObj[map].wms[wms].objLayer[0].layer_title+'" from Server "'+parent.mb_mapObj[map].wms[wms].wms_getmap.substr(0,parent.mb_mapObj[map].wms[wms].wms_getmap.length-1)+'"\nDo you want to try to load it in a new window?')){
-			window.open(this.src,"");
-		}
-	}
-	state[wms]=-1;
-	errors++;
-	if(showstatus=='true')
-		setNodeImage(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[map].wms[wms].wms_id, "error_folder.png");
-}
-
-function checkComplete(wms, map, img, first){
-	var ind=parent.getMapObjIndexByName(mod_treeGDE_map);
-	if(parent.mb_mapObj[ind].wms[wms].mapURL == false || parent.frames[mod_treeGDE_map].document.getElementById(map).complete){
-		if(state[wms]!=-1){
-			for(var i=1;i<parent.mb_mapObj[ind].wms[wms].objLayer.length;i++){
-				if(parent.mb_mapObj[ind].wms[wms].objLayer[i].gui_layer_visible==1){
-					state[wms]=1;
-					if(showstatus=='true')
-						setNodeImage(img);
-					break;
-				}
-			}
-		}
-	}
-	else{
-		if(first){
-			state[wms]=0;
-			parent.frames[mod_treeGDE_map].document.getElementById(map).onerror=imgerror;
-			parent.frames[mod_treeGDE_map].document.getElementById(map).onabort=imgerror;
-			if(showstatus=='true')
-				setNodeImage(img, "loading_folder.gif");
-		}
-
-		if(state[wms]!=-1)
-			setTimeout('checkComplete('+wms+', "'+map+'", "'+img+'");',100);
-	}
-}
-
-//parent.mb_registerWmsLoadErrorFunctions("window.frames['treeGDE'].imgerror();");
-
-function init_mapcheck(){
-	if(!init)return;
-	errors = 0;
-	var ind = parent.getMapObjIndexByName(mod_treeGDE_map);
-	if(!parent.mb_mapObj[ind]||!init){
-		setTimeout("init_mapcheck();",100);
-		return;
-	}
-	for(var wms=0;wms<parent.mb_mapObj[ind].wms.length;wms++){
-		var wmsimgid="map_"+wms;
-		if(parent.frames[mod_treeGDE_map].document.getElementById(wmsimgid)){
-			checkComplete(wms, wmsimgid, arrNodes[0][0]+'|wms_'+parent.mb_mapObj[ind].wms[wms].wms_id, true);
-		}
-	}
-}
-
-function handleSelectedLayer(mapObj,wms_id,layername,type,status){
-	if(lock_update||lock_check)return;
-	var ind = parent.getMapObjIndexByName(mapObj);
-	for(var i=0; i<parent.mb_mapObj[ind].wms.length; i++){
-		if(parent.mb_mapObj[ind].wms[i].wms_id == wms_id){
-			parent.mb_mapObj[ind].wms[i].handleLayer(layername, type, status);
-			break;
-		}
-	}
-}
-
-function zoomToLayer(j,k,l){
-	if(!j&&!k&&!l){
-		j=selectedMap;
-		k=selectedWMS;
-		l=selectedLayer;
-	}
-	var my=parent.mb_mapObj[j].wms[k].objLayer[l].layer_epsg;
-	for (var i=0;i<my.length;i++){
-		if(my[i]["epsg"]==parent.mb_mapObj[j].epsg){
-			parent.mb_calculateExtent(mod_treeGDE_map,my[i]["minx"],my[i]["miny"],my[i]["maxx"],my[i]["maxy"]);
-			var arrayExt = parent.mb_mapObj[j].extent.toString().split(",");
-			parent.mb_repaint(mod_treeGDE_map,arrayExt[0],arrayExt[1],arrayExt[2],arrayExt[3]);
-			break;
-		}
-	}
-}
-
-
-//---begin------------- opacity --------------------
-
-var opacityIncrement = 20;
-
-function opacity_up(j, k, l) {
-	handleOpacity(j, k, opacityIncrement);
-}
-
-function opacity_down(j, k, l) {
-	handleOpacity(j, k, -opacityIncrement);
-}
-
-function handleOpacity(mapObj_id, wms_id, increment) {
-	var opacity = parent.mb_mapObj[mapObj_id].wms[wms_id].gui_wms_mapopacity*100 + increment;
-	parent.mb_mapObj[mapObj_id].wms[wms_id].setOpacity(opacity);
-	reloadTree();
-}
-
-//---end------------- opacity --------------------
-
-function move_up(j,k,l){
-	if(isNaN(j)&&isNaN(k)&&isNaN(l)){
-		j=selectedMap;
-		k=selectedWMS;
-		l=selectedLayer;
-	}
-	if(j==-1||k==-1||l==-1){
-		alert("You have to select the WMS you want to move up!")
-		return;
-	}
-	var lid=parent.mb_mapObj[j].wms[k].objLayer[l].layer_id;
-	if(!parent.mb_mapObj[j].move(parent.mb_mapObj[j].wms[k].wms_id,lid,(reverse=="true")?false:true)){
-		alert("Illegal move operation");
-		return;
-	}
-	treeState = getState();
-	parent.zoom(parent.mb_mapObj[j].frameName, true, 1.0);
-	parent.mb_execloadWmsSubFunctions();
-	//find layer and select
-	for(k=0;k<parent.mb_mapObj[j].wms.length;k++){
-		for(l=0;l<parent.mb_mapObj[j].wms[k].objLayer.length;l++){
-			if(parent.mb_mapObj[j].wms[k].objLayer[l].layer_id==lid){
-				select(j,k,l);
-				if(l!=0)
-					selectNode(String(lid));
-				else
-					selectNode("wms_"+String(parent.mb_mapObj[j].wms[k].wms_id));
-			}
-		}
-	}
-}
-
-function move_down(j,k,l){
-	if(isNaN(j)&&isNaN(k)&&isNaN(l)){
-		j=selectedMap;
-		k=selectedWMS;
-		l=selectedLayer;
-	}
-	if(j==-1||k==-1||l==-1){
-		alert("You have to select the WMS you want to move down!")
-		return;
-	}
-	var lid=parent.mb_mapObj[j].wms[k].objLayer[l].layer_id;
-	if(!parent.mb_mapObj[j].move(parent.mb_mapObj[j].wms[k].wms_id,lid,(reverse=="true")?true:false)){
-		alert("Illegal move operation");
-		return;
-	}
-	treeState = getState();
-	parent.zoom(parent.mb_mapObj[j].frameName, true, 1.0);
-	parent.mb_execloadWmsSubFunctions();
-	//find layer and select
-	for(k=0;k<parent.mb_mapObj[j].wms.length;k++){
-		for(l=0;l<parent.mb_mapObj[j].wms[k].objLayer.length;l++){
-			if(parent.mb_mapObj[j].wms[k].objLayer[l].layer_id==lid){
-				select(j,k,l);
-				if(l!=0)
-					selectNode(String(lid));
-				else
-					selectNode("wms_"+String(parent.mb_mapObj[j].wms[k].wms_id));
-			}
-		}
-	}
-}
-
-function remove_wms(j,k,l){
-	if(isNaN(j)&&isNaN(k)&&isNaN(l)){
-		j=selectedMap;
-		k=selectedWMS;
-		l=selectedLayer;
-	}
-	if(j==-1||k==-1||l==-1){
-		alert("You have to select the WMS you want to delete!")
-		return;
-	}
-	if(l!=0){
-		alert("It is not possible to delete a single layer, please select a WMS!")
-		return;
-	}
-	var visibleWMS=0;
-	for(var i=0;i<parent.mb_mapObj[j].wms.length;i++)
-		if(parent.mb_mapObj[j].wms[i].gui_wms_visible=='1'||parent.mb_mapObj[j].wms[i].gui_wms_visible==1)
-			visibleWMS++;
-	if(visibleWMS<=1){
-		alert ("Last WMS can't be removed.\n(Der letzte WMS kann nicht entfernt werden.)");
-		return;
-	}
-	if(confirm('Are you sure you want to remove "'+parent.mb_mapObj[j].wms[k].objLayer[l].layer_title+'"?')){
-  		parent.mb_mapObjremoveWMS(j,k);
-		parent.zoom(parent.mb_mapObj[j].frameName, true, 1.0);
-		parent.mb_execloadWmsSubFunctions();
-	}
-}
-
-function updateParent(path){
-	if(lock_check)return;
-	var reset_lock=!lock_update;
-	lock_update=true;
-	var state=getChildrenCheckState(path, 0);
-	//enableCheckbox(path, (state!=-1)); //3rd state
-	checkNode(path, 0, (state==1));
-	if(state==0 && showstatus=='true' && path.split(jst_delimiter[0]).length == 2){
-		setTimeout('setNodeImage("'+path+'", "error_folder.png");', 100);
-	}
-	if(reset_lock)
-		lock_update=false;
-}
-
-function handleSelectedWMS(path){
-	if(lock_update)return;
-	var t = path.split("|");
-	var wms_id = t[t.length-1].substr(4);
-	var reset_lock=!lock_check;
-	var ind = parent.getMapObjIndexByName(mod_treeGDE_map);
-	var wms = parent.getWMSIndexById(mod_treeGDE_map,wms_id);
-	var layername = parent.mb_mapObj[ind].wms[wms].objLayer[0].layer_name;
-	var bChk = IsChecked(path, 0);
-	parent.mb_mapObj[ind].wms[wms].handleLayer(layername,"visible",bChk?"1":"0");
-	parent.mb_mapObj[ind].wms[wms].handleLayer(layername,"querylayer",bChk?"1":"0");
-	lock_check=true;
-	checkChildren(path, 0, bChk);
-	if(ficheckbox)checkChildren(path, 1, bChk);
-	if(bChk==false && showstatus=='true')
-		setTimeout('setNodeImage("'+path+'", "error_folder.png");', 100);
-	if(reset_lock)
-	{
-		parent.mb_restateLayers(mod_treeGDE_map,wms_id);
-		parent.setSingleMapRequest(mod_treeGDE_map,wms_id);
-		lock_check=false;
-	}
-}
-
-function handleSelection(path, box){
-	if(lock_update)return;
-	var reset_lock=!lock_check;
-	lock_check=true;
-	var bChk = IsChecked(path, box);	
-//	enableCheckbox(path, 0, true);
-	checkChildren(path, box, bChk);
-	if(reset_lock){
-		//find wms id from path
-		var t = path.split("|");
-		for(var i=1;t[i].indexOf("wms_")!=0;i++){}
-		var wms_id = t[i].substr(4);
-		//set maprequest
-		parent.mb_restateLayers(mod_treeGDE_map,wms_id);
-		if(box==0)
-			parent.setSingleMapRequest(mod_treeGDE_map,wms_id);
-		lock_check=false;
-	}
-}
-
-function initArray(){
-	var parentObj = "";
-	var controls="";
-	if(parent.mb_mapObj.length > 0){
-		for(var i=0; i<parent.mb_mapObj.length; i++){
-			if(parent.mb_mapObj[i].frameName == mod_treeGDE_map){
-				for(var ii=0; ii<parent.mb_mapObj[i].wms.length; ii++){
-					if(parent.mb_mapObj[i].wms[ii].gui_wms_visible == '1' || parent.mb_mapObj[i].wms[ii].gui_wms_visible == 1){
-						for(var iii=0; iii<parent.mb_mapObj[i].wms[ii].objLayer.length; iii++){
-							var temp = parent.mb_mapObj[i].wms[ii].objLayer[iii];
-							if(parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_parent == ""){
-								if(!temp.gui_layer_selectable == '1' && !temp.gui_layer_queryable == '1')
-									continue;
-								parentNode = arrNodes[0][0];
-								if(eval("categories.wms_"+parent.mb_mapObj[i].wms[ii].wms_id) !== undefined)
-									parentNode = eval("categories.wms_"+parent.mb_mapObj[i].wms[ii].wms_id);
-								else
-									eval("categories['wms_"+parent.mb_mapObj[i].wms[ii].wms_id+"'] = parentNode");
-
-								var c_menu="[";
-								if(reverse=="true"){
-									if(menu.indexOf("wms_down")!=-1 && ii!=parent.mb_mapObj[i].wms.length-1)c_menu+="menu_move_up,";
-									if(menu.indexOf("wms_up")!=-1 && parentObj!="")c_menu+="menu_move_down,";
-								}
-								else{
-									if(menu.indexOf("wms_up")!=-1 && parentObj!="")c_menu+="menu_move_up,";
-									if(menu.indexOf("wms_down")!=-1 && ii!=parent.mb_mapObj[i].wms.length-1)c_menu+="menu_move_down,";
-								}
-								if(menu.indexOf("remove")!=-1)c_menu+="menu_delete,";
-//								if(menu.indexOf("wms_switch")!=-1)c_menu+="menu_wms_switch,";
-								if(menu.indexOf("opacity_up")!=-1 && parseFloat(parent.mb_mapObj[i].wms[ii].gui_wms_mapopacity) < 1)c_menu+="menu_opacity_up,";
-								if(menu.indexOf("opacity_down")!=-1 && parseFloat(parent.mb_mapObj[i].wms[ii].gui_wms_mapopacity) > 0)c_menu+="menu_opacity_down,";
-								if(menu.indexOf("hide")!=-1)c_menu+="menu_hide";
-								c_menu+="]";
-								controls='';
-								if(switchwms=='true')controls='<INPUT type="checkbox" title="' + msgObj.tooltipHandleWms + '" checked onclick="handleSelectedWMS(\''+parentNode+'|wms_'+parent.mb_mapObj[i].wms[ii].wms_id+'\');" />';
-								if(wmsbuttons == 'true'&&metadatalink == 'true')controls+='<a href="'+'javascript:openwindow(\''+ defaultMetadataUrl + '&id='+temp.layer_uid+'\');'+'"><img src="'+imagedir+'/info.png" /></a>';
-								addNode(parentNode,["wms_"+parent.mb_mapObj[i].wms[ii].wms_id,[temp.layer_title,((metadatalink=='true'&&wmsbuttons != 'true')?('javascript:openwindow(\"'+ defaultMetadataUrl + '&id='+temp.layer_uid+'\");'):"javascript:select("+i+","+ii+","+iii+");"),,,temp.layer_title,eval(c_menu),controls,[i,ii,iii]]],false,false,reverse=="true");
-								parentObj = parentNode+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id;              
-							}
-							if(parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_parent && (handlesublayer=="true"||parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_parent=="0")){
-								var parentLayer = "";
-								var j = iii;
-								while(parent.mb_mapObj[i].wms[ii].objLayer[j].layer_parent!="0"){
-									//find parent
-									for(var jj=0; jj < parent.mb_mapObj[i].wms[ii].objLayer.length; jj++){
-										if(parent.mb_mapObj[i].wms[ii].objLayer[jj].layer_pos==parseInt(parent.mb_mapObj[i].wms[ii].objLayer[j].layer_parent)){
-											j=jj;
-											break;
-										}
-									}
-									parentLayer = "|" + parent.mb_mapObj[i].wms[ii].objLayer[j].layer_id + parentLayer;
-								}
-								if(temp.gui_layer_selectable == '1' || temp.gui_layer_queryable == '1'){
-									var c_menu="[";
-									if(reverse=="true"){
-										if(menu.indexOf("layer_down")!=-1 && iii!=parent.mb_mapObj[i].wms[ii].objLayer.length-1)c_menu+="menu_move_up,";
-										if(menu.indexOf("layer_up")!=-1 && iii!=1)c_menu+="menu_move_down,";
-									}
-									else{
-										if(menu.indexOf("layer_up")!=-1 && iii!=1)c_menu+="menu_move_up,";
-										if(menu.indexOf("layer_down")!=-1 && iii!=parent.mb_mapObj[i].wms[ii].objLayer.length-1)c_menu+="menu_move_down,";
-									}
-									if(menu.indexOf("metainfo")!=-1)c_menu+="menu_metalink,";
-									if(menu.indexOf("zoom")!=-1 && temp.layer_epsg.length>0)c_menu+="menu_zoom,";
-//									if(menu.indexOf("layer_switch")!=-1)c_menu+="menu_layer_switch,";
-//									if(menu.indexOf("info_switch")!=-1)c_menu+="menu_info_switch,";
-									if(menu.indexOf("hide")!=-1)c_menu+="menu_hide";
-									c_menu+="]";
-
-									controls = [];
-									controls.push('<input type="checkbox"  title="' + msgObj.tooltipLayerVisible + '" ');
-									if(temp.layer_name=="")
-										controls.push('style="display:none;" ');
-									if(temp.gui_layer_visible=='1')
-										controls.push('checked ');
-									if(temp.gui_layer_selectable!='1')
-										controls.push('disabled ');
-									controls.push("onclick=\"handleSelectedLayer('"+mod_treeGDE_map+"','"+parent.mb_mapObj[i].wms[ii].wms_id+"','"+temp.layer_name+"','visible',this.checked?1:0);");
-									if(ficheckbox == 'false')
-										controls.push("handleSelectedLayer('"+mod_treeGDE_map+"','"+parent.mb_mapObj[i].wms[ii].wms_id+"','"+temp.layer_name+"','querylayer',this.checked?1:0);");
-									controls.push("handleSelection('"+parentObj+parentLayer+"|"+temp.layer_id+"', 0);");
-									controls.push("updateParent('"+parentObj+parentLayer+"');\" />");
-									if(ficheckbox == 'true'){
-										controls.push('<input type="checkbox" title="' + msgObj.tooltipLayerQuerylayer + '" ');
-										if(temp.gui_layer_querylayer=='1')
-											controls.push('checked ');
-										if(temp.gui_layer_queryable!='1')
-											controls.push('disabled ');
-										controls.push("onclick=\"handleSelectedLayer('"+mod_treeGDE_map+"','"+parent.mb_mapObj[i].wms[ii].wms_id+"','"+temp.layer_name+"','querylayer',this.checked?1:0);");
-										controls.push("handleSelection('"+parentObj+parentLayer+"|"+temp.layer_id+"', 1);\" />");
-								}
-									if(wmsbuttons == 'true'&&metadatalink == 'true'){
-										controls.push('<a href="javascript:openwindow(\''+ defaultMetadataUrl + '&id='+temp.layer_uid+'\');"><img src="'+imagedir+'/info.png" /></a>');
-									}
-									addNode(parentObj + parentLayer, [temp.layer_id,[temp.layer_title,((metadatalink=='true'&&wmsbuttons != 'true')?('javascript:openwindow(\"'+ defaultMetadataUrl + '&id='+temp.layer_uid+'\");'):"javascript:select("+i+","+ii+","+iii+");"),,((c_menu!='[]'&&temp.layer_name!="")?'menu.png':null),temp.layer_title,eval(c_menu),controls.join(""),[i,ii,iii]]],false,false,reverse=="true");
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	init=true;
-}
-
-function initWmsCheckboxen(){
-	var hidden=0;
-	if(parent.mb_mapObj.length > 0){
-		for(var i=0; i<parent.mb_mapObj.length; i++){
-			if(parent.mb_mapObj[i].frameName == mod_treeGDE_map){
-				for(var ii=0; ii<parent.mb_mapObj[i].wms.length; ii++){
-					if(parent.mb_mapObj[i].wms[ii].gui_wms_visible == '1' || parent.mb_mapObj[i].wms[ii].gui_wms_visible == 1){
-						for(var iii=0; iii<parent.mb_mapObj[i].wms[ii].objLayer.length; iii++){
-							var temp = parent.mb_mapObj[i].wms[ii].objLayer[iii];
-							if(parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_parent == ""){
-								updateParent(arrNodes[0][0]+"|"+parent.mb_mapObj[i].wms[ii].wms_id);
-							}
-						}
-					}
-					else if(ii<=parent.parseInt(openfolder)+hidden)
-						hidden++;
-				}
-				closeAll()
-				if(treeState!='')
-					setState(treeState);
-				else if(openfolder!='false')
-					setState(arrNodes[0][0]+"|"+parent.mb_mapObj[i].wms[parent.parseInt(openfolder)+hidden].wms_id);
-			}
-		}
-	}
-}
-//-->
-  </SCRIPT>
-</HEAD>
-<BODY VLINK="#000000" ALINK="#000000" LINK="#000000" BGCOLOR="#ffffff" TEXT="#000000"
- MARGINHEIGHT="0" MARGINWIDTH="0" LEFTMARGIN="0" TOPMARGIN="0">
-<SCRIPT language="JavaScript" type="text/javascript">
-if(wmsbuttons=='true'){
-	document.writeln("<div>");
-	document.writeln('<a href="javascript:move_up()"><img title="'+msgObj.tooltipMoveSelectionUp+'" src="'+imagedir+'/move_up.png" alt="move up" style="position:relative;top:0px;left:0px;"/></a>'); 
-	document.writeln('<a href="javascript:move_down()"><img title="'+msgObj.tooltipMoveSelectionDown+'" src="'+imagedir+'/move_down.png" alt="move down" style="position:relative;top:0px;left:-3px"/></a>'); 
-	document.writeln('<a href="javascript:remove_wms()"><img title="'+msgObj.tooltipRemoveWms+'" src="'+imagedir+'/delete_wms.png" alt="remove wms" style="position:relative;top:0px;left:-6px"/></a>'); 
-	document.writeln("</div>");
-}
-</SCRIPT>
-<DIV id="treeContainer"></DIV>
-</BODY>
-</HTML>

Deleted: trunk/mapbender/http/html/mod_treefolder2_multiple.php
===================================================================
--- trunk/mapbender/http/html/mod_treefolder2_multiple.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/html/mod_treefolder2_multiple.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -1,810 +0,0 @@
-<?php
-# $Id: mod_treefolder2.php 2206 2008-03-07 12:49:17Z nimix $
-# http://www.mapbender.org/index.php/Mod_treefolder2.php
-# Copyright (C) 2007 Melchior Moos
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-/* ***************************************************************************
-About the Statistikportal category hack:
-
-For this application two or more trees of WMS services are desired, whereas 
-each has to come with a different list of services. The IDs of the services 
-are configured at the variable "wms_ids" in the administration GUI.
-*************************************************************************** */
-
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-$gui_id = Mapbender::session()->get("mb_user_gui");
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<HEAD>
-<?php
-echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
-?>
-<TITLE>Treefolder</TITLE>
-<?php
- include '../include/dyn_css.php';
-?>
-<script language='JavaScript'>
-
-function openwindow(Adresse) {
-Fenster1 = window.open(Adresse, "Informationen", "width=500,height=500,left=100,top=100,scrollbars=yes,resizable=no");
-Fenster1.focus();
-}
-</script>
-<script src="../javascripts/jsTree.js" type="text/javascript" language="JavaScript"></script>
-<?php
-echo "<script language='JavaScript'>";
-   $sql = "SELECT e_target FROM gui_element WHERE e_id = $1 AND fkey_gui_id = $2";
-   $v = array($_REQUEST['e_id_css'],Mapbender::session()->get("mb_user_gui"));
-   $t = array('s','s');
-   $res = db_prep_query($sql,$v,$t);
-   $e_target = db_result($res,0,"e_target");
-   echo "var mod_treeGDE_map = '".$e_target."';";
-echo "</script>";
-session_write_close();
-?>
-<SCRIPT language="JavaScript" type="text/javascript">
-
-var msgObj = {};
-msgObj.tooltipHandleWms = '<?php echo _mb("(De)activate this service");?>';
-msgObj.tooltipLayerVisible = '<?php echo _mb("Toggles the visibility of this service");?>';
-msgObj.tooltipLayerQuerylayer = '<?php echo _mb("Toggles the queryability of this service");?>';
-msgObj.tooltipLayerContextMenu = '<?php echo _mb("Opens the layer context menu");?>';
-msgObj.tooltipWmsContextMenu = '<?php echo _mb("Opens the WMS context menu");?>';
-msgObj.tooltipRemoveWms = '<?php echo _mb("Removes the selected WMS");?>';
-msgObj.tooltipMoveSelectionUp = '<?php echo _mb("Moves the selection up");?>';
-msgObj.tooltipMoveSelectionDown = '<?php echo _mb("Moves the selection down");?>';
-
-var jst_container = "document.getElementById('treeContainer')";
-var jst_image_folder = imagedir;
-var jst_display_root = false;
-var defaultTarget = 'examplemain';
-var lock=false;
-var lock_update=false;
-var lock_check=false;
-var selectedMap=-1;
-var selectedWMS=-1;
-var selectedLayer=-1;
-var init=false;
-var errors = 0;
-var state=Array();
-var treeState = "";
-<?php
-
-/* Category hack (begin) */
-if(isset($wms_ids) && !empty($wms_ids)) {
-	echo "var wmsIDs = [" . $wms_ids . "];";
-	$wms_ids = explode(",",$wms_ids);
-}
-else {
-	echo "var wmsIDs = false;";
-	$wms_ids = array();
-}
-/* Category hack (end) */
-
-//load structure
-$sql = "SELECT * FROM gui_treegde WHERE fkey_gui_id = $1 AND NOT lft = 1 ORDER BY lft;";
-$v = array(Mapbender::session()->get("mb_user_gui"));
-$t = array("s");
-$res = db_prep_query($sql, $v, $t);
-
-//init tree converting arrays
-$nr = array(); 			//array for nested sets numbers
-$str = array();			//array for js array elements
-$categories = array();	//array for wms folders
-$path = array();		//stack for actual path elements
-$rights = array();		//stack for rights of open elements
-
-//build javascript data array for jsTree
-while($row = db_fetch_array($res)){
-	
-	/* Category hack (begin) */
-	$wms_ids_db = explode(",",$row["wms_id"]);
-	
-	if(count($wms_ids_db) != count(array_intersect($wms_ids_db,$wms_ids))){
-		continue;
-	}
-	/* Category hack (end) */
-
-	//push javascript array elements to a single array with lefts and rights
-	$left = "['folder_".$row['id']."', ['".$row['my_layer_title']."', 'javascript:_foo()'],[";
-	$right = "]],";
-
-	array_push($nr, $row['lft']);
-	array_push($str, $left);
-	array_push($nr, $row['rgt']);
-	array_push($str, $right);
-
-	//finish all nodes that have no further childs
-	while(count($rights) > 0 && $rights[count($rights)-1]<$row['lft']){
-		array_pop($rights);
-		array_pop($path);
-	}
-
-	//set path for each wms that is referenced in this folder
-	array_push($rights, $row['rgt']);
-	array_push($path, "folder_".$row['id']);
-	if($row['wms_id']!=""){
-		foreach(explode(",",$row['wms_id']) as $wms){
-			array_push($categories, "'wms_".$wms."':\"root_id|".implode("|", $path)."\"");
-		}
-	}
-}
-//if we have a configured structure output it
-if(count($str)>0){
-	//order js array elements
-	array_multisort($nr, $str);
-	
-	//output javascript vars
-	$arrNodesStr = "[['root_id', ['Layer','javascript:_foo()'],[".implode("",$str)."]]];";
-	$arrNodesStr = str_replace(array("[]", ",]"),array("","]"),$arrNodesStr);
-	echo "var arrNodesStr = \"".$arrNodesStr."\";\n";
-	echo "var categories = {".implode(",", $categories)."};\n";
-}
-else{
-//if there is no structure take default
-?>
-var arrNodesStr = "[['root_id', ['Layer','javascript:_foo()']]];";
-var categories = {};
-<?php
-}
-?>
-/*var arrNodesStr = "[['root_id', ['Layer','javascript:_foo()'], [['test1',['Einfach so','javascript:_foo()']],['test2',['Schönes Wetter','javascript:_foo()']],['test3',['Sonstiges','javascript:_foo()']]]]];"
-
-var categories = {"wms_407":arrNodes[0][0]+"|test1","wms_911":arrNodes[0][0]+"|test2", "wms_914":arrNodes[0][0]+"|test2"};
-var arrNodes = [
-  String: node id,
-  [
-    String: title,
-    String: href,
-    String: target,
-    String: image,
-    String: tooltip,
-    Folder definition: node context menu,
-    String: controls
-  ],
-  Folder definition: sub folder
-	]
-*/
-var arrNodes = eval(arrNodesStr);
-function _foo(){selectedMap=-1;selectedWMS=-1;selectedLayer=-1}
-
-// some defaults
-try{if (reverse){}}catch(e){reverse = 'false';}
-try{if (switchwms){}}catch(e){switchwms = 'true';}
-try{if (ficheckbox){}}catch(e){ficheckbox = 'false';}
-try{if (metadatalink){}}catch(e){metadatalink = 'false';}
-try{if (wmsbuttons){}}catch(e){wmsbuttons = 'false';}
-try{if (showstatus){}}catch(e){showstatus = 'false';}
-try{if (alerterror){}}catch(e){alerterror = 'false';}
-try{if (openfolder){}}catch(e){openfolder = 'false';}
-try{if (handlesublayer){}}catch(e){handlesublayer = 'false';}
-try{if (menu){}}catch(e){menu = '';}
-
-//menu elements
-var menu_move_up = ['menu_move_up', ['Nach oben&nbsp;','javascript:var sd = "{@strData}";var ids=eval(sd.substr(0, sd.length-6))[1][7];move_up(ids[0],ids[1],ids[2]);',,'move_up.png']];
-var menu_move_down = ['menu_move_down', ['Nach unten&nbsp;', 'javascript:var sd = "{@strData}";var ids=eval(sd.substr(0, sd.length-6))[1][7];move_down(ids[0],ids[1],ids[2]);',,'move_down.png']];
-var menu_delete = ['menu_delete', ['Enfernen&nbsp;', 'javascript:var sd = "{@strData}";var ids=eval(sd.substr(0, sd.length-6))[1][7];remove_wms(ids[0],ids[1],ids[2]);',,'delete_wms.png']];
-var menu_opacity_up = ['menu_opacity_up', ['Opacity up&nbsp;','javascript:var sd = "{@strData}";var ids=eval(sd.substr(0, sd.length-6))[1][7];opacity_up(ids[0],ids[1],ids[2]);',,'move_up.png']];
-var menu_opacity_down = ['menu_opacity_down', ['Opacity down&nbsp;','javascript:var sd = "{@strData}";var ids=eval(sd.substr(0, sd.length-6))[1][7];opacity_down(ids[0],ids[1],ids[2]);',,'move_down.png']];
-var menu_metalink = ['menu_metalink', ['Information&nbsp;', 'javascript:var sd = "{@strData}";var ids=eval(sd.substr(0, sd.length-6))[1][7];openwindow("../php/mod_layerMetadata.php?id="+parent.mb_mapObj[ids[0]].wms[ids[1]].objLayer[ids[2]].layer_uid);',,'info.png']];
-var menu_zoom = ['menu_zoom', ['Hin zoomen&nbsp;', 'javascript:var sd = "{@strData}";var ids=eval(sd.substr(0, sd.length-6))[1][7];zoomToLayer(ids[0],ids[1],ids[2]);',,'zoom.png']];
-var menu_hide = ['menu_hide', ['Layermenü ausblenden&nbsp;', 'javascript:hideMenu()',,'hide.png']];
-//var menu_wms_switch = ['menu_zoom', ['Zoom&nbsp;', 'javascript:var sd = "{@strData}";eval(eval(sd.substr(0, sd.length-6))[1][1]);openwindow("../php/mod_layerMetadata.php?id="+parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].layer_uid);',,'info.png']];
-//var menu_layer_switch = ['menu_zoom', ['Zjjj&nbsp;', 'javascript:var sd = "{@strData}";eval(eval(sd.substr(0, sd.length-6))[1][1]);openwindow("../php/mod_layerMetadata.php?id="+parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].layer_uid);',,'info.png']];
-//var menu_info_switch = ['menu_zoom', ['Zmn&nbsp;', 'javascript:var sd = "{@strData}";eval(eval(sd.substr(0, sd.length-6))[1][1]);openwindow("../php/mod_layerMetadata.php?id="+parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].layer_uid);',,'info.png']];
-
-parent.eventAfterLoadWMS.register(reloadTree);
-parent.eventInit.register(loadTree);
-if(showstatus=='true'||alerterror=='true'){
-	parent.eventAfterMapRequest.register(init_mapcheck);
-	init_mapcheck();
-}
-parent.eventAfterMapRequest.register(updateScale);
-parent.eventAfterMapRequest.register(updateCheckState);
-
-if(wmsbuttons != "true")
-	jst_highlight = false;
-
-function select(i,ii,iii){
-	//ignore if selected
-	if(selectedMap==i && selectedWMS==ii && selectedLayer==iii)return;
-	if(selectedMap==-1 && selectedWMS==-1 && selectedLayer==-1){
-		selectedMap=i;
-		selectedWMS=ii;
-		selectedLayer=iii;
-		return;
-	}
-	//scalehints
-	var scale = parseInt(parent.mb_mapObj[selectedMap].getScale());
-	if(scale < parseInt(parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].gui_layer_minscale) && parseInt(parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].gui_layer_minscale) != 0){
-		if(selectedLayer==0)
-		   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[selectedMap].wms[selectedWMS].wms_id, '#999999');
-		else
-		   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[selectedMap].wms[selectedWMS].wms_id+"|"+parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].layer_id, '#999999');
-	}
-	else if(scale > parseInt(parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].gui_layer_maxscale) && parseInt(parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].gui_layer_maxscale) != 0){
-		if(selectedLayer==0)
-		   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[selectedMap].wms[selectedWMS].wms_id, '#999999');
-		else
-		   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[selectedMap].wms[selectedWMS].wms_id+"|"+parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].layer_id, '#999999');
-	}
-	else{
-		if(selectedLayer==0)
-		   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[selectedMap].wms[selectedWMS].wms_id, '');
-		else
-		   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[selectedMap].wms[selectedWMS].wms_id+"|"+parent.mb_mapObj[selectedMap].wms[selectedWMS].objLayer[selectedLayer].layer_id, '');
-	}
-
-	selectedMap=i;
-	selectedWMS=ii;
-	selectedLayer=iii;
-}
-
-function updateScale(){
-	if(!init)return;
-	for(var i=0; i<parent.mb_mapObj.length; i++){
-		if(parent.mb_mapObj[i].frameName == mod_treeGDE_map){
-			var scale = parent.mb_mapObj[i].getScale();
-			for(var ii=0; ii<parent.mb_mapObj[i].wms.length; ii++){
-				for(var iii=1; iii<parent.mb_mapObj[i].wms[ii].objLayer.length; iii++){
-					if(scale < parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_minscale) && parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_minscale) != 0){
-						if(iii==0)
-						   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id, '#999999');
-						else
-						   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id+"|"+parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_id, '#999999');
-					}
-					else if(scale > parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_maxscale) && parseInt(parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_maxscale) != 0){
-						if(iii==0)
-						   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id, '#999999');
-						else
-						   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id+"|"+parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_id, '#999999');
-					}
-					else{
-						if(iii==0)
-						   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id, '');
-						else
-						   	setNodeColor(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id+"|"+parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_id, '');
-					}
-				}
-			}
-		}
-	}
-}
-
-function updateCheckState(){
-	if(!init||lock_check)return;
-	lock_check=true;
-	for(var i=0; i<parent.mb_mapObj.length; i++){
-		if(parent.mb_mapObj[i].frameName == mod_treeGDE_map){
-			var scale = parent.mb_mapObj[i].getScale();
-			for(var ii=0; ii<parent.mb_mapObj[i].wms.length; ii++){
-				for(var iii=1; iii<parent.mb_mapObj[i].wms[ii].objLayer.length; iii++){
-					if(!parent.mb_mapObj[i].wms[ii].objLayer[iii].has_childs){
-						path = arrNodes[0][0]+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id+"|"+parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_id;
-						checkNode(path, 0, parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_visible=='1', false);
-						if(ficheckbox == 'true')
-							checkNode(path, 1, parent.mb_mapObj[i].wms[ii].objLayer[iii].gui_layer_querylayer=='1', false);	
-					}
-				}
-			}
-		}
-	}
-	lock_check=false;
-}
-
-function operaLoad(){
-	initArray();
-	renderTree();
-	setTimeout('initWmsCheckboxen();updateScale();',100);
-}
-
-function loadTree(){
-	if(window.opera){
-		setTimeout('operaLoad()',200);
-		return;
-	}
-	initArray();
-	renderTree();
-	initWmsCheckboxen();
-	updateScale();
-}
-
-function reloadTree(){
-	if(!init) return;
-	selectedMap=-1;
-	selectedWMS=-1;
-	selectedLayer=-1;
-	init=false;
-	arrNodes = eval(arrNodesStr)
-	initArray();
-	if(showstatus=='true'||alerterror=='true')
-		init_mapcheck();
-	renderTree();
-	if(window.opera)
-		setTimeout('initWmsCheckboxen();updateScale();',100);
-	else{
-		initWmsCheckboxen();
-		updateScale();
-	}
-}
-
-function imgerror(){
-	var map=parent.getMapObjIndexByName(mod_treeGDE_map);
-	var wms=Number(this.id.substr(4));
-	this.onerror=null;
-	this.onabort=null;
-	if(state[wms]!=-1 && alerterror=='true'){
-		state[wms]=-1;
-		if(confirm('Failed to Load WMS "'+parent.mb_mapObj[map].wms[wms].objLayer[0].layer_title+'" from Server "'+parent.mb_mapObj[map].wms[wms].wms_getmap.substr(0,parent.mb_mapObj[map].wms[wms].wms_getmap.length-1)+'"\nDo you want to try to load it in a new window?')){
-			window.open(this.src,"");
-		}
-	}
-	state[wms]=-1;
-	errors++;
-	if(showstatus=='true')
-		setNodeImage(arrNodes[0][0]+"|wms_"+parent.mb_mapObj[map].wms[wms].wms_id, "error_folder.png");
-}
-
-function checkComplete(wms, map, img, first){
-	var ind=parent.getMapObjIndexByName(mod_treeGDE_map);
-	if(parent.mb_mapObj[ind].wms[wms].mapURL == false || parent.frames[mod_treeGDE_map].document.getElementById(map).complete){
-		if(state[wms]!=-1){
-			for(var i=1;i<parent.mb_mapObj[ind].wms[wms].objLayer.length;i++){
-				if(parent.mb_mapObj[ind].wms[wms].objLayer[i].gui_layer_visible==1){
-					state[wms]=1;
-					if(showstatus=='true')
-						setNodeImage(img);
-					break;
-				}
-			}
-		}
-	}
-	else{
-		if(first){
-			state[wms]=0;
-			parent.frames[mod_treeGDE_map].document.getElementById(map).onerror=imgerror;
-			parent.frames[mod_treeGDE_map].document.getElementById(map).onabort=imgerror;
-			if(showstatus=='true')
-				setNodeImage(img, "loading_folder.gif");
-		}
-
-		if(state[wms]!=-1)
-			setTimeout('checkComplete('+wms+', "'+map+'", "'+img+'");',100);
-	}
-}
-
-//parent.mb_registerWmsLoadErrorFunctions("window.frames['treeGDE'].imgerror();");
-
-function init_mapcheck(){
-	if(!init)return;
-	errors = 0;
-	var ind = parent.getMapObjIndexByName(mod_treeGDE_map);
-	if(!parent.mb_mapObj[ind]||!init){
-		setTimeout("init_mapcheck();",100);
-		return;
-	}
-	for(var wms=0;wms<parent.mb_mapObj[ind].wms.length;wms++){
-		var wmsimgid="map_"+wms;
-		if(parent.frames[mod_treeGDE_map].document.getElementById(wmsimgid)){
-			checkComplete(wms, wmsimgid, arrNodes[0][0]+'|wms_'+parent.mb_mapObj[ind].wms[wms].wms_id, true);
-		}
-	}
-}
-
-function handleSelectedLayer(mapObj,wms_id,layername,type,status){
-	if(lock_update||lock_check)return;
-	var ind = parent.getMapObjIndexByName(mapObj);
-	for(var i=0; i<parent.mb_mapObj[ind].wms.length; i++){
-		if(parent.mb_mapObj[ind].wms[i].wms_id == wms_id){
-			parent.mb_mapObj[ind].wms[i].handleLayer(layername, type, status);
-			break;
-		}
-	}
-}
-
-function zoomToLayer(j,k,l){
-	if(!j&&!k&&!l){
-		j=selectedMap;
-		k=selectedWMS;
-		l=selectedLayer;
-	}
-	var my=parent.mb_mapObj[j].wms[k].objLayer[l].layer_epsg;
-	for (var i=0;i<my.length;i++){
-		if(my[i]["epsg"]==parent.mb_mapObj[j].epsg){
-			parent.mb_calculateExtent(mod_treeGDE_map,my[i]["minx"],my[i]["miny"],my[i]["maxx"],my[i]["maxy"]);
-			var arrayExt = parent.mb_mapObj[j].extent.toString().split(",");
-			parent.mb_repaint(mod_treeGDE_map,arrayExt[0],arrayExt[1],arrayExt[2],arrayExt[3]);
-			break;
-		}
-	}
-}
-
-
-//---begin------------- opacity --------------------
-
-var opacityIncrement = 20;
-
-function opacity_up(j, k, l) {
-	handleOpacity(j, k, opacityIncrement);
-}
-
-function opacity_down(j, k, l) {
-	handleOpacity(j, k, -opacityIncrement);
-}
-
-function handleOpacity(mapObj_id, wms_id, increment) {
-	var opacity = parent.mb_mapObj[mapObj_id].wms[wms_id].gui_wms_mapopacity*100 + increment;
-	parent.mb_mapObj[mapObj_id].wms[wms_id].setOpacity(opacity);
-	reloadTree();
-}
-
-//---end------------- opacity --------------------
-
-function move_up(j,k,l){
-	if(isNaN(j)&&isNaN(k)&&isNaN(l)){
-		j=selectedMap;
-		k=selectedWMS;
-		l=selectedLayer;
-	}
-	if(j==-1||k==-1||l==-1){
-		alert("You have to select the WMS you want to move up!")
-		return;
-	}
-	var lid=parent.mb_mapObj[j].wms[k].objLayer[l].layer_id;
-	if(!parent.mb_mapObj[j].move(parent.mb_mapObj[j].wms[k].wms_id,lid,(reverse=="true")?false:true)){
-		alert("Illegal move operation");
-		return;
-	}
-	treeState = getState();
-	parent.zoom(parent.mb_mapObj[j].frameName, true, 1.0);
-	parent.mb_execloadWmsSubFunctions();
-	//find layer and select
-	for(k=0;k<parent.mb_mapObj[j].wms.length;k++){
-		for(l=0;l<parent.mb_mapObj[j].wms[k].objLayer.length;l++){
-			if(parent.mb_mapObj[j].wms[k].objLayer[l].layer_id==lid){
-				select(j,k,l);
-				if(l!=0)
-					selectNode(String(lid));
-				else
-					selectNode("wms_"+String(parent.mb_mapObj[j].wms[k].wms_id));
-			}
-		}
-	}
-}
-
-function move_down(j,k,l){
-	if(isNaN(j)&&isNaN(k)&&isNaN(l)){
-		j=selectedMap;
-		k=selectedWMS;
-		l=selectedLayer;
-	}
-	if(j==-1||k==-1||l==-1){
-		alert("You have to select the WMS you want to move down!")
-		return;
-	}
-	var lid=parent.mb_mapObj[j].wms[k].objLayer[l].layer_id;
-	if(!parent.mb_mapObj[j].move(parent.mb_mapObj[j].wms[k].wms_id,lid,(reverse=="true")?true:false)){
-		alert("Illegal move operation");
-		return;
-	}
-	treeState = getState();
-	parent.zoom(parent.mb_mapObj[j].frameName, true, 1.0);
-	parent.mb_execloadWmsSubFunctions();
-	//find layer and select
-	for(k=0;k<parent.mb_mapObj[j].wms.length;k++){
-		for(l=0;l<parent.mb_mapObj[j].wms[k].objLayer.length;l++){
-			if(parent.mb_mapObj[j].wms[k].objLayer[l].layer_id==lid){
-				select(j,k,l);
-				if(l!=0)
-					selectNode(String(lid));
-				else
-					selectNode("wms_"+String(parent.mb_mapObj[j].wms[k].wms_id));
-			}
-		}
-	}
-}
-
-function remove_wms(j,k,l){
-	if(isNaN(j)&&isNaN(k)&&isNaN(l)){
-		j=selectedMap;
-		k=selectedWMS;
-		l=selectedLayer;
-	}
-	if(j==-1||k==-1||l==-1){
-		alert("You have to select the WMS you want to delete!")
-		return;
-	}
-	if(l!=0){
-		alert("It is not possible to delete a single layer, please select a WMS!")
-		return;
-	}
-	var visibleWMS=0;
-	for(var i=0;i<parent.mb_mapObj[j].wms.length;i++)
-		if(parent.mb_mapObj[j].wms[i].gui_wms_visible=='1'||parent.mb_mapObj[j].wms[i].gui_wms_visible==1)
-			visibleWMS++;
-	if(visibleWMS<=1){
-		alert ("Last WMS can't be removed.\n(Der letzte WMS kann nicht entfernt werden.)");
-		return;
-	}
-	if(confirm('Are you sure you want to remove "'+parent.mb_mapObj[j].wms[k].objLayer[l].layer_title+'"?')){
-  		parent.mb_mapObjremoveWMS(j,k);
-		parent.zoom(parent.mb_mapObj[j].frameName, true, 1.0);
-		parent.mb_execloadWmsSubFunctions();
-	}
-}
-
-function updateParent(path){
-	if(lock_check)return;
-	var reset_lock=!lock_update;
-	lock_update=true;
-	var state=getChildrenCheckState(path, 0);
-	//enableCheckbox(path, (state!=-1)); //3rd state
-	checkNode(path, 0, (state==1));
-	if(state==0 && showstatus=='true' && path.split(jst_delimiter[0]).length == 2){
-		setTimeout('setNodeImage("'+path+'", "error_folder.png");', 100);
-	}
-	if(reset_lock)
-		lock_update=false;
-}
-
-function handleSelectedWMS(path){
-	if(lock_update)return;
-	var t = path.split("|");
-	var wms_id = t[t.length-1].substr(4);
-	var reset_lock=!lock_check;
-	var ind = parent.getMapObjIndexByName(mod_treeGDE_map);
-	var wms = parent.getWMSIndexById(mod_treeGDE_map,wms_id);
-	var layername = parent.mb_mapObj[ind].wms[wms].objLayer[0].layer_name;
-	var bChk = IsChecked(path, 0);
-	parent.mb_mapObj[ind].wms[wms].handleLayer(layername,"visible",bChk?"1":"0");
-	parent.mb_mapObj[ind].wms[wms].handleLayer(layername,"querylayer",bChk?"1":"0");
-	lock_check=true;
-	checkChildren(path, 0, bChk);
-	if(ficheckbox)checkChildren(path, 1, bChk);
-	if(bChk==false && showstatus=='true')
-		setTimeout('setNodeImage("'+path+'", "error_folder.png");', 100);
-	if(reset_lock)
-	{
-		parent.mb_restateLayers(mod_treeGDE_map,wms_id);
-		parent.setSingleMapRequest(mod_treeGDE_map,wms_id);
-		lock_check=false;
-	}
-}
-
-function handleSelection(path, box){
-	if(lock_update)return;
-	var reset_lock=!lock_check;
-	lock_check=true;
-	var bChk = IsChecked(path, box);	
-//	enableCheckbox(path, 0, true);
-	checkChildren(path, box, bChk);
-	if(reset_lock){
-		//find wms id from path
-		var t = path.split("|");
-		for(var i=1;t[i].indexOf("wms_")!=0;i++){}
-		var wms_id = t[i].substr(4);
-		//set maprequest
-		parent.mb_restateLayers(mod_treeGDE_map,wms_id);
-		if(box==0)
-			parent.setSingleMapRequest(mod_treeGDE_map,wms_id);
-		lock_check=false;
-	}
-}
-
-function layerHasQueryableChild (layerArray, index) {
-	var parentIdArray = [index];
-	for (var i = 0; i < layerArray.length; i++) {
-		var currentLayer = layerArray[i];
-		for (var j = 0; j < parentIdArray.length; j++) {
-			if (currentLayer.layer_parent && parseInt(currentLayer.layer_parent, 10) === parentIdArray[j]) {
-				if (currentLayer.gui_layer_queryable == "1") {
-					return true;
-				}
-				parentIdArray.push(i);
-			}
-		}
-	}
-	return false;
-}
-
-/* Category hack (begin) */
-function checkID(wmsID) {
-	if(!wmsIDs) {
-		return true;
-	}
-	
-	for(var i = 0; i < wmsIDs.length; i++) {
-		if(wmsID == wmsIDs[i]) {
-			return true;
-		}
-	}
-	
-	return false;
-}
-/* Category hack (end) */
-
-function initArray(){
-	var parentObj = "";
-	var controls="";
-	if(parent.mb_mapObj.length > 0){
-		for(var i=0; i<parent.mb_mapObj.length; i++){
-			if(parent.mb_mapObj[i].frameName == mod_treeGDE_map){
-				for(var ii=0; ii<parent.mb_mapObj[i].wms.length; ii++){
-				
-					if(
-						(parent.mb_mapObj[i].wms[ii].gui_wms_visible == '1' || parent.mb_mapObj[i].wms[ii].gui_wms_visible == 1) && 
-						/* Category hack (begin) */
-						checkID(parent.mb_mapObj[i].wms[ii].wms_id)
-						/* Category hack (end) */
-					){
-					
-						for(var iii=0; iii<parent.mb_mapObj[i].wms[ii].objLayer.length; iii++){
-							var temp = parent.mb_mapObj[i].wms[ii].objLayer[iii];
-							if(parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_parent == ""){
-								if(!temp.gui_layer_selectable == '1' && !temp.gui_layer_queryable == '1')
-									continue;
-								parentNode = arrNodes[0][0];
-								if(eval("categories.wms_"+parent.mb_mapObj[i].wms[ii].wms_id) !== undefined)
-									parentNode = eval("categories.wms_"+parent.mb_mapObj[i].wms[ii].wms_id);
-								else
-									eval("categories['wms_"+parent.mb_mapObj[i].wms[ii].wms_id+"'] = parentNode");
-
-								var c_menu="[";
-								if(reverse=="true"){
-									if(menu.indexOf("wms_down")!=-1 && ii!=parent.mb_mapObj[i].wms.length-1)c_menu+="menu_move_up,";
-									if(menu.indexOf("wms_up")!=-1 && parentObj!="")c_menu+="menu_move_down,";
-								}
-								else{
-									if(menu.indexOf("wms_up")!=-1 && parentObj!="")c_menu+="menu_move_up,";
-									if(menu.indexOf("wms_down")!=-1 && ii!=parent.mb_mapObj[i].wms.length-1)c_menu+="menu_move_down,";
-								}
-								if(menu.indexOf("remove")!=-1)c_menu+="menu_delete,";
-//								if(menu.indexOf("wms_switch")!=-1)c_menu+="menu_wms_switch,";
-								if(menu.indexOf("opacity_up")!=-1 && parseFloat(parent.mb_mapObj[i].wms[ii].gui_wms_mapopacity) < 1)c_menu+="menu_opacity_up,";
-								if(menu.indexOf("opacity_down")!=-1 && parseFloat(parent.mb_mapObj[i].wms[ii].gui_wms_mapopacity) > 0)c_menu+="menu_opacity_down,";
-								if(menu.indexOf("hide")!=-1)c_menu+="menu_hide";
-								c_menu+="]";
-								controls='';
-								if(switchwms=='true')controls='<INPUT type="checkbox" title="' + msgObj.tooltipHandleWms + '" checked onclick="handleSelectedWMS(\''+parentNode+'|wms_'+parent.mb_mapObj[i].wms[ii].wms_id+'\');" />';
-								if(wmsbuttons == 'true'&&metadatalink == 'true')controls+='<a href="'+'javascript:openwindow(\''+ defaultMetadataUrl + '&id='+temp.layer_uid+'\');'+'"><img src="'+imagedir+'/info.png" /></a>';
-								addNode(parentNode,["wms_"+parent.mb_mapObj[i].wms[ii].wms_id,[temp.layer_title,((metadatalink=='true'&&wmsbuttons != 'true')?('javascript:openwindow(\"'+ defaultMetadataUrl + '&id='+temp.layer_uid+'\");'):"javascript:select("+i+","+ii+","+iii+");"),,,temp.layer_title,eval(c_menu),controls,[i,ii,iii]]],false,false,reverse=="true");
-								parentObj = parentNode+"|wms_"+parent.mb_mapObj[i].wms[ii].wms_id;              
-							}
-							if(parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_parent && (handlesublayer=="true"||parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_parent=="0")){
-								var parentLayer = "";
-								var j = iii;
-								while(parent.mb_mapObj[i].wms[ii].objLayer[j].layer_parent!="0"){
-									//find parent
-									for(var jj=0; jj < parent.mb_mapObj[i].wms[ii].objLayer.length; jj++){
-										if(parent.mb_mapObj[i].wms[ii].objLayer[jj].layer_pos==parseInt(parent.mb_mapObj[i].wms[ii].objLayer[j].layer_parent)){
-											j=jj;
-											break;
-										}
-									}
-									parentLayer = "|" + parent.mb_mapObj[i].wms[ii].objLayer[j].layer_id + parentLayer;
-								}
-								if(temp.gui_layer_selectable == '1' || temp.gui_layer_queryable == '1'){
-									var c_menu="[";
-									if(reverse=="true"){
-										if(menu.indexOf("layer_down")!=-1 && iii!=parent.mb_mapObj[i].wms[ii].objLayer.length-1)c_menu+="menu_move_up,";
-										if(menu.indexOf("layer_up")!=-1 && iii!=1)c_menu+="menu_move_down,";
-									}
-									else{
-										if(menu.indexOf("layer_up")!=-1 && iii!=1)c_menu+="menu_move_up,";
-										if(menu.indexOf("layer_down")!=-1 && iii!=parent.mb_mapObj[i].wms[ii].objLayer.length-1)c_menu+="menu_move_down,";
-									}
-									if(menu.indexOf("metainfo")!=-1)c_menu+="menu_metalink,";
-									if(menu.indexOf("zoom")!=-1 && temp.layer_epsg.length>0)c_menu+="menu_zoom,";
-//									if(menu.indexOf("layer_switch")!=-1)c_menu+="menu_layer_switch,";
-//									if(menu.indexOf("info_switch")!=-1)c_menu+="menu_info_switch,";
-									if(menu.indexOf("hide")!=-1)c_menu+="menu_hide";
-									c_menu+="]";
-									
-									controls = [];
-									controls.push('<input type="checkbox"  title="' + msgObj.tooltipLayerVisible + '" ');
-									if(temp.layer_name=="")
-										controls.push('style="display:none;" ');
-									if(temp.gui_layer_visible=='1')
-										controls.push('checked ');
-									if(temp.gui_layer_selectable!='1')
-										controls.push('disabled ');
-									controls.push("onclick=\"handleSelectedLayer('"+mod_treeGDE_map+"','"+parent.mb_mapObj[i].wms[ii].wms_id+"','"+temp.layer_name+"','visible',this.checked?1:0);");
-									if(ficheckbox == 'false')
-										controls.push("handleSelectedLayer('"+mod_treeGDE_map+"','"+parent.mb_mapObj[i].wms[ii].wms_id+"','"+temp.layer_name+"','querylayer',this.checked?1:0);");
-									controls.push("handleSelection('"+parentObj+parentLayer+"|"+temp.layer_id+"', 0);");
-									controls.push("updateParent('"+parentObj+parentLayer+"');\" />");
-									if(ficheckbox == 'true'){
-										controls.push('<input type="checkbox" title="' + msgObj.tooltipLayerQuerylayer + '" ');
-										if(temp.gui_layer_querylayer=='1')
-											controls.push('checked ');
-										if(temp.gui_layer_queryable!='1' && !layerHasQueryableChild(parent.mb_mapObj[i].wms[ii].objLayer, iii))
-											controls.push('disabled ');
-										controls.push("onclick=\"handleSelectedLayer('"+mod_treeGDE_map+"','"+parent.mb_mapObj[i].wms[ii].wms_id+"','"+temp.layer_name+"','querylayer',this.checked?1:0);");
-										controls.push("handleSelection('"+parentObj+parentLayer+"|"+temp.layer_id+"', 1);\" />");
-									}
-									if(wmsbuttons == 'true'&&metadatalink == 'true'){
-										controls.push('<a href="javascript:openwindow(\'../php/mod_layerMetadata.php?id='+temp.layer_uid+'\');"><img src="'+imagedir+'/info.png" /></a>');
-									}
-
-									//////////////special for Statistikportal with window.open for SLD Editor//////////
-									if(temp.layer_name.match(/bevoelkerungdichte_/)){
-										controls.push('<a style="cursor:pointer;" ');
-										var sldUrl = '../x_kosis/sldEditor.php?wms_id='+parent.mb_mapObj[i].wms[ii].wms_id+'&layer_id='+temp.layer_id+'&layer_name='+temp.layer_name+'&layer_title='+temp.layer_title;
-										controls.push('href="javascript:var sldEditorWindow = window.open(\''+sldUrl+'\', \'SLDEditor\', \'width=600, height=400, status=no, scrollbars=no, resizable=no, screenX=100, screenY=50\');');
-										controls.push('sldEditorWindow.focus();">');  
-										controls.push('<img src="'+imagedir+'/openSldEditor.png" />&nbsp;</a>');
-										addNode(parentObj + parentLayer, [temp.layer_id,[temp.layer_title,((metadatalink=='true'&&wmsbuttons != 'true')?('javascript:openwindow(\"../php/mod_layerMetadata.php?id='+temp.layer_uid+'\");'):"javascript:select("+i+","+ii+","+iii+");"),,((c_menu!='[]'&&temp.layer_name!="")?'menu.png':null),temp.layer_title,eval(c_menu),controls.join(""),[i,ii,iii]]],false,false,reverse=="true");
-										continue;
-									}
-									////////////end of special//////////////////////////////////////////
-
-									addNode(parentObj + parentLayer, [temp.layer_id,[temp.layer_title,((metadatalink=='true'&&wmsbuttons != 'true')?('javascript:openwindow(\"../php/mod_layerMetadata.php?id='+temp.layer_uid+'\");'):"javascript:select("+i+","+ii+","+iii+");"),,((c_menu!='[]'&&temp.layer_name!="")?'menu.png':null),temp.layer_title,eval(c_menu),controls.join(""),[i,ii,iii]]],false,false,reverse=="true");
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	init=true;
-}
-
-function initWmsCheckboxen(){
-	var hidden=0;
-	if(parent.mb_mapObj.length > 0){
-		for(var i=0; i<parent.mb_mapObj.length; i++){
-			if(parent.mb_mapObj[i].frameName == mod_treeGDE_map){
-				for(var ii=0; ii<parent.mb_mapObj[i].wms.length; ii++){
-					if(parent.mb_mapObj[i].wms[ii].gui_wms_visible == '1' || parent.mb_mapObj[i].wms[ii].gui_wms_visible == 1){
-						for(var iii=0; iii<parent.mb_mapObj[i].wms[ii].objLayer.length; iii++){
-							var temp = parent.mb_mapObj[i].wms[ii].objLayer[iii];
-							if(parent.mb_mapObj[i].wms[ii].objLayer[iii].layer_parent == ""){
-								updateParent(arrNodes[0][0]+"|"+parent.mb_mapObj[i].wms[ii].wms_id);
-							}
-						}
-					}
-					else if(ii<=parent.parseInt(openfolder)+hidden)
-						hidden++;
-				}
-				closeAll()
-				if(treeState!='')
-					setState(treeState);
-				else if(openfolder!='false')
-					setState(arrNodes[0][0]+"|"+parent.mb_mapObj[i].wms[parent.parseInt(openfolder)+hidden].wms_id);
-			}
-		}
-	}
-}
-//-->
-  </SCRIPT>
-</HEAD>
-<BODY VLINK="#000000" ALINK="#000000" LINK="#000000" TEXT="#000000"
- MARGINHEIGHT="0" MARGINWIDTH="0" LEFTMARGIN="0" TOPMARGIN="0">
-<SCRIPT language="JavaScript" type="text/javascript">
-if(wmsbuttons=='true'){
-	document.writeln("<div>");
-	document.writeln('<a href="javascript:move_up()"><img title="'+msgObj.tooltipMoveSelectionUp+'" src="'+imagedir+'/move_up.png" alt="move up" style="position:relative;top:0px;left:0px;"/></a>'); 
-	document.writeln('<a href="javascript:move_down()"><img title="'+msgObj.tooltipMoveSelectionDown+'" src="'+imagedir+'/move_down.png" alt="move down" style="position:relative;top:0px;left:-3px"/></a>'); 
-	document.writeln('<a href="javascript:remove_wms()"><img title="'+msgObj.tooltipRemoveWms+'" src="'+imagedir+'/delete_wms.png" alt="remove wms" style="position:relative;top:0px;left:-6px"/></a>'); 
-	document.writeln("</div>");
-}
-</SCRIPT>
-<DIV id="treeContainer"></DIV>
-</BODY>
-</HTML>

Modified: trunk/mapbender/http/javascripts/jsTree.js
===================================================================
--- trunk/mapbender/http/javascripts/jsTree.js	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/jsTree.js	2010-08-02 13:52:19 UTC (rev 6673)
@@ -695,16 +695,16 @@
 	//TODO find a proper solution for this
 	var treeGDE = jst_cm.parentNode.parentNode;
 	if(treeGDE.id=="treeGDE"){
-		offX -= parseInt(treeGDE.style.left);
-		offY -= parseInt(treeGDE.style.top);
+		offX -= parseInt(treeGDE.style.left, 10);
+		offY -= parseInt(treeGDE.style.top, 10);
 		if(treeGDE.scrollTop)
 			offY += treeGDE.scrollTop;
 		if(treeGDE.scrollLeft)
 			offX += treeGDE.scrollLeft;
 	}
 	
-	jst_cm.style.top = offY + event.clientY
-	jst_cm.style.left = offX + event.clientX
+	jst_cm.style.top = (offY + event.clientY) + "px";
+	jst_cm.style.left = (offX + event.clientX) + "px";
 	jst_cm.style.visibility = ""
 	
 	event.cancelBubble = true

Modified: trunk/mapbender/http/javascripts/mod_box1.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_box1.js	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/mod_box1.js	2010-08-02 13:52:19 UTC (rev 6673)
@@ -105,8 +105,8 @@
 	
 	var arrangeBox = function (node, left, top, right, bottom) {
 		var el = node.style;
-		el.height = Math.abs(bottom - top);
-		el.width = Math.abs(right - left);
+		el.height = Math.abs(bottom - top) + "px";
+		el.width = Math.abs(right - left) + "px";
 		el.top = top + "px";
 		el.left = left + "px";
 	};

Modified: trunk/mapbender/http/javascripts/mod_dependentDiv.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_dependentDiv.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/mod_dependentDiv.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -32,7 +32,7 @@
 function mod_dependentDiv(){
 	var obj = document.getElementById(mod_dependentDiv_target).style;
 	var thisObj = document.getElementById('dependentDiv').style; 
-	thisObj.left = parseInt(obj.left) + dependentDiv_offsetLeft;
-	thisObj.top = parseInt(obj.top) + parseInt(obj.height) +  dependentDiv_offsetTop;
-	thisObj.width = parseInt(obj.width) + (2*dependentDiv_offsetTop);
+	thisObj.left = (parseInt(obj.left, 10) + dependentDiv_offsetLeft) + "px";
+	thisObj.top = (parseInt(obj.top, 10) + parseInt(obj.height, 10) +  dependentDiv_offsetTop) + "px";
+	thisObj.width = (parseInt(obj.width, 10) + (2*dependentDiv_offsetTop)) + "px";
 }

Deleted: trunk/mapbender/http/javascripts/mod_dependentIframe.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_dependentIframe.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/mod_dependentIframe.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -1,34 +0,0 @@
-<?php
-# $Id$
-# http://www.mapbender.org/index.php/mod_dependentIframe.php
-# Copyright (C) 2002 CCGIS 
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-echo "var mod_dependentIframe_target = '".$e_target[0]."';";
-?>
-mod_dependentIframe_offsetLeft = 10;
-mod_dependentIframe_offsetTop = 10;
-
-parent.mb_registerSubFunctions("mod_dependentIframe()");
-
-function mod_dependentIframe(){
-	var obj = document.getElementById(mod_dependentIframe_target).style;
-	var thisObj = document.getElementById('dependentIframe').style; 
-	thisObj.left = parseInt(obj.left) + parseInt(obj.width) + mod_dependentIframe_offsetLeft;
-	thisObj.top = parseInt(obj.top) - mod_dependentIframe_offsetTop;
-	thisObj.height = parseInt(obj.height) + (2*mod_dependentIframe_offsetTop);
-}
\ No newline at end of file

Modified: trunk/mapbender/http/javascripts/mod_digitize_tab.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_digitize_tab.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/mod_digitize_tab.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -846,8 +846,8 @@
 		// replace basepoint by transparent blob
 		basepointObject.style.width = mod_digitize_width;
 		basepointObject.style.height = mod_digitize_height;
-		basepointObject.style.left = 0;
-		basepointObject.style.top = 0;
+		basepointObject.style.left = "0px";
+		basepointObject.style.top = "0px";
 			
 		if (parent.ie) {
 			// ie cannot handle backgroundColor = 'transparent'

Modified: trunk/mapbender/http/javascripts/mod_dragMapSize.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_dragMapSize.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/mod_dragMapSize.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -32,14 +32,14 @@
 });
 
 function mod_dragMapSize_arrange(){
-	var left = parseInt(document.getElementById(mod_dragMapSize_target).style.left) + 
-				parseInt(document.getElementById(mod_dragMapSize_target).style.width) + 
+	var left = parseInt(document.getElementById(mod_dragMapSize_target).style.left, 10) + 
+				parseInt(document.getElementById(mod_dragMapSize_target).style.width, 10) + 
 				mod_dragMapSize_offset - 
-				(parseInt(document.getElementById('dragMapSize').style.width)/2);
-	var top = parseInt(document.getElementById(mod_dragMapSize_target).style.top) + 
-				parseInt(document.getElementById(mod_dragMapSize_target).style.height) + 
+				(parseInt(document.getElementById('dragMapSize').style.width, 10)/2);
+	var top = parseInt(document.getElementById(mod_dragMapSize_target).style.top, 10) + 
+				parseInt(document.getElementById(mod_dragMapSize_target).style.height, 10) + 
 				mod_dragMapSize_offset - 
-				(parseInt(document.getElementById('dragMapSize').style.height)/2);
+				(parseInt(document.getElementById('dragMapSize').style.height, 10)/2);
 	mb_arrangeElement('','dragMapSize' , left, top);
 }
 
@@ -75,13 +75,13 @@
 		mouseCatcher.setAttribute("id", "dragMapSize_helper");
 		mouseCatcher.style.position = "absolute";
 		mouseCatcher.style.cursor = "move";
-		mouseCatcher.style.width = 500;
-		mouseCatcher.style.height = 500;
+		mouseCatcher.style.width = "500px";
+		mouseCatcher.style.height = "500px";
 		mouseCatcher.style.zIndex = 160;
 		if($.browser.msie)
 			mouseCatcher.style.background = "url(../img/transparent.gif)"; 
-		mouseCatcher.style.left=clickX-250;
-		mouseCatcher.style.top=clickY-250;
+		mouseCatcher.style.left=(clickX-250) + "px";
+		mouseCatcher.style.top=(clickY-250) + "px";
 		
 		return false;
 	}

Modified: trunk/mapbender/http/javascripts/mod_featureInfoRedirect.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_featureInfoRedirect.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/mod_featureInfoRedirect.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -58,14 +58,14 @@
 	var newWin = document.getElementById("FeatureInfoRedirect").style;
 	var mapframe = document.getElementById("mapframe1").style;
 
-	newWin.left = parseInt(mapframe.left) + parseInt(mapframe.width) + leftOffset;
-	newWin.top = parseInt(mapframe.top) - borderOffset;
-	newWin.width = width;
-	newWin.height = parseInt(mapframe.height) + 2 * borderOffset;
+	newWin.left = (parseInt(mapframe.left, 10) + parseInt(mapframe.width, 10) + leftOffset) + "px";
+	newWin.top = (parseInt(mapframe.top, 10) - borderOffset) + "px";
+	newWin.width = width + "px";
+	newWin.height = (parseInt(mapframe.height, 10) + 2 * borderOffset) + "px";
 
 	var resWin = window.frames["FeatureInfoRedirect"].document.getElementsByTagName("iframe");
 
 	for(var i=0; i<resWin.length; i++){
-		resWin[i].style.height = parseInt(newWin.height) / resWin.length;
+		resWin[i].style.height = (parseInt(newWin.height, 10) / resWin.length) + "px";
 	}
 }
\ No newline at end of file

Modified: trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -78,7 +78,6 @@
 }
 
 function mod_featureInfoTunnel_event(e){
-	//mod_featureInfoTunnel_map.getDomElement().ownerDocument.getElementById('permanent').style.left;
 	eventBeforeFeatureInfo.trigger({"fName":mod_featureInfoTunnel_target});
 	
 	//create progress wheel element

Modified: trunk/mapbender/http/javascripts/mod_georss.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_georss.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/mod_georss.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -145,8 +145,8 @@
 	actFrame = georssTargetArray[0];
 	
 	//Get Mapframe Position
-	x=parseInt(document.getElementById(actFrame).style.left);
-	y=parseInt(document.getElementById(actFrame).style.top);
+	x=parseInt(document.getElementById(actFrame).style.left, 10);
+	y=parseInt(document.getElementById(actFrame).style.top, 10);
 	
 	x=0;
 	y=0;

Modified: trunk/mapbender/http/javascripts/mod_help.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_help.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/mod_help.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -53,10 +53,10 @@
 	var usemapHtml = "";
 	for (var module in Mapbender.modules) {
 		var currentModule = Mapbender.modules[module];
-		var top = parseInt(currentModule.top) || 0;
-		var left = parseInt(currentModule.left) || 0;
-		var width = parseInt(currentModule.width) || 0;
-		var height = parseInt(currentModule.height) || 0;
+		var top = parseInt(currentModule.top, 10) || 0;
+		var left = parseInt(currentModule.left, 10) || 0;
+		var width = parseInt(currentModule.width, 10) || 0;
+		var height = parseInt(currentModule.height, 10) || 0;
 		
 		if (!currentModule.url) {
 			continue;
@@ -139,12 +139,12 @@
 			var tab = $("#tabs_" + module).get(0);
 			if (tab) {
 				var area = $("#helpArea_" + module).get(0);			
-				var top = parseInt(tab.style.top);
-				var left = parseInt(tab.style.left);
-				var width = parseInt(tab.style.width);
-				var height = parseInt(tab.style.height);
-				var lly = parseInt(top-height);
-				var urx = parseInt(left+width);
+				var top = parseInt(tab.style.top, 10);
+				var left = parseInt(tab.style.left, 10);
+				var width = parseInt(tab.style.width, 10);
+				var height = parseInt(tab.style.height, 10);
+				var lly = parseInt(top-height, 10);
+				var urx = parseInt(left+width, 10);
 				area.coords = left + "," + lly + "," + urx + "," + top;
 			}
 		}

Modified: trunk/mapbender/http/javascripts/mod_horizTabs.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_horizTabs.js	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/mod_horizTabs.js	2010-08-02 13:52:19 UTC (rev 6673)
@@ -45,10 +45,10 @@
 
 			//set element to right position
 			$("#"+options.id).css({position:"absolute",
-				left:parseInt(this.style.left),
-				top:parseInt(this.style.top)+this.tab_height,
-				width:$(this).width(),
-				height:$(this).height()-this.tab_height,
+				left:parseInt(this.style.left, 10) + "px",
+				top:(parseInt(this.style.top, 10)+this.tab_height) + "px",
+				width:$(this).width() + "px",
+				height:($(this).height()-this.tab_height) + "px",
 				zIndex:parseInt(this.style.zIndex+1)})
 			//and hide it
 			.hide();

Modified: trunk/mapbender/http/javascripts/mod_initWmc.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_initWmc.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/mod_initWmc.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -87,8 +87,8 @@
 			$js_kml .= "meetingPointLogoTag.write(meetingPointLogoText);\n";
 			$js_kml .= "var meeting_img = window.frames['".$e_target[0]."'].document.getElementById('meeting_img');";
 			$js_kml .= "meeting_img.style.position = 'absolute';";
-			$js_kml .= "meeting_img.style.top = myPoint.y;";
-			$js_kml .= "meeting_img.style.left = myPoint.x;";
+			$js_kml .= "meeting_img.style.top = myPoint.y + 'px';";
+			$js_kml .= "meeting_img.style.left = myPoint.x + 'px';";
 			$js_kml .= "mb_registerPanSubElement('meeting_logo');";
 		}
 	}

Modified: trunk/mapbender/http/javascripts/mod_legend.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_legend.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/mod_legend.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -108,7 +108,7 @@
 		var obj = parent.document.getElementById("legend");
 	
 		if(stickylegend == 'true'){
-			obj.style.left = parseInt(parent.mb_mapObj[ind].width) + mod_legend_target_left + mod_legend_offsetLeft;
+			obj.style.left = (parseInt(parent.mb_mapObj[ind].width) + mod_legend_target_left + mod_legend_offsetLeft) + "px";
 		}
 	
 		if(document.forms[0].sw.checked ==  false){

Modified: trunk/mapbender/http/javascripts/mod_navFrame.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_navFrame.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/mod_navFrame.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -91,32 +91,32 @@
 function  mod_navFrame_arrange(){
 	var el = document.getElementById(mod_navFrame_target).style;
 	var ext = mod_navFrame_ext;
-	var myLeft = parseInt(el.left);
-	var myTop = parseInt(el.top);
-	var myWidth = parseInt(el.width);
-	var myHeight = parseInt(el.height);
+	var myLeft = parseInt(el.left, 10);
+	var myTop = parseInt(el.top, 10);
+	var myWidth = parseInt(el.width, 10);
+	var myHeight = parseInt(el.height, 10);
 	
 	//left,top,width,height
 	mod_navFrame_pos("mbN_"+mod_navFrame_id,(myLeft),(myTop - ext),(myWidth),(ext));
-	document.getElementById("arrow_n_"+mod_navFrame_id).style.left = myWidth/2 - document.getElementById("arrow_n_"+mod_navFrame_id).width/2;   
+	document.getElementById("arrow_n_"+mod_navFrame_id).style.left = (myWidth/2 - parseInt(document.getElementById("arrow_n_"+mod_navFrame_id).width, 10)/2) + "px";   
 	mod_navFrame_pos("mbNE_"+mod_navFrame_id,(myLeft + myWidth),(myTop - ext),(ext),(ext));
 	mod_navFrame_pos("mbE_"+mod_navFrame_id,(myLeft + myWidth),(myTop),(ext),(myHeight));
-	document.getElementById("arrow_e_"+mod_navFrame_id).style.top = myHeight/2 - document.getElementById("arrow_n_"+mod_navFrame_id).height/2;
+	document.getElementById("arrow_e_"+mod_navFrame_id).style.top = (myHeight/2 - parseInt(document.getElementById("arrow_n_"+mod_navFrame_id).height, 10)/2) + "px";
 	mod_navFrame_pos("mbSE_"+mod_navFrame_id,(myLeft + myWidth),(myTop + myHeight),(ext),(ext));
 	mod_navFrame_pos("mbS_"+mod_navFrame_id,(myLeft),(myTop + myHeight),(myWidth),(ext));
-	document.getElementById("arrow_s_"+mod_navFrame_id).style.left = myWidth/2 - document.getElementById("arrow_s_"+mod_navFrame_id).width/2;
+	document.getElementById("arrow_s_"+mod_navFrame_id).style.left = (myWidth/2 - parseInt(document.getElementById("arrow_s_"+mod_navFrame_id).width, 10)/2) + "px";
 	mod_navFrame_pos("mbSW_"+mod_navFrame_id,(myLeft - ext),(myTop + myHeight),(ext),(ext));
 	mod_navFrame_pos("mbW_"+mod_navFrame_id,(myLeft - ext),(myTop),(ext),(myHeight));
-	document.getElementById("arrow_w_"+mod_navFrame_id).style.top = myHeight/2 - document.getElementById("arrow_w_"+mod_navFrame_id).height/2;
+	document.getElementById("arrow_w_"+mod_navFrame_id).style.top = (myHeight/2 - parseInt(document.getElementById("arrow_w_"+mod_navFrame_id).height, 10)/2) + "px";
 	mod_navFrame_pos("mbNW_"+mod_navFrame_id,(myLeft - ext),(myTop -ext),(ext),(ext));   
 }
 function mod_navFrame(val){
 	mb_panMap(mod_navFrame_target,val);  
 }
 function mod_navFrame_pos(el,left,top,width,height){
-	document.getElementById(el).style.left = left;
-	document.getElementById(el).style.top = top;
-	document.getElementById(el).style.width = width;
-	document.getElementById(el).style.height = height;
+	document.getElementById(el).style.left = left + "px";
+	document.getElementById(el).style.top = top + "px";
+	document.getElementById(el).style.width = width + "px";
+	document.getElementById(el).style.height = height + "px";
 }
 }());

Modified: trunk/mapbender/http/javascripts/mod_tooltip.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_tooltip.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/mod_tooltip.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -224,8 +224,8 @@
 	if(isFirstResult()){
 		//calculate Position
 		
-		x=point.x+parseInt(document.getElementById(tooltipTarget).style.left);
-		y=point.y+parseInt(document.getElementById(tooltipTarget).style.top);
+		x=point.x+parseInt(document.getElementById(tooltipTarget).style.left, 10);
+		y=point.y+parseInt(document.getElementById(tooltipTarget).style.top, 10);
 		
 		//hide old Popup
 		if(tooltipWin&&tooltipWin.isVisible())

Modified: trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -165,8 +165,8 @@
 			var currentDiv = document.createElement("div");
 			currentDiv.id = buttonWfs_id[i]+"Div";
 			currentDiv.style.position = "absolute";
-			currentDiv.style.left = buttonWfs_x[i]
-			currentDiv.style.top = buttonWfs_y[i];
+			currentDiv.style.left = buttonWfs_x[i] + "px";
+			currentDiv.style.top = buttonWfs_y[i] + "px";
 			currentDiv.style.zIndex = buttonWfs_zIndex;
 
 			var currentImg = document.createElement("img");

Modified: trunk/mapbender/http/javascripts/popup.js
===================================================================
--- trunk/mapbender/http/javascripts/popup.js	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/popup.js	2010-08-02 13:52:19 UTC (rev 6673)
@@ -165,7 +165,7 @@
  */
 mb_popup.prototype.setTop = function(topp){
 	var div=document.getElementById(this.id);
-	if(div)div.style.top=topp;
+	if(div)div.style.top=topp + "px";
 }
 
 /**

Modified: trunk/mapbender/http/javascripts/popupballon.js
===================================================================
--- trunk/mapbender/http/javascripts/popupballon.js	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/popupballon.js	2010-08-02 13:52:19 UTC (rev 6673)
@@ -165,7 +165,7 @@
  */
 mb_popup.prototype.setTop = function(topp){
 	var div=document.getElementById(this.id);
-	if(div)div.style.top=topp;
+	if(div)div.style.top=topp + "px";
 }
 
 /**

Modified: trunk/mapbender/http/javascripts/usemap.js
===================================================================
--- trunk/mapbender/http/javascripts/usemap.js	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/javascripts/usemap.js	2010-08-02 13:52:19 UTC (rev 6673)
@@ -62,8 +62,8 @@
 			}
 			//set Usemap Image dimensions
 			actualImage.style.zIndex = this.zIndex;
-			actualImage.style.width = mb_mapObj[actualMapObj].width;
-			actualImage.style.height = mb_mapObj[actualMapObj].height;
+			actualImage.style.width = mb_mapObj[actualMapObj].width + "px";
+			actualImage.style.height = mb_mapObj[actualMapObj].height + "px";
 			actualImage.style.left = mb_mapObj[actualMapObj].getDomElement().style.left;
 			actualImage.style.top = mb_mapObj[actualMapObj].getDomElement().style.top;
 			

Modified: trunk/mapbender/http/php/mod_treefolderAdmin.php
===================================================================
--- trunk/mapbender/http/php/mod_treefolderAdmin.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/php/mod_treefolderAdmin.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -408,11 +408,11 @@
 
   function setyLayer(layerName, y) {
     if (isDOM)
-      document.getElementById(layerName).style.top=y
+      document.getElementById(layerName).style.top=y + "px"
     else if (isDomIE)
-      document.all[layerName].style.top=y;
+      document.all[layerName].style.top=y + "px";
     else if (isDomNN)
-      document.layers[layerName].top=y;
+      document.layers[layerName].top=y + "px";
   }
 
   var id2treeIndex = new Array()

Modified: trunk/mapbender/http/php/mod_treefolderClient.php
===================================================================
--- trunk/mapbender/http/php/mod_treefolderClient.php	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/http/php/mod_treefolderClient.php	2010-08-02 13:52:19 UTC (rev 6673)
@@ -520,11 +520,11 @@
 
   function setyLayer(layerName, y) {
     if (isDOM)
-      document.getElementById(layerName).style.top=y
+      document.getElementById(layerName).style.top=y + "px";
     else if (isDomIE)
-      document.all[layerName].style.top=y;
+      document.all[layerName].style.top=y + "px";
     else if (isDomNN)
-      document.layers[layerName].top=y;
+      document.layers[layerName].top=y + "px";
   }
 
   var id2treeIndex = new Array()

Modified: trunk/mapbender/lib/customTreeModel.js
===================================================================
--- trunk/mapbender/lib/customTreeModel.js	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/lib/customTreeModel.js	2010-08-02 13:52:19 UTC (rev 6673)
@@ -290,7 +290,9 @@
 			command:"getWmsByApplication",
 			parameters: {
 				"applicationId": anApplicationId
-			}
+			},
+			"sessionName": Mapbender.sessionName ? Mapbender.sessionName : parent.Mapbender.sessionName,
+			"sessionId": Mapbender.sessionId ? Mapbender.sessionId : parent.Mapbender.sessionId
 		};				
 
 		$.post("../php/mod_customTree_server.php", {
@@ -370,7 +372,9 @@
 			command:"getCustomTreeByApplication",
 			parameters: {
 				"applicationId":applicationName
-			}
+			},
+			"sessionName": Mapbender.sessionName ? Mapbender.sessionName : parent.Mapbender.sessionName,
+			"sessionId": Mapbender.sessionId ? Mapbender.sessionId : parent.Mapbender.sessionId
 		};				
 
 		$.post("../php/mod_customTree_server.php", {

Modified: trunk/mapbender/lib/saveButton.js
===================================================================
--- trunk/mapbender/lib/saveButton.js	2010-08-02 10:09:51 UTC (rev 6672)
+++ trunk/mapbender/lib/saveButton.js	2010-08-02 13:52:19 UTC (rev 6673)
@@ -10,10 +10,10 @@
 		$(".collection").children().each(function() {
 			data.push({
 				id:this.id,
-				top:parseInt(this.style.top),
-				left:parseInt(this.style.left),
-				width:parseInt(this.style.width),
-				height:parseInt(this.style.height)	
+				top:parseInt(this.style.top, 10),
+				left:parseInt(this.style.left, 10),
+				width:parseInt(this.style.width, 10),
+				height:parseInt(this.style.height, 10)	
 			});
 		});
 		var queryObj = {



More information about the Mapbender_commits mailing list