X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=115fa929d24ab9a34469ed9bffab0707fba42b7d;hb=59840905a38c4e08e5b13fdb7af71ea6dea7b1f0;hp=744e92bfcbe56a86955efcbb23c7f84ccd0eddaa;hpb=6966df3f27be9638976f4ba3767ef69e432f4381;p=fa-stable.git
diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 744e92bf..115fa929 100644
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -3,7 +3,9 @@
$page_security = 8;
//include_once($path_to_root . "reporting/includes/class.pdf.inc");
include_once(dirname(__FILE__)."/class.pdf.inc");
+include_once(dirname(__FILE__)."/printer_class.inc");
include_once($path_to_root . "admin/db/company_db.inc");
+include_once($path_to_root . "admin/db/printers_db.inc");
include_once($path_to_root . "config.php");
class FrontReport extends Cpdf
{
@@ -278,12 +280,12 @@ class FrontReport extends Cpdf
function SetDrawColor($r, $g, $b)
{
- $this->setStrokeColor($r / 255, $g / 255, $b / 255);
+ $this->setStrokeColor($r, $g, $b);
}
function SetTextColor($r, $g, $b)
{
- TCPDF::SetTextColor($r / 255, $g / 255, $b / 255);
+ TCPDF::SetTextColor($r, $g, $b);
}
function Text($c, $txt, $n=0, $corr=0, $r=0)
@@ -355,13 +357,11 @@ class FrontReport extends Cpdf
function End($email=0, $subject=null, $myrow=null, $doctype = 0)
{
- global $go_debug, $path_to_root, $comp_path;
+ global $pdf_debug, $path_to_root, $comp_path;
- if ($go_debug == 1)
+ if ($pdf_debug == 1)
{
- $buf = $this->Output();
- $len = strlen($buf);
- $pdfcode = $buf;
+ $pdfcode = $this->Output('','S');
$pdfcode = str_replace("\n", "\n
", htmlspecialchars($pdfcode));
echo '
';
echo trim($pdfcode);
@@ -376,18 +376,17 @@ class FrontReport extends Cpdf
}
else
{
- $buf = $this->Output();
- $len = strlen($buf);
+
$dir = $comp_path.'/'.user_company(). '/pdf_files';
//save the file
if (!file_exists($dir))
{
mkdir ($dir,0777);
}
- $fname = $dir . '/' . $this->filename;
- $fp = fopen($fname,'w');
- fwrite($fp,$buf);
- fclose($fp);
+ // do not use standard filenames or your sensitive company data
+ // are world readable
+ $fname = $dir.'/'.uniqid('').'.pdf';
+ $this->Output($fname, 'F');
if ($email == 1)
{
$emailtype = true;
@@ -448,36 +447,57 @@ class FrontReport extends Cpdf
}
else
{
- //echo '
- //
- //
- //
- //
- // click here if you are not re-directed.
- //
- // ';
- header('Content-type: application/pdf');
- header("Content-Disposition: inline; filename=$this->filename");
- header('Expires: 0');
- header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
- header('Pragma: public');
- $this->Stream();
-
+ $printer = get_report_printer(user_print_profile(), $_POST['REP_ID']);
+ if ($printer == false) {
+ if(in_ajax()) {
+ global $Ajax;
+
+ if (user_rep_popup())
+ $Ajax->popup($fname); // when embeded pdf viewer used
+ else
+ $Ajax->redirect($fname); // otherwise use faster method
+ } else {
+ //echo '
+ //
+ //
+ //
+ //
+ // click here if you are not re-directed.
+ //
+ // ';
+ header('Content-type: application/pdf');
+ header("Content-Disposition: inline; filename=$this->filename");
+ header('Expires: 0');
+ header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+ header('Pragma: public');
+ $this->Stream();
+ }
+ } else { // send report to network printer
+ $prn = new remote_printer($printer['queue'],$printer['host'],
+ $printer['port'], $printer['timeout']);
+ $error = $prn->print_file($fname);
+ if ($error)
+ display_error($error);
+ else
+ display_notification(_('Report has been sent to network printer ').$printer['name']);
+ }
}
- // also have a look through the directory, and remove the files that are older than a week
- // rather want to save 'em
- /*if ($d = @opendir($dir)) {
+ // first have a look through the directory,
+ // and remove old temporary pdfs
+ if ($d = @opendir($dir)) {
while (($file = readdir($d)) !== false) {
- // then check to see if this one is too old
+ if (!is_file($dir.'/'.$file) || $file == 'index.php') continue;
+ // then check to see if this one is too old
$ftime = filemtime($dir.'/'.$file);
- if (time()-$ftime > 3600*24*7){
+ // seems 3 min is enough for any report download, isn't it?
+ if (time()-$ftime > 180){
unlink($dir.'/'.$file);
}
}
closedir($d);
- }*/
+ }
}
}
}