From d2fc9b534f39cb5c75e6fe6ee98e67fbb733520d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Apr 2017 06:50:12 +0200
Subject: [PATCH] add enableMultiUpload and enableAttachmentUpload

---
 inc/inc.ClassSettings.php          | 10 +++++++++-
 op/op.Settings.php                 |  2 ++
 views/bootstrap/class.Settings.php |  8 ++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index bef76e394..137326eca 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -162,7 +162,7 @@ class Settings { /* {{{ */
 	var $_logFileEnable = true;
 	// the log file rotation
 	var $_logFileRotation = "d";
-	// Enable file upload by jumploader
+	// Enable file upload by fine-uploader (was 'jumploader')
 	var $_enableLargeFileUpload = false;
 	// size of partitions for file uploaded by fine-loader
 	var $_partitionSize = 2000000;
@@ -182,6 +182,10 @@ class Settings { /* {{{ */
 	var $_enableSessionList = false;
 	// enable/disable display of the drop zone for file upload
 	var $_enableDropUpload = true;
+	// Enable multiple file upload
+	var $_enableMultiUpload = false;
+	// Enable upload of attachments with document upload
+	var $_enableAttachmentUpload = false;
 	// enable/disable display of the folder tree
 	var $_enableFolderTree = true;
 	// count documents and folders for folderview recursively
@@ -415,6 +419,8 @@ class Settings { /* {{{ */
 		$this->_enableSessionList = Settings::boolVal($tab["enableSessionList"]);
 		$this->_enableClipboard = Settings::boolVal($tab["enableClipboard"]);
 		$this->_enableDropUpload = Settings::boolVal($tab["enableDropUpload"]);
+		$this->_enableAttachmentUpload = Settings::boolVal($tab["enableAttachmentUpload"]);
+		$this->_enableMultiUpload = Settings::boolVal($tab["enableMultiUpload"]);
 		$this->_enableFolderTree = Settings::boolVal($tab["enableFolderTree"]);
 		$this->_enableRecursiveCount = Settings::boolVal($tab["enableRecursiveCount"]);
 		$this->_maxRecursiveCount = intval($tab["maxRecursiveCount"]);
@@ -723,6 +729,8 @@ class Settings { /* {{{ */
 		$this->setXMLAttributValue($node, "enableSessionList", $this->_enableSessionList);
 		$this->setXMLAttributValue($node, "enableClipboard", $this->_enableClipboard);
 		$this->setXMLAttributValue($node, "enableDropUpload", $this->_enableDropUpload);
+		$this->setXMLAttributValue($node, "enableMultiUpload", $this->_enableMultiUpload);
+		$this->setXMLAttributValue($node, "enableAttachmentUpload", $this->_enableAttachmentUpload);
     $this->setXMLAttributValue($node, "enableFolderTree", $this->_enableFolderTree);
     $this->setXMLAttributValue($node, "enableRecursiveCount", $this->_enableRecursiveCount);
     $this->setXMLAttributValue($node, "maxRecursiveCount", $this->_maxRecursiveCount);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 6c7948f8e..9b62701bd 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -84,6 +84,8 @@ if ($action == "saveSettings")
   $settings->_enableSessionList = getBoolValue("enableSessionList");
   $settings->_enableClipboard = getBoolValue("enableClipboard");
   $settings->_enableDropUpload = getBoolValue("enableDropUpload");
+  $settings->_enableMultiUpload = getBoolValue("enableMultiUpload");
+  $settings->_enableAttachmentUpload = getBoolValue("enableAttachmentUpload");
   $settings->_enableFolderTree = getBoolValue("enableFolderTree");
   $settings->_enableRecursiveCount = getBoolValue("enableRecursiveCount");
   $settings->_maxRecursiveCount = intval($_POST["maxRecursiveCount"]);
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 5a16bc987..be20e5f5a 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -273,6 +273,14 @@ if(!is_writeable($settings->_configFilePath)) {
 	    <tr title="<?php printMLText("settings_enableDropUpload_desc");?>">
         <td><?php printMLText("settings_enableDropUpload");?>:</td>
         <td><input name="enableDropUpload" type="checkbox" <?php if ($settings->_enableDropUpload) echo "checked" ?> /></td>
+      </tr>
+	    <tr title="<?php printMLText("settings_enableMultiUpload_desc");?>">
+        <td><?php printMLText("settings_enableMultiUpload");?>:</td>
+        <td><input name="enableMultiUpload" type="checkbox" <?php if ($settings->_enableMultiUpload) echo "checked" ?> /></td>
+      </tr>
+	    <tr title="<?php printMLText("settings_enableAttachmentUpload_desc");?>">
+        <td><?php printMLText("settings_enableAttachmentUpload");?>:</td>
+        <td><input name="enableAttachmentUpload" type="checkbox" <?php if ($settings->_enableAttachmentUpload) echo "checked" ?> /></td>
       </tr>
       <tr title="<?php printMLText("settings_enableFolderTree_desc");?>">
         <td><?php printMLText("settings_enableFolderTree");?>:</td>