Fixed problems with excel report generation.

[fa-stable.git] / reporting / prn_redirect.php

diff --git a/reporting/prn_redirect.php b/reporting/prn_redirect.php
index f99a2d4df351574765d927f2560a2d18f1e60897..9d9ac858d67a6aa58ad7e57d544c2660ac303104 100644 (file)
--- a/reporting/prn_redirect.php
+++ b/reporting/prn_redirect.php
@@ -14,12 +14,12 @@
        print button in reporting module. 
 */
 $path_to_root = "..";
-global $page_security;
+global $page_security, $save_report_selections;
 $page_security = 'SA_OPEN';    // this level is later overriden in rep file
 include_once($path_to_root . "/includes/session.inc");
 
 if (isset($save_report_selections) && $save_report_selections > 0 && isset($_POST['REP_ID'])) {        // save parameters from Report Center
-       for($i=0; $i<10; $i++) { // 2010-10-06 Joe Hunt
+       for($i=0; $i<12; $i++) { // 2013-01-16 Joe Hunt
                if (isset($_POST['PARAM_'.$i]) && !is_array($_POST['PARAM_'.$i])) {
                        $rep = $_POST['REP_ID'];
                        setcookie("select[$rep][$i]", $_POST['PARAM_'.$i], time()+60*60*24*$save_report_selections); // days from $save_report_selections
@@ -27,10 +27,10 @@ if (isset($save_report_selections) && $save_report_selections > 0 && isset($_POS
        }
 }      
 
-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-Disposition: attachment; filename=$filename" );
@@ -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'];