[Mapbender-commits] r6694 - trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-08-05 10:24:54 +0000 (Thu, 05 Aug 2010)
New Revision: 6694

Modified:
   trunk/mapbender/http/javascripts/mod_highlightPOI.php
   trunk/mapbender/http/javascripts/mod_setPOI2Scale.php
Log:
added addslashes for correct escaping

correct z-Index

Modified: trunk/mapbender/http/javascripts/mod_highlightPOI.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_highlightPOI.php	2010-08-05 10:24:11 UTC (rev 6693)
+++ trunk/mapbender/http/javascripts/mod_highlightPOI.php	2010-08-05 10:24:54 UTC (rev 6694)
@@ -71,9 +71,9 @@
 
 function mod_highlightPOI_init(){
 		var myPOI = "<?php if (CHARSET == 'UTF-8'){
-				echo preg_replace("/\n/", "<br>", Mapbender::session()->get("mb_myPOI"));
+				echo addslashes(preg_replace("/\n/", "<br>", Mapbender::session()->get("mb_myPOI")));
 			}else{
-				echo preg_replace("/\n/", "<br>", utf8_decode(Mapbender::session()->get("mb_myPOI")));
+				echo addslashes(preg_replace("/\n/", "<br>", utf8_decode(Mapbender::session()->get("mb_myPOI"))));
 			} 
 			?>";
 
@@ -133,8 +133,7 @@
 		$div.css({
 			position: "absolute",
 			top: "0px",
-			left: "0px",
-			zIndex: 20
+			left: "0px"
 		});
 		map_el.appendChild($div.get(0));
 	}
@@ -143,9 +142,9 @@
 	for (var i = 0; i < mod_highlightPOI_params.length; i = i + 3) {
 		var pointFromUrl = new Point(parseFloat(mod_highlightPOI_params[i+1]), parseFloat(mod_highlightPOI_params[i+2]));
 		var pos = mapObject.convertRealToPixel(pointFromUrl);
-		tagSource += "<div style='z-index:13;position:absolute;left:"+(pos.x-Math.round(0.5*poi_width))+"px;top:"+(pos.y-Math.round(0.5*poi_height))+"px'>";
+		tagSource += "<div style='z-index:105;position:absolute;left:"+(pos.x-Math.round(0.5*poi_width))+"px;top:"+(pos.y-Math.round(0.5*poi_height))+"px'>";
 		tagSource += "<img src='"+poi_image+"'>";
-		tagSource += "<span style='"+poi_style+"'>"+mod_highlightPOI_params[i]+"</span>";
+		tagSource += "<div class='ui-widget-content ui-corner-all' style='padding:3px'><span style='white-space:nowrap;'>"+mod_highlightPOI_params[i].replace("\n", "<br>")+"</span></div>";
 		tagSource += "</div>";
 	}
 	$("#" + mapObject.elementName + "_permanent").html(tagSource);

Modified: trunk/mapbender/http/javascripts/mod_setPOI2Scale.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_setPOI2Scale.php	2010-08-05 10:24:11 UTC (rev 6693)
+++ trunk/mapbender/http/javascripts/mod_setPOI2Scale.php	2010-08-05 10:24:54 UTC (rev 6694)
@@ -36,7 +36,7 @@
 
 function mod_setPOI2Scale(){
 	var my_target = mod_setPOI2Scale_target.split(",");
-	var myPOI = "<?php echo Mapbender::session()->get("mb_myPOI2SCALE") ?>";
+	var myPOI = "<?php echo addslashes(Mapbender::session()->get("mb_myPOI2SCALE")); ?>";
 	if(myPOI && myPOI != ""){
 		var coord = myPOI.split(",");
 		if(coord.length == 2){