[Mapbender-commits] r5108 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2009-12-10 04:37:37 -0500 (Thu, 10 Dec 2009)
New Revision: 5108

Modified:
   trunk/mapbender/http/php/mod_download.php
Log:
filename

Modified: trunk/mapbender/http/php/mod_download.php
===================================================================
--- trunk/mapbender/http/php/mod_download.php	2009-12-10 09:33:35 UTC (rev 5107)
+++ trunk/mapbender/http/php/mod_download.php	2009-12-10 09:37:37 UTC (rev 5108)
@@ -5,12 +5,12 @@
 $download = array();
 
 $download["dir"]  = "../tmp/";
-$download["file"] = basename(trim($_REQUEST["download"]));
-if (!preg_match("/^[a-zA-Z0-9_-]+(\.[a-zA-Z0-9]+)$/", $download["file"]) 
-	|| !file_exists($download["dir"] . $download["file"])) {
+$filename = basename(trim($_REQUEST["download"]));
+if (!preg_match("/^[a-zA-Z0-9_-]+(\.[a-zA-Z0-9]+)$/", $filename) 
+	|| !file_exists($download["dir"] . $filename)) {
 	die("Invalid filename.");
 }
-$download["file"] = $download["dir"] . $download["file"];
+$download["file"] = $download["dir"] . $filename;
 
 if(!(bool)$download["file"]) {
 	die("No filename given.");
@@ -24,9 +24,6 @@
 	die("An error occured.");
 }
 
-$filename = $download["file"];
-
-
 header("Pragma: private");
 header("Cache-control: private, must-revalidate");
 header("Content-Type: x-type/subtype");