svn commit: r208 - trunk/mapbender/http/javascripts/mod_legend.php

vera_schulze at osgeo.org vera_schulze at osgeo.org
Tue May 9 09:26:02 EDT 2006


Author: vera_schulze
Date: 2006-05-09 13:26:01+0000
New Revision: 208

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

Log:
Code cleaning, 2 db_prep_query, some comments left

Modified: trunk/mapbender/http/javascripts/mod_legend.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/javascripts/mod_legend.php?view=diff&rev=208&p1=trunk/mapbender/http/javascripts/mod_legend.php&p2=trunk/mapbender/http/javascripts/mod_legend.php&r1=207&r2=208
==============================================================================
--- trunk/mapbender/http/javascripts/mod_legend.php	(original)
+++ trunk/mapbender/http/javascripts/mod_legend.php	2006-05-09 13:26:01+0000
@@ -1,4 +1,6 @@
 <?php
+# $Id: mod_legend.php 73 2006-04-18 10:45:53Z
+# http://www.mapbender.org/index.php/mod_legend.php
 # Copyright (C) 2005 CCGIS / terrestris 
 #
 # This program is free software; you can redistribute it and/or modify
@@ -34,17 +36,23 @@
 <?php
 include '../include/dyn_css.php';
 
-$sql = "SELECT DISTINCT e_target, e_width, e_height FROM gui_element WHERE e_id = '".$_REQUEST["e_id_css"]."' AND fkey_gui_id = '".$gui_id."'";
-$res = db_query($sql);
+$sql = "SELECT DISTINCT e_target, e_width, e_height FROM gui_element WHERE e_id = '".$_REQUEST["e_id_css"]."' AND fkey_gui_id = $1";
+$v = array($gui_id);
+$t = array('s');
+$res = db_prep_query($sql, $v, $t);
 $cnt = 0;
 while($row = db_fetch_array($res)){    
-   $e_target = $row["e_target"];
-   $cnt++;
+	$e_target = $row["e_target"];
+	$cnt++;
+}
+if($cnt > 1){
+	echo "alert('legend: ID not unique!');";
 }
-if($cnt > 1){ echo "alert('legend: ID not unique!');";}
 #target position, with and height...
-$sql2 = "SELECT e_left,e_top,e_width,e_height FROM gui_element WHERE e_id = '".$e_target."' AND fkey_gui_id = '".$gui_id."'";
-$res2 = db_query($sql2);
+$sql2 = "SELECT e_left,e_top,e_width,e_height FROM gui_element WHERE e_id = '".$e_target."' AND fkey_gui_id = $1";
+$v = array($gui_id);
+$t = array('s');
+$res2 = db_prep_query($sql2, $v, $t);
 echo "<script type='text/javascript'>\n";
 echo "var mod_legend_target = '".$e_target."';\n";
 echo "var mod_legend_target_left = ".db_result($res2,0,"e_left").";\n";
@@ -63,61 +71,61 @@
 	if (checkbox_on_off){}
 }
 catch(e){
-    checkbox_on_off = 'false';
+	checkbox_on_off = 'false';
 }
 
 try{
 	if (stickylegend){}
 }
 catch(e){
-    stickylegend = 'false';
+	stickylegend = 'false';
 }
 
 parent.mb_registerSubFunctions("window.frames['legend'].mod_legend_pos()");
 
 
 function mod_legend_init(){
-		var obj = parent.document.getElementById("legend");
-		obj.style.top = mod_legend_target_top  + mod_legend_offsetTop;
-		obj.style.left = mod_legend_target_left + mod_legend_target_width + mod_legend_offsetLeft; 
-		var checkobj = document.getElementById("checkboxstyle");
-		if (checkbox_on_off == 'false'){
-			checkobj.style.visibility = "hidden";
-			checkobj.style.width = 0;
-			checkobj.style.height = 0;
-		}
+	var obj = parent.document.getElementById("legend");
+	obj.style.top = mod_legend_target_top  + mod_legend_offsetTop;
+	obj.style.left = mod_legend_target_left + mod_legend_target_width + mod_legend_offsetLeft; 
+	var checkobj = document.getElementById("checkboxstyle");
+	if (checkbox_on_off == 'false'){
+		checkobj.style.visibility = "hidden";
+		checkobj.style.width = 0;
+		checkobj.style.height = 0;
+	}
 }
 function mod_legend_repaint(obj){
-  var checkobj = document.getElementById("checkboxstyle");
-  if(checkobj.style.visibility == "visible"){
+	var checkobj = document.getElementById("checkboxstyle");
+	if(checkobj.style.visibility == "visible"){
 		mod_legend_pos();     
-   }
+	}
 }
 function mod_legend_pos(){
 	var ind = parent.getMapObjIndexByName(mod_legend_target);
 	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;
 	}
-	
+
 	if(document.forms[0].sw.checked ==  false){
 		parent.writeTag("legend", "leg", "");
 		return true;
 	}
-    
+
 	var layers;
 	var str = "";
