[Mapbender-commits] r8381 - branches/2.7/http/print trunk/mapbender/http/print

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2012-06-18 01:40:29 -0700 (Mon, 18 Jun 2012)
New Revision: 8381

Modified:
   branches/2.7/http/print/mod_printPDF_pdf.php
   trunk/mapbender/http/print/mod_printPDF_pdf.php
Log:
urldecode for getMap requests (for urlencoded layer names)

Modified: branches/2.7/http/print/mod_printPDF_pdf.php
===================================================================
--- branches/2.7/http/print/mod_printPDF_pdf.php	2012-06-18 08:16:07 UTC (rev 8380)
+++ branches/2.7/http/print/mod_printPDF_pdf.php	2012-06-18 08:40:29 UTC (rev 8381)
@@ -66,7 +66,7 @@
 $size = $_REQUEST["size"];
 $format = $_REQUEST["format"];
 $map_scale = $_REQUEST["map_scale"];
-$overview_url = $_REQUEST["overview_url"];
+$overview_url = urldecode($_REQUEST["overview_url"]);
 $epsg = $_REQUEST["epsg"];
 if($overview_url=='false'){
 	$overview = false;	
@@ -140,10 +140,10 @@
 $border = 0.8 * $DPC;
 
 if($matching == true){
-   $urls = preg_replace($pattern,$replacement,$_REQUEST["map_url"]);  
+   $urls = preg_replace($pattern,$replacement,urldecode($_REQUEST["map_url"]));  
 }
 else{
-   $urls = $_REQUEST["map_url"];
+   $urls = urldecode($_REQUEST["map_url"]);
 }
 
 

Modified: trunk/mapbender/http/print/mod_printPDF_pdf.php
===================================================================
--- trunk/mapbender/http/print/mod_printPDF_pdf.php	2012-06-18 08:16:07 UTC (rev 8380)
+++ trunk/mapbender/http/print/mod_printPDF_pdf.php	2012-06-18 08:40:29 UTC (rev 8381)
@@ -66,7 +66,7 @@
 $size = $_REQUEST["size"];
 $format = $_REQUEST["format"];
 $map_scale = $_REQUEST["map_scale"];
-$overview_url = $_REQUEST["overview_url"];
+$overview_url = urldecode($_REQUEST["overview_url"]);
 $epsg = $_REQUEST["epsg"];
 if($overview_url=='false'){
 	$overview = false;	
@@ -140,10 +140,10 @@
 $border = 0.8 * $DPC;
 
 if($matching == true){
-   $urls = preg_replace($pattern,$replacement,$_REQUEST["map_url"]);  
+   $urls = preg_replace($pattern,$replacement,urldecode($_REQUEST["map_url"]));  
 }
 else{
-   $urls = $_REQUEST["map_url"];
+   $urls = urldecode($_REQUEST["map_url"]);
 }