Additional access control related ui helpers added: check_edit_access, access_post...

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

diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc
index 7356da84c3188944cd321901d7a9f496ca59512c..f139ba836465caa053f39ee787d1316b95341c25 100644 (file)
--- a/reporting/includes/excel_report.inc
+++ b/reporting/includes/excel_report.inc
@@ -29,6 +29,8 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
        var $bottomMargin = 0;
        var $lineHeight;
        var $leftMargin = 0;
+       var $pageWidth;         // dummy
+       var $rightMargin;       // dummy
 
        var $cols;
        var $params;
@@ -59,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"));
@@ -70,7 +73,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
                $this->title = $title;
                $this->lineHeight = 12;
                $this->endLine = 760;
-               $this->fontSize = $fontsize;
+               $this->SetFontSize($fontsize);
                $this->oldFontSize = 0;
                $this->y = 0;
                $this->currency = '';
@@ -97,7 +100,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)
@@ -214,11 +217,15 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
        function Font($fontname = '', $style = 'normal')
        {
        }
+       
+       function SetFontSize($size)
+       {
+               $this->fontSize = $size;
+       }
 
        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)
@@ -558,7 +565,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
        {
                if (!$conv)
                        $txt = date2sql($txt);
-               list($year, $mo, $day) = explode("-", $txt);    
+               list($year, $mo, $day) = explode("-", $txt);
                $date = $this->ymd2date((int)$year, (int)$mo, (int)$day);
                $this->sheet->writeNumber($this->y, $c, $date, $this->formatDate);
        }
@@ -686,8 +693,9 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
                return ($px / $unit_offset_length);
        }       
 
-       function End($email=0, $subject=null, $myrow=null, $doctype = 0)
+       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);
@@ -707,9 +715,9 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
                        }
                        closedir($d);
                }
-               meta_forward($_SERVER['PHP_SELF'], "xls=1&filename=$this->filename&unique=$this->unique_name");
+
+               meta_forward($path_to_root.'/reporting/prn_redirect.php', "xls=1&filename=$this->filename&unique=$this->unique_name");
                exit();
        }
 }
 
-?>
\ No newline at end of file