[Mapbender-commits] r9892 - trunk/mapbender/http/classes

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2018-03-26 08:43:55 -0700 (Mon, 26 Mar 2018)
New Revision: 9892

Modified:
   trunk/mapbender/http/classes/class_wms.php
Log:
Fix layer_name comparison - be case sensitive!

Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php	2018-03-26 13:47:37 UTC (rev 9891)
+++ trunk/mapbender/http/classes/class_wms.php	2018-03-26 15:43:55 UTC (rev 9892)
@@ -1178,7 +1178,7 @@
      		$old_value    = NULL;
   		foreach ($raw_array as $key => $value) {
         		if ($value === NULL) { continue; }
-        		if (strcasecmp($old_value, $value) === 0) {
+        		if (strcmp($old_value, $value) === 0) {
             			$dupes[$old_key]    = $old_value;
             			$dupes[$key]        = $value;
         		}
@@ -1687,7 +1687,7 @@
 					$str .= "parent.";
 				}
 				$str .= "wms_addLayerStyle('".$this->objLayer[$i]->layer_style[$j]["name"].
-					"', '".$this->objLayer[$i]->layer_style[$j]["title"].
+					"', '".addslashes($this->objLayer[$i]->layer_style[$j]["title"]).
 					"', ".$j.
 					",".$i.
 					",'".$this->objLayer[$i]->layer_style[$j]["legendurl"].
@@ -1800,7 +1800,7 @@
 				if($parent){
 				 echo "parent.";
 				}
-				print("wms_addLayerStyle('".$this->objLayer[$i]->layer_style[$j]["name"]."', '".$this->objLayer[$i]->layer_style[$j]["title"]."', ".$j.",".$i.",'".$this->objLayer[$i]->layer_style[$j]["legendurl"]."', '".$this->objLayer[$i]->layer_style[$j]["legendurlformat"]."');");
+				print("wms_addLayerStyle('".$this->objLayer[$i]->layer_style[$j]["name"]."', '".addslashes($this->objLayer[$i]->layer_style[$j]["title"])."', ".$j.",".$i.",'".$this->objLayer[$i]->layer_style[$j]["legendurl"]."', '".$this->objLayer[$i]->layer_style[$j]["legendurlformat"]."');");
 			}
 			//2016 - new for dimension (time and elevation)
 			for($j=0; $j<count($this->objLayer[$i]->layer_dimension);$j++){