Improved entropy for report file urls.

[fa-stable.git] / reporting / includes / excel_report.inc

diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc
index 7d1379b43676d9bb45929b6173ac95cfed7ad060..c6f0d4436039b97519644a57e94f08c915baae3d 100644 (file)
--- a/reporting/includes/excel_report.inc
+++ b/reporting/includes/excel_report.inc
@@ -61,7 +61,8 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 
        function FrontReport($title, $filename, $size = 'A4', $fontsize = 9, $orientation = 'P', $margins = NULL, $excelColWidthFactor = 6.5)
        {
-               global $dateseps, $page_security;
+               global $SysPrefs, $page_security;
+
                if (!$_SESSION["wa_current_user"]->can_access_page($page_security))
                {
                        display_error(_("The security settings on your account do not permit you to print this report"));
@@ -80,10 +81,9 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
                $rtl = ($_SESSION['language']->dir == 'rtl');
                $this->code = strtolower($_SESSION['language']->encoding);
                $this->filename = $filename.".xls";
-               $this->unique_name = uniqid('').".xls";
+               $this->unique_name = random_id().".xls";
                $this->path = company_path(). '/pdf_files';
                $this->Spreadsheet_Excel_Writer_Workbook($this->path."/".$this->unique_name);
-               //$this->setCountry(48);
                if ($this->code != "iso-8859-1")
                        $this->setVersion(8); // set biff version to 8 (0x0006 internal)
                $this->sheet =& $this->addWorksheet($this->worksheetNameGenerator($this->title));
@@ -99,7 +99,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
                $this->formatTitle->setTopColor('gray');
 
                $how = user_date_format();
-               $sep = $dateseps[user_date_sep()];
+               $sep = $SysPrefs->dateseps[user_date_sep()];
                if ($sep == '.')
                        $sep = "\\.";
                if ($how == 0)
@@ -197,10 +197,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
        {
                if (!isset($this->formatAmount[$dec]))
                {
-                       //global $thoseps,$decseps;
                        $dec = (int)$dec;
-                       //$tsep = $thoseps[user_tho_sep()];
-                       //$dsep = $decseps[user_dec_sep()];
                        $tsep = ',';
                        $dsep = '.';
                        $format = "###{$tsep}###{$tsep}###{$tsep}##0";
@@ -225,7 +222,6 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
        function Info($params, $cols, $headers, $aligns,
                $cols2 = null, $headers2 = null, $aligns2 = null)
        {
-               global $app_title, $version, $power_by, $power_url;
                $this->company = get_company_prefs();
                $year = get_current_fiscalyear();
                if ($year['closed'] == 0)
@@ -695,6 +691,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 
        function End($email=0, $subject='')
        {
+               global $path_to_root;
                ++$this->y;
                for ($i = 0; $i < $this->numcols; $i++)
                        $this->sheet->writeBlank($this->y, $i, $this->formatFooter);
@@ -720,4 +717,3 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
        }
 }
 
-?>
\ No newline at end of file