From dfe2e3f1671cfe161ee18a70e4602547cfe4ae19 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Apr 2018 06:41:51 +0200
Subject: [PATCH] add new option for configuring replacement of documents in
 webdav

---
 conf/settings.xml.template         |  3 +++
 inc/inc.ClassSettings.php          | 13 +++++++++++++
 op/op.Settings.php                 |  3 +++
 views/bootstrap/class.Settings.php |  9 +++++++++
 4 files changed, 28 insertions(+)

diff --git a/conf/settings.xml.template b/conf/settings.xml.template
index ea35e3c2f..452c847fe 100644
--- a/conf/settings.xml.template
+++ b/conf/settings.xml.template
@@ -71,6 +71,9 @@
       calendarDefaultView = "y"
       firstDayOfWeek = "0"
     />
+    <webdav
+      enableWebdavReplaceDoc="true"
+    />
   </site>
   <system>
     <!--
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 4ed021451..55b52c6f5 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -176,6 +176,8 @@ class Settings { /* {{{ */
 	var $_maxUploadSize = 0;
 	// enable/disable users images
 	var $_enableUserImage = false;
+	// enable/disable replacing documents by webdav
+	var $_enableWebdavReplaceDoc = true;
 	// enable/disable calendar
 	var $_enableCalendar = true;
 	// calendar default view ("w" for week,"m" for month,"y" for year)
@@ -465,6 +467,13 @@ class Settings { /* {{{ */
 		$this->_expandFolderTree = intval($tab["expandFolderTree"]);
 		$this->_defaultDocPosition = strval($tab["defaultDocPosition"]);
 
+		// XML Path: /configuration/site/calendar
+		$node = $xml->xpath('/configuration/site/webdav');
+		if($node) {
+			$tab = $node[0]->attributes();
+			$this->_enableWebdavReplaceDoc = Settings::boolVal($tab["enableWebdavReplaceDoc"]);
+		}
+
 		// XML Path: /configuration/site/calendar
 		$node = $xml->xpath('/configuration/site/calendar');
 		$tab = $node[0]->attributes();
@@ -786,6 +795,10 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "sortFoldersDefault", $this->_sortFoldersDefault);
     $this->setXMLAttributValue($node, "defaultDocPosition", $this->_defaultDocPosition);
 
+    // XML Path: /configuration/site/calendar
+    $node = $this->getXMLNode($xml, '/configuration/site', 'webdav');
+		$this->setXMLAttributValue($node, "enableWebdavReplaceDoc", $this->_enableWebdavReplaceDoc);
+
     // XML Path: /configuration/site/calendar
     $node = $this->getXMLNode($xml, '/configuration/site', 'calendar');
     $this->setXMLAttributValue($node, "enableCalendar", $this->_enableCalendar);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 2ddce04ed..61b6be6b7 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -103,6 +103,9 @@ if ($action == "saveSettings")
   $settings->_sortFoldersDefault = $_POST["sortFoldersDefault"];
   $settings->_defaultDocPosition = $_POST["defaultDocPosition"];
 
+  // SETTINGS - SITE - WEBDAV
+	$settings->_enableWebdavReplaceDoc = getBoolValue("enableWebdavReplaceDoc");
+
   // SETTINGS - SITE - CALENDAR
   $settings->_enableCalendar = getBoolValue("enableCalendar");
   $settings->_calendarDefaultView = $_POST["calendarDefaultView"];
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index c36501cf8..6494d85eb 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -361,6 +361,15 @@ if(!is_writeable($settings->_configFilePath)) {
           </select>
       </tr>
 
+      <!--
+        -- SETTINGS - SITE - WEBDAV
+      -->
+		 <tr><td></td></tr><tr ><td><b> <?php printMLText("settings_webdav");?></b></td> </tr>
+      <tr title="<?php printMLText("settings_enableWebdavReplaceDoc_desc");?>">
+        <td><?php printMLText("settings_enableWebdavReplaceDoc");?>:</td>
+        <td><input name="enableWebdavReplaceDoc" type="checkbox" <?php if ($settings->_enableWebdavReplaceDoc) echo "checked" ?> /></td>
+      </tr>
+
       <!--
         -- SETTINGS - SITE - CALENDAR
       -->