From 26d8c08ce92fb7afea676b9f0ae7b7efc84fe98e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 18:12:58 +0100
Subject: [PATCH] add converters for pdf output

---
 op/op.Settings.php                 | 17 ++++++++++-------
 views/bootstrap/class.Settings.php | 27 ++++++++-------------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/op/op.Settings.php b/op/op.Settings.php
index bffefec43..5c14c0528 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -205,13 +205,16 @@ if ($action == "saveSettings")
 	unset($settings->_converters['fulltext']['newmimetype']);
 	unset($settings->_converters['fulltext']['newcmd']);
 
-	if(isset($_POST["converters"]["preview"]))
-		$settings->_converters['preview'] = $_POST["converters"]["preview"];
-	$newmimetype = preg_replace('#[^A-Za-z0-9_/+.*-]+#', '', $settings->_converters["preview"]["newmimetype"]);
-	if($newmimetype && trim($settings->_converters['preview']['newcmd']))
-		$settings->_converters['preview'][$newmimetype] = trim($settings->_converters['preview']['newcmd']);
-	unset($settings->_converters['preview']['newmimetype']);
-	unset($settings->_converters['preview']['newcmd']);
+	foreach(array('preview', 'pdf') as $target) {
+		if(isset($_POST["converters"][$target])) {
+			$settings->_converters[$target] = $_POST["converters"][$target];
+			$newmimetype = preg_replace('#[^A-Za-z0-9_/+.*-]+#', '', $settings->_converters[$target]["newmimetype"]);
+			if($newmimetype && trim($settings->_converters[$target]['newcmd']))
+				$settings->_converters[$target][$newmimetype] = trim($settings->_converters[$target]['newcmd']);
+			unset($settings->_converters[$target]['newmimetype']);
+			unset($settings->_converters[$target]['newcmd']);
+		}
+	}
 
   // SETTINGS - EXTENSIONS
   $settings->_extensions = isset($_POST["extensions"]) ? $_POST["extensions"] : array();
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index cd258805e..6a4cea6b8 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -734,38 +734,27 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php $this->showTextField("cmdTimeout", $settings->_cmdTimeout); ?></td>
       </tr>
 
-      <tr ><td><b> <?php printMLText("index_converters");?></b></td> </tr>
 <?php
-	foreach($settings->_converters['fulltext'] as $mimetype=>$cmd) {
+  foreach(array('fulltext', 'preview', 'pdf') as $target) {
+?>
+      <tr ><td><b> <?php printMLText($target."_converters");?></b></td> </tr>
+<?php
+	foreach($settings->_converters[$target] as $mimetype=>$cmd) {
 ?>
       <tr title="<?php echo $mimetype;?>">
         <td><?php echo $mimetype;?>:</td>
-        <td><?php $this->showTextField("converters[fulltext][".$mimetype."]", htmlspecialchars($cmd)); ?></td>
+        <td><?php $this->showTextField("converters[".$target."][".$mimetype."]", htmlspecialchars($cmd)); ?></td>
       </tr>
 <?php
 	}
 ?>
       <tr title="">
-        <td><?php $this->showTextField("converters[fulltext][newmimetype]", "", '', getMLText('converter_new_mimetype')); ?>:</td>
-        <td><?php $this->showTextField("converters[fulltext][newcmd]", "", "", getMLText('converter_new_cmd')); ?></td>
-      </tr>
-      <tr ><td><b> <?php printMLText("preview_converters");?></b></td> </tr>
-<?php
-	if(isset($settings->_converters['preview'])) {
-		foreach($settings->_converters['preview'] as $mimetype=>$cmd) {
-?>
-      <tr title="<?php echo $mimetype;?>">
-        <td><?php echo $mimetype;?>:</td>
-        <td><?php $this->showTextField("converters[preview][".$mimetype."]", htmlspecialchars($cmd)); ?></td>
+        <td><?php $this->showTextField("converters[".$target."][newmimetype]", "", '', getMLText('converter_new_mimetype')); ?>:</td>
+        <td><?php $this->showTextField("converters[".$target."][newcmd]", "", "", getMLText('converter_new_cmd')); ?></td>
       </tr>
 <?php
-		}
 	}
 ?>
-      <tr title="">
-        <td><?php $this->showTextField("converters[preview][newmimetype]", "", '', getMLText('mimetype')); ?>:</td>
-        <td><?php $this->showTextField("converters[preview][newcmd]", "", '', getMLText('command')); ?></td>
-      </tr>
     </table>
 <?php		$this->contentContainerEnd(); ?>
   </div>