-    
-    //str += "<a href='' title='Legende anzeigen' target='_blank'>Legende</a>";
-    
+
+	//str += "<a href='' title='Legende anzeigen' target='_blank'>Legende</a>";
+
 	for(var i=0; i<parent.mb_mapObj[ind].wms.length; i++){
    		var img_format = parent.mb_mapObj[ind].wms[i].gui_wms_mapformat;
 		if(parent.mb_mapObj[ind].wms[i].wms_getlegendurl != ""){
-		
+
 			//header
 			layers = parent.mb_checkScale(mod_legend_target,ind,i);
-			
+
 			if(layers[0] != ""){
 				if (showwmstitle == 'true'){
 					str += "<span class='header'>" +parent.mb_mapObj[ind].wms[i].wms_title+ "</span>";
@@ -126,71 +134,68 @@
 				var titles = layers[2].split(",");
 				var legendurl = layers[3].split(",");
 				var layerparent= layers[4].split(",");
-        		var tmp_name = "";
-        		
-        		
-        		
+				var tmp_name = "";
+
 				for(var j=0; j<layer.length; j++){
-				
-		    		var l = parent.mb_getchildsbyname(ind,i,layer[j]);
-    	    
-		    		//str += "test:"+ layer[j]+"/"+titles[j]+"<br>";
-		    		// handle grouped layers
-				 	if (l) {
-				 		if (showlayertitle == 'true'){				
-				  			str += "<div><span class='titles'>" + titles[j]+ "</span></div>";
-				  		}
-          				for (var k=0; k<l["name"].length; k++){
-          					if (l["legendurl"][k]!='' && l["legendurl"][k]!=0){
-					 			if (tmp_name != l["title"][k]) {
-					 				if (showgroupedlayertitle == 'true'){				
-				  						str += "<div><span class='titles'>" +l["title"][k]+ "</span></div>";
-				  					}
-				 	  				str += "<div>";
-				 	  				if(legendlink == 'true'){
-                                		str += "<a href='../php/result.php?lingo=deutsch&layer="+layer[j]+l["name"][k]+"' class='legendlink' title='Zeigt Liste zum Thema: "+titles[j]+"' target='result'>";
-                                	}
-                                	str += "<img border=0 src = '";			
-					  				str += l["legendurl"][k];
-					  				str += "'></img>";		
-					  				//str += l["legendurl"][k];
-					  				if (legendlink == 'true'){
-                                		str += "</a>";
-                                	}
-                                	str += "</div>"; 
+					var l = parent.mb_getchildsbyname(ind,i,layer[j]);
+
+					//str += "test:"+ layer[j]+"/"+titles[j]+"<br>";
+					// handle grouped layers
+					if (l){
+						if (showlayertitle == 'true'){				
+							str += "<div><span class='titles'>" + titles[j]+ "</span></div>";
+						}
+						for (var k=0; k<l["name"].length; k++){
+							if (l["legendurl"][k]!='' && l["legendurl"][k]!=0){
+								if (tmp_name != l["title"][k]){
+									if (showgroupedlayertitle == 'true'){				
+										str += "<div><span class='titles'>" +l["title"][k]+ "</span></div>";
+									}
+									str += "<div>";
+									if(legendlink == 'true'){
+										str += "<a href='../php/result.php?lingo=deutsch&layer="+layer[j]+l["name"][k]+"' class='legendlink' title='Zeigt Liste zum Thema: "+titles[j]+"' target='result'>";
+									}
+									str += "<img border=0 src = '";			
+									str += l["legendurl"][k];
+									str += "'></img>";		
+									//str += l["legendurl"][k];
+									if (legendlink == 'true'){
+										str += "</a>";
+									}
+									str += "</div>"; 
 									tmp_name = l["title"][k];
-					 			}	// if
-					 		} // if legendurl
-         				 } // for var k=0
-         			} // if (l)         
-         			else {
-         				if (legendurl[j]!='' && legendurl[j]!=0){
-         					if(layerparent[j] == 0){
-	         					if(showlayertitle == 'true'){
+								}	// if
+							} // if legendurl
+						} // for var k=0
+					} // if (l)         
+					else{
+						if (legendurl[j]!='' && legendurl[j]!=0){
+							if(layerparent[j] == 0){
+								if(showlayertitle == 'true'){
 									str += "<div><span class='titles'>" + titles[j]+ "</span></div>";
 								}
 								str += "<div>";
-	                        	if(legendlink == 'true'){
-	                        		str += "<a href='../php/result.php?lingo=deutsch&layer="+layer[j]+"' class='link_metadata' title='Zeigt Liste zum Thema: "+titles[j]+"' target='result'>";
-	                        	}
-	                        	str += "<img border=0 src = '";			
+								if(legendlink == 'true'){
+									str += "<a href='../php/result.php?lingo=deutsch&layer="+layer[j]+"' class='link_metadata' title='Zeigt Liste zum Thema: "+titles[j]+"' target='result'>";
+								}
+								str += "<img border=0 src = '";			
 								str += legendurl[j];
 								//str += parent.mb_mapObj[ind].wms[i].wms_getlegendurl + "&format=image/png&REQUEST=getlegendgraphic&VERSION=1.1.1&SERVICE=WMS&layer=";
 								str += "'></img>";
-							
+
 								//str += "legend:"+legendurl[j];
 								if (legendlink == 'true'){
-	                        		str += "</a>";
-	                        	}
-	                        	str += "</div>";
-                        	}//layerparent
-                        } // legendurl[j]!='' && legendurl[j]!=0
+									str += "</a>";
+								}
+								str += "</div>";
+							}//layerparent
+						} // legendurl[j]!='' && legendurl[j]!=0
 					} // else
 				}// for
 			} // if (layers[0...       
 		}     // if (parent.mb_mapObj[ind].wms[i].wms_getlegendurl != "")
 	}// for
-    
+
 	if(str != ""){
 		parent.writeTag("legend", "leg", str);
 		//prompt('',str);




More information about the Mapbender_commits mailing list