Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

composer-dist.json

@@ -0,0 +1,17 @@
+{
+    "require": {
+        "sabre/dav": "^3.",
+        "slim/slim": "^3.0",
+        "erusev/parsedown": "*",
+        "erusev/parsedown-extra": "*",
+        "pear/log": "*",
+        "pear/mail": "*",
+        "pear/mail_mime": "*",
+        "pear/net_smtp": "*",
+        "pear/auth_sasl": "*",
+        "pear/db": "*",
+        "alecrabbit/php-console-colour": "*",
+        "daverandom/resume": "^0.0.3",
+        "zf1/zend-search-lucene": "*"
+    }
+}

conf/settings.xml.template

@@ -22,7 +22,7 @@
     <!--
        - strictFormCheck: Strict form checking. If set to true, then all fields in the form will be checked for a value. If set to false, then (most) comments and keyword fields become optional. Comments are always required when submitting a review or overriding document status.
        - viewOnlineFileTypes: files with one of the following endings can be viewed online (USE ONLY LOWER CASE CHARACTERS)
-       - enableConverting: enable/disable converting of files XXX
+       - enableConverting: enable/disable converting of files (deprecated)
        - enableEmail: enable/disable automatic email notification
        - enableUsersView: enable/disable group and user view for all users
        - enableFullSearch: false to don't use fulltext search
@@ -34,12 +34,14 @@
        -                   2 to start with tree shown fully expanded
        - stopWordsFile: path to stop word file for indexer
        - sortUsersInList: how to sort users in lists ('fullname' or '' (default))
-       - enableDropUpload: XXX
-       - enableRecursiveCount: XXX
-       - maxRecursiveCount: XXX
-       - enableThemeSelector: XXX
+       - enableDropUpload: enable/disable uploading files by drag&drop
+       - enableRecursiveCount: enable/disable counting docs and folder recursively
+       - maxRecursiveCount: after this number of docs/folders precise counting will stop
+       - enableThemeSelector: enable/disable the theme selector on the login page
        - fullSearchEngine: Either "lucene" or "sqlitefts"
-       - sortFoldersDefault: XXX
+       - sortFoldersDefault: how to sort forders by default. u=unsorted, s=sequence, n=name
+       - defaultDocPosition: Default position for a new document. 'start', 'end', or ''
+       - defaultFolderPosition: Default position for a new folder. 'start', 'end', or ''
     -->
     <edition
       strictFormCheck = "false"
@@ -60,6 +62,8 @@
       enableThemeSelector = "false"
       fullSearchEngine = "lucene"
       sortFoldersDefault = "u"
+      defaultDocPosition = "end"
+      defaultFolderPosition = "end"
     />
     <!--
        - enableCalendar: enable/disable calendar

inc/inc.ClassSettings.php

@@ -297,6 +297,8 @@ class Settings { /* {{{ */
 	var $_sortFoldersDefault = '';
 	// Where to insert new documents ('start' or 'end')
 	var $_defaultDocPosition = 'end';
+	// Where to insert new folders ('start' or 'end')
+	var $_defaultFolderPosition = 'end';
 	// Set valid IP for admin logins
 	// if enabled admin can login only by specified IP addres
 	var $_adminIP = "";
@@ -581,6 +583,7 @@ class Settings { /* {{{ */
 		$this->_expandFolderTree = intval($tab["expandFolderTree"]);
 		$this->_libraryFolder = intval($tab["libraryFolder"]);
 		$this->_defaultDocPosition = strval($tab["defaultDocPosition"]);
+		$this->_defaultFolderPosition = strval($tab["defaultFolderPosition"]);
 
 		// XML Path: /configuration/site/webdav
 		$node = $xml->xpath('/configuration/site/webdav');
@@ -978,6 +981,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "sortFoldersDefault", $this->_sortFoldersDefault);
     $this->setXMLAttributValue($node, "libraryFolder", $this->_libraryFolder);
     $this->setXMLAttributValue($node, "defaultDocPosition", $this->_defaultDocPosition);
+    $this->setXMLAttributValue($node, "defaultFolderPosition", $this->_defaultFolderPosition);
 
     // XML Path: /configuration/site/webdav
     $node = $this->getXMLNode($xml, '/configuration/site', 'webdav');

op/op.Settings.php

@@ -151,6 +151,7 @@ if ($action == "saveSettings")
   setStrValue("sortUsersInList");
   setStrValue("sortFoldersDefault");
   setStrValue("defaultDocPosition");
+  setStrValue("defaultFolderPosition");
   setIntValue("libraryFolder");
 
   // SETTINGS - SITE - WEBDAV