Compare commits

..

No commits in common. "6c82523cc887c5dadc1c7261c5a39549dc36b4e4" and "e4d8479f88fbb1b6c7de8a7d801a75abc936e1f7" have entirely different histories.

2 changed files with 3 additions and 5 deletions

View file

@ -71,7 +71,7 @@ jobs:
sudo chmod 640 \$DEPLOY_PATH/config/config.php
echo 'Nettoyage...'
sudo rm -rf /tmp/web2print-deploy
rm -rf /tmp/web2print-deploy
echo 'Deploiement termine avec succes!'
"

View file

@ -52,8 +52,7 @@ class PdfGenerator
$pdfFile = tempnam($this->config['tmp_dir'], 'pdf_') . '.pdf';
try {
$cmd = 'TMPDIR=' . escapeshellarg($this->config['tmp_dir']) . ' ';
$cmd .= escapeshellcmd($this->config['pagedjs_bin']);
$cmd = escapeshellcmd($this->config['pagedjs_bin']);
$cmd .= ' ' . escapeshellarg($url);
$cmd .= ' -o ' . escapeshellarg($pdfFile);
@ -111,8 +110,7 @@ class PdfGenerator
private function buildCommand(string $htmlFile, string $pdfFile, array $options): string
{
$cmd = 'TMPDIR=' . escapeshellarg($this->config['tmp_dir']) . ' ';
$cmd .= escapeshellcmd($this->config['pagedjs_bin']);
$cmd = escapeshellcmd($this->config['pagedjs_bin']);
$cmd .= ' ' . escapeshellarg($htmlFile);
$cmd .= ' -o ' . escapeshellarg($pdfFile);