From c535d2a0605e2f1b98e06b040c6a9e3e38e27ca2 Mon Sep 17 00:00:00 2001
From: Tobias Herre <tobias.herre@wikimedia.de>
Date: Tue, 23 Nov 2021 13:49:17 +0100
Subject: [PATCH] config for convert and pdftk

---
 config.sample.php | 3 ++-
 submit.php        | 2 +-
 upload.php        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/config.sample.php b/config.sample.php
index ab815dd..941d736 100644
--- a/config.sample.php
+++ b/config.sample.php
@@ -1,5 +1,6 @@
 <?php
-$CONVERT_CMD = "/usr/local/bin/pdftk";
+$CONVERT_CMD = "/usr/local/bin/convert";
+$PDFTK_CMD = "/usr/local/bin/pdftk";
 
 $mailHost = 'mailserver.example.com';   // Specify main and backup server
 $mailPort = 587;                        // Set the SMTP port
diff --git a/submit.php b/submit.php
index ff4dad3..06c0bc6 100644
--- a/submit.php
+++ b/submit.php
@@ -388,7 +388,7 @@ foreach ($_POST['desc'] as $key => $val) {
 $resultnam = tempnam("/tmp","karesult");
 
 
-$cmd = "$CONVERT_CMD";
+$cmd = "$PDFTK_CMD";
 foreach ($pdfs as $filename){
 	$cmd .= " $filename";
 }
diff --git a/upload.php b/upload.php
index bbc8cd2..5890314 100644
--- a/upload.php
+++ b/upload.php
@@ -47,7 +47,7 @@ foreach ($_FILES as $key=>$files){
 			file_put_contents("/tmp/log.txt", "file-$key-$i\n", FILE_APPEND | LOCK_EX);
 			file_put_contents("/tmp/log.txt", $files['name'][$i], FILE_APPEND | LOCK_EX);
 			$tmpfname = tempnam("/tmp", "FOO");
-			$cmd = "/usr/local/bin/convert $tmpname PDF:$tmpfname";
+			$cmd = "$CONVERT_CMD $tmpname PDF:$tmpfname";
 			exec ($cmd);
 			file_put_contents("/tmp/log.txt", "\n$cmd\n");