X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fprn_redirect.php;h=d5fe9cf6f9467881da80053f42b20ebe41028599;hb=d25e06f889d2c81871fcb6edb42e53e2ea316601;hp=b6f1959f1ae279b57eed269e0d27f4e521461e55;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git

diff --git a/reporting/prn_redirect.php b/reporting/prn_redirect.php
index b6f1959f..d5fe9cf6 100644
--- a/reporting/prn_redirect.php
+++ b/reporting/prn_redirect.php
@@ -27,12 +27,12 @@ if (user_save_report_selections() > 0 && isset($_POST['REP_ID'])) {	// save para
 	}
 }	
 
-if (isset($_GET['xls']))
+if (isset($_GET['xls']) || isset($_GET['xml']))
 {
 	$filename = $_GET['filename'];
-	$unique_name = preg_replace('/[^0-9a-z.]/i', '', $_GET['unique']);
+	$unique_name = preg_replace('/[^0-9_a-z.\-]/i', '', $_GET['unique']);
 	$path =  company_path(). '/pdf_files/';
-	header("Content-type: application/vnd.ms-excel");
+	header("Content-type: ". (isset($_GET['xls']) ? "application/vnd.ms-excel" : "text/xml"));
 	header("Content-Disposition: attachment; filename=$filename" );
 	header("Expires: 0");
 	header("Cache-Control: must-revalidate, post-check=0,pre-check=0");
@@ -40,20 +40,7 @@ if (isset($_GET['xls']))
 	echo file_get_contents($path.$unique_name);
 	exit();
 }
-elseif (isset($_GET['xml']))
-{
-	$filename = $_GET['filename'];
-	$unique_name = preg_replace('/[^0-9a-z.]/i', '', $_GET['unique']);
-	$path =  company_path(). '/pdf_files/';
-	header("content-type: text/xml");
-	header("Content-Disposition: attachment; filename=$filename");
-	header("Expires: 0");
-	header("Cache-Control: must-revalidate, post-check=0,pre-check=0");
-	header("Pragma: public");
-	echo file_get_contents($path.$unique_name);
-	exit();
-}
-	
+
 if (!isset($_POST['REP_ID'])) {	// print link clicked
 	$def_pars = array(0, 0, '', '', 0, '', '', 0); //default values
 	$rep = $_POST['REP_ID'] = $_GET['REP_ID'];