lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix odt as PDF generation

Browse Source
This commit is contained in:
fhenry 2013-04-22 12:08:35 +02:00
parent d6514e1cd6
commit e6f9c567d9
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/includes/odtphp/odf.php
View File

@ -459,7 +459,8 @@ IMG;
$name=str_replace('.odt', '', $name); $name=str_replace('.odt', '', $name);
$command = DOL_DOCUMENT_ROOT.'/includes/odtphp/odt2pdf.sh '.$name; $command = DOL_DOCUMENT_ROOT.'/includes/odtphp/odt2pdf.sh '.$name;
//dol_syslog('$execmethod='.$execmethod.' Run command='.$command);
dol_syslog(get_class($this).'::exportAsAttachedPDF $execmethod='.$execmethod.' Run command='.$command,LOG_DEBUG);
if ($execmethod == 1) if ($execmethod == 1)
{ {
exec($command, $output_arr, $retval); exec($command, $output_arr, $retval);
@ -486,16 +487,16 @@ IMG;
if($retval == 0) if($retval == 0)
{ {
//dol_syslog(get_class($this).'::exportAsAttachedPDF $ret_val='.$retval, LOG_DEBUG); dol_syslog(get_class($this).'::exportAsAttachedPDF $ret_val='.$retval, LOG_DEBUG);
if (headers_sent($filename, $linenum)) { if (headers_sent($filename, $linenum)) {
throw new OdfException("headers already sent ($filename at $linenum)"); throw new OdfException("headers already sent ($filename at $linenum)");
} }
if (!empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { /*if (!empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
header('Content-type: application/pdf'); header('Content-type: application/pdf');
header('Content-Disposition: attachment; filename="'.$name.'.pdf"'); header('Content-Disposition: attachment; filename="'.$name.'.pdf"');
readfile("$name.pdf"); readfile("$name.pdf");
} }*/
unlink("$name.odt"); unlink("$name.odt");
} else { } else {
//dol_syslog(get_class($this).'::exportAsAttachedPDF $ret_val='.$retval, LOG_DEBUG); //dol_syslog(get_class($this).'::exportAsAttachedPDF $ret_val='.$retval, LOG_DEBUG);

2
htdocs/includes/odtphp/odt2pdf.sh
View File

@ -6,7 +6,7 @@ then
pgrep -U `id -u` soffice pgrep -U `id -u` soffice
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
soffice -headless -accept="socket,host=127.0.0.1,port=8100;urp;" -nofirststartwizard soffice --invisible --accept="socket,host=127.0.0.1,port=8100;urp;" --nofirststartwizard --headless &
sleep 2 sleep 2
fi fi
jodconverter "$1.odt" "$1.pdf" jodconverter "$1.odt" "$1.pdf